summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-01-24 14:13:00 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-01-24 14:13:00 -0600
commit3a673dc158811a446bf1d2aa64c757ab461d5e07 (patch)
treea66adaee78d8168b88fcac586d9a97c1bb9e6745
parent4e85f8ec5d5d0753dbc757818f1b476d3aa1bbd4 (diff)
downloadtdeutils-3a673dc158811a446bf1d2aa64c757ab461d5e07.tar.gz
tdeutils-3a673dc158811a446bf1d2aa64c757ab461d5e07.zip
Finish moving kinfocenter files to kcontrol.
This resolves bug report 289.
-rw-r--r--doc/kcontrol/storagedevices/CMakeLists.txt (renamed from doc/kinfocenter/storagedevices/CMakeLists.txt)2
-rw-r--r--doc/kcontrol/storagedevices/Makefile.am3
-rw-r--r--doc/kcontrol/storagedevices/index.docbook (renamed from doc/kinfocenter/storagedevices/index.docbook)3
-rw-r--r--doc/kinfocenter/CMakeLists.txt12
-rw-r--r--doc/kinfocenter/Makefile.am6
-rw-r--r--doc/kinfocenter/storagedevices/Makefile.am3
-rw-r--r--kdf/kcmdf.desktop4
-rw-r--r--klaptopdaemon/applnk/pcmcia.desktop4
8 files changed, 9 insertions, 28 deletions
diff --git a/doc/kinfocenter/storagedevices/CMakeLists.txt b/doc/kcontrol/storagedevices/CMakeLists.txt
index b358ce6..845276c 100644
--- a/doc/kinfocenter/storagedevices/CMakeLists.txt
+++ b/doc/kcontrol/storagedevices/CMakeLists.txt
@@ -10,5 +10,5 @@
#################################################
tde_create_handbook( DESTINATION
- kinfocenter/storagedevices )
+ kcontrol/storagedevices )
diff --git a/doc/kcontrol/storagedevices/Makefile.am b/doc/kcontrol/storagedevices/Makefile.am
new file mode 100644
index 0000000..8841b61
--- /dev/null
+++ b/doc/kcontrol/storagedevices/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/storagedevices
diff --git a/doc/kinfocenter/storagedevices/index.docbook b/doc/kcontrol/storagedevices/index.docbook
index e9a8534..89effb1 100644
--- a/doc/kinfocenter/storagedevices/index.docbook
+++ b/doc/kcontrol/storagedevices/index.docbook
@@ -1,6 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
-"dtd/kdex.dtd" [
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
diff --git a/doc/kinfocenter/CMakeLists.txt b/doc/kinfocenter/CMakeLists.txt
deleted file mode 100644
index dc6bb77..0000000
--- a/doc/kinfocenter/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-# (C) 2012 Golubev Alexander
-# fatzer2 (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_auto_add_subdirectories( )
diff --git a/doc/kinfocenter/Makefile.am b/doc/kinfocenter/Makefile.am
deleted file mode 100644
index 251280f..0000000
--- a/doc/kinfocenter/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SUBDIRS = $(AUTODIRS)
-
-KDE_LANG= en
-KDE_DOCS = AUTO
-
diff --git a/doc/kinfocenter/storagedevices/Makefile.am b/doc/kinfocenter/storagedevices/Makefile.am
deleted file mode 100644
index 0ffa481..0000000
--- a/doc/kinfocenter/storagedevices/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/storagedevices
diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop
index a688317..2bee9d0 100644
--- a/kdf/kcmdf.desktop
+++ b/kdf/kcmdf.desktop
@@ -2,7 +2,7 @@
X-TDE-ModuleType=Library
X-TDE-Library=kdf
X-TDE-FactoryName=kdf
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
X-TDE-LocalUser=false
Exec=tdecmshell kcmdf
Icon=kcmdf
@@ -68,7 +68,7 @@ Name[xh]=Amacebo Okugcina
Name[zh_CN]=存储设备
Name[zh_TW]=儲存裝置
Name[zu]=Amathuluzi Ethala
-DocPath=kinfocenter/storagedevices/index.html
+DocPath=kcontrol/storagedevices/index.html
Comment=Shows the disk usage of the mounted devices
Comment[af]=Vertoon die disket gebruik van die gekoppelde toestelle
Comment[ar]=يعرض المساحة المستخدمة من الأقراص المضمومة
diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
index 0d276d7..2f9f6cb 100644
--- a/klaptopdaemon/applnk/pcmcia.desktop
+++ b/klaptopdaemon/applnk/pcmcia.desktop
@@ -2,11 +2,11 @@
X-TDE-ModuleType=Library
X-TDE-Library=laptop
X-TDE-FactoryName=pcmcia
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
Exec=tdecmshell pcmcia
Icon=laptop_pcmcia
Type=Application
-DocPath=kinfocenter/pcmcia/index.html
+DocPath=kcontrol/pcmcia/index.html
Comment=PCMCIA status
Comment[af]=Pcmcia status
Comment[ar]=حالة بطاقة PCMCIA