Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 57 insertions, 58 deletions

diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
index e790d4894..9ae37a312 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
@@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc
 debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc
 debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc
 debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc
-debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
@@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png