rev 8529 - trunk/packages/kdebase/debian

Tue Dec 25 22:49:17 UTC 2007

Author: trigger-guest
Date: 2007-12-25 22:49:17 +0000 (Tue, 25 Dec 2007)
New Revision: 8529

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/kdebase-bin.install
   trunk/packages/kdebase/debian/kdebase-data.install
Log:
* Move arch-all files from kdebase-bin into kdebase-data.

Modified: trunk/packages/kdebase/debian/changelog
===================================================================

--- trunk/packages/kdebase/debian/changelog	2007-12-25 22:35:11 UTC (rev 8528)
+++ trunk/packages/kdebase/debian/changelog	2007-12-25 22:49:17 UTC (rev 8529)
@@ -9,26 +9,30 @@
     kdebase-kio-plugins dependency on kdesktop as it was only needed due to
     'kdeeject' utility.
   * Massive changes to debian/control{,.in}:
-    - Replace depreciated ${Source-Version} with either ${source:Version} or
+    - Replace deprecated ${Source-Version} with either ${source:Version} or
       ${binary:Version}. This should make kdebase binNMU safe.
     - Drop redundant dependences from kdebase-dev. Leave only
-        kate, kcontrol, kdebase-bin, kicker, konqueror, ksplash, ksysguard, kwin
+      kate, kcontrol, kdebase-bin, kicker, konqueror, ksplash, ksysguard, kwin
       because they provide shared libraries to link against.
 
   +++ Changes by Fathi Boudra:
 
   * Add kdm and kdmlib branch pull patch:
-    * You cannot assign a user pic to a group.
-    * Sort guiStyle and colorScheme combos.
-    * Select the password when user was clicked, so overwriting it is simpler.
-    * Support gdm 2.19+.
-    * Fix SIGTERM handling.
-    * Make .dmrc loading more robust.
-    * Make face loading more robust.
-    * Add -p switch to export cmd in Xsession's csh hack.
+    - You cannot assign a user pic to a group.
+    - Sort guiStyle and colorScheme combos.
+    - Select the password when user was clicked, so overwriting it is simpler.
+    - Support gdm 2.19+.
+    - Fix SIGTERM handling.
+    - Make .dmrc loading more robust.
+    - Make face loading more robust.
+    - Add -p switch to export cmd in Xsession's csh hack.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Dec 2007 23:54:38 +0200
+  +++ Changes by Armin Berres:
+  
+  * Move arch-all files from kdebase-bin into kdebase-data.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Dec 2007 23:44:39 +0100
+
 kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2007-12-25 22:35:11 UTC (rev 8528)
+++ trunk/packages/kdebase/debian/control	2007-12-25 22:49:17 UTC (rev 8529)
@@ -122,7 +122,7 @@
 Section: kde
 Architecture: all
 Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
-Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.3)
+Replaces: kdebase (<= 4:3.5.8.dfsg.1-2), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.3)
 Description: shared data files for the KDE base module
  This package contains the architecture-independent shared data files
  needed for a basic KDE desktop installation.

Modified: trunk/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-bin.install	2007-12-25 22:35:11 UTC (rev 8528)
+++ trunk/packages/kdebase/debian/kdebase-bin.install	2007-12-25 22:49:17 UTC (rev 8529)
@@ -45,59 +45,3 @@
 debian/tmp/usr/lib/libkdeinit_kxkb.so
 debian/tmp/usr/lib/libkhotkeys_shared.so.1
 debian/tmp/usr/lib/libkhotkeys_shared.so.1.0.0
-debian/tmp/usr/share/applications/kde/keyboard.desktop
-debian/tmp/usr/share/applications/kde/keyboard_layout.desktop
-debian/tmp/usr/share/applications/kde/khotkeys.desktop
-debian/tmp/usr/share/applications/kde/knetattach.desktop
-debian/tmp/usr/share/applnk/System/ScreenSavers/KBlankscreen.desktop
-debian/tmp/usr/share/applnk/System/ScreenSavers/KRandom.desktop
-debian/tmp/usr/share/apps/drkonqi/debuggers/gdbrc
-debian/tmp/usr/share/apps/drkonqi/pics/konqi.png
-debian/tmp/usr/share/apps/drkonqi/presets/developerrc
-debian/tmp/usr/share/apps/drkonqi/presets/enduserrc
-debian/tmp/usr/share/apps/kconf_update/khotkeys_32b1_update.upd
-debian/tmp/usr/share/apps/kconf_update/khotkeys_printscreen.upd
-debian/tmp/usr/share/apps/kconf_update/konqueror_gestures_kde321_update.upd
-debian/tmp/usr/share/apps/kdcop/kdcopui.rc
-debian/tmp/usr/share/apps/khotkeys/kde32b1.khotkeys
-debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
-debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys
-debian/tmp/usr/share/autostart/khotkeys.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/kdcop/common
-debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/common
-debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kdesu/common
-debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kdesu/man-kdesu.1.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/common
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot1.png
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot2.png
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot3.png
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot4.png
-debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot.png
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/common
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.docbook
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/layout.png
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/switching.png
-debian/tmp/usr/share/doc/kde/HTML/en/kxkb/xkb.png
-debian/tmp/usr/share/icons/hicolor/128x128/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/16x16/apps/khotkeys.png
-debian/tmp/usr/share/icons/hicolor/16x16/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/16x16/apps/kxkb.png
-debian/tmp/usr/share/icons/hicolor/22x22/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/32x32/apps/khotkeys.png
-debian/tmp/usr/share/icons/hicolor/32x32/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/32x32/apps/kxkb.png
-debian/tmp/usr/share/icons/hicolor/48x48/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/48x48/apps/kxkb.png
-debian/tmp/usr/share/icons/hicolor/64x64/apps/knetattach.png
-debian/tmp/usr/share/icons/hicolor/scalable/apps/knetattach.svgz
-debian/tmp/usr/share/services/kded/khotkeys.desktop
-debian/tmp/usr/share/services/kxkb.desktop

Modified: trunk/packages/kdebase/debian/kdebase-data.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-data.install	2007-12-25 22:35:11 UTC (rev 8528)
+++ trunk/packages/kdebase/debian/kdebase-data.install	2007-12-25 22:49:17 UTC (rev 8529)
@@ -3,6 +3,10 @@
 debian/tmp/etc/xdg/menus/kde-information.menu
 debian/tmp/etc/xdg/menus/kde-screensavers.menu
 debian/tmp/etc/xdg/menus/kde-settings.menu
+debian/tmp/usr/share/applications/kde/keyboard.desktop
+debian/tmp/usr/share/applications/kde/keyboard_layout.desktop
+debian/tmp/usr/share/applications/kde/khotkeys.desktop
+debian/tmp/usr/share/applications/kde/knetattach.desktop
 debian/tmp/usr/share/applnk/.hidden/battery.desktop
 debian/tmp/usr/share/applnk/.hidden/bwarning.desktop
 debian/tmp/usr/share/applnk/.hidden/cwarning.desktop
@@ -16,6 +20,12 @@
 debian/tmp/usr/share/applnk/.hidden/socks.desktop
 debian/tmp/usr/share/applnk/.hidden/userinfo.desktop
 debian/tmp/usr/share/applnk/.hidden/virtualdesktops.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KBlankscreen.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KRandom.desktop
+debian/tmp/usr/share/apps/drkonqi/debuggers/gdbrc
+debian/tmp/usr/share/apps/drkonqi/pics/konqi.png
+debian/tmp/usr/share/apps/drkonqi/presets/developerrc
+debian/tmp/usr/share/apps/drkonqi/presets/enduserrc
 debian/tmp/usr/share/apps/kaccess/eventsrc
 debian/tmp/usr/share/apps/kcmcss/template.css
 debian/tmp/usr/share/apps/kcminput/cursor_large_black.pcf.gz
@@ -34,6 +44,9 @@
 debian/tmp/usr/share/apps/kconf_update/convertShortcuts.pl
 debian/tmp/usr/share/apps/kconf_update/kaccel.upd
 debian/tmp/usr/share/apps/kconf_update/kcmdisplayrc.upd
+debian/tmp/usr/share/apps/kconf_update/khotkeys_32b1_update.upd
+debian/tmp/usr/share/apps/kconf_update/khotkeys_printscreen.upd
+debian/tmp/usr/share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 debian/tmp/usr/share/apps/kconf_update/kuriikwsfilter.upd
 debian/tmp/usr/share/apps/kconf_update/mouse_cursor_theme.upd
 debian/tmp/usr/share/apps/kconf_update/socks.upd
@@ -47,6 +60,7 @@
 debian/tmp/usr/share/apps/kcontrol/pics/onlyone.png
 debian/tmp/usr/share/apps/kcontrol/pics/overlapping.png
 debian/tmp/usr/share/apps/kcontrol/pics/play.png
+debian/tmp/usr/share/apps/kdcop/kdcopui.rc
 debian/tmp/usr/share/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
 debian/tmp/usr/share/apps/kdisplay/app-defaults/AAAMotif.ad
 debian/tmp/usr/share/apps/kdisplay/app-defaults/AAATk.ad
@@ -97,6 +111,9 @@
 debian/tmp/usr/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
 debian/tmp/usr/share/apps/kfontview/kfontviewpart.rc
 debian/tmp/usr/share/apps/kfontview/kfontviewui.rc
+debian/tmp/usr/share/apps/khotkeys/kde32b1.khotkeys
+debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys
 debian/tmp/usr/share/apps/kinfocenter/kinfocenterui.rc
 debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
 debian/tmp/usr/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
@@ -122,6 +139,7 @@
 debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
 debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
 debian/tmp/usr/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
+debian/tmp/usr/share/autostart/khotkeys.desktop
 debian/tmp/usr/share/desktop-directories/kde-development.directory
 debian/tmp/usr/share/desktop-directories/kde-development-translation.directory
 debian/tmp/usr/share/desktop-directories/kde-development-webdevelopment.directory
@@ -310,6 +328,16 @@
 debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/common
 debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/man-kdesu.1.docbook
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/common
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.cache.bz2
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.docbook
@@ -367,6 +395,20 @@
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/common
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.cache.bz2
 debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/common
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot1.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot2.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot3.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot4.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/common
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/layout.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/switching.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/xkb.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/access.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/acroread.png
 debian/tmp/usr/share/icons/crystalsvg/128x128/apps/applixware.png
@@ -1023,6 +1065,18 @@
 debian/tmp/usr/share/icons/crystalsvg/scalable/apps/xpaint.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/apps/x.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/devices/laptop.svgz
+debian/tmp/usr/share/icons/hicolor/128x128/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/khotkeys.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/khotkeys.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/knetattach.svgz
 debian/tmp/usr/share/locale/l10n/ad/entry.desktop
 debian/tmp/usr/share/locale/l10n/ad/flag.png
 debian/tmp/usr/share/locale/l10n/ae/entry.desktop
@@ -1500,6 +1554,8 @@
 debian/tmp/usr/share/locale/l10n/zm/flag.png
 debian/tmp/usr/share/locale/l10n/zw/entry.desktop
 debian/tmp/usr/share/locale/l10n/zw/flag.png
+debian/tmp/usr/share/services/kded/khotkeys.desktop
+debian/tmp/usr/share/services/kxkb.desktop
 debian/tmp/usr/share/services/searchproviders/acronym.desktop
 debian/tmp/usr/share/services/searchproviders/alexa.desktop
 debian/tmp/usr/share/services/searchproviders/alexa_url.desktop
@@ -1612,8 +1668,8 @@
 debian/tmp/usr/share/services/useragentstrings/ns71onwinnt51.desktop
 debian/tmp/usr/share/services/useragentstrings/op403onwinnt4.desktop
 debian/tmp/usr/share/services/useragentstrings/op75oncurrent.desktop
+debian/tmp/usr/share/services/useragentstrings/safari12.desktop
 debian/tmp/usr/share/services/useragentstrings/safari20.desktop
-debian/tmp/usr/share/services/useragentstrings/safari12.desktop
 debian/tmp/usr/share/services/useragentstrings/w3moncurrent.desktop
 debian/tmp/usr/share/services/useragentstrings/wgetoncurrent.desktop
 debian/tmp/usr/share/servicetypes/searchprovider.desktop


