rev 13264 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-01-09 22:55:14 +0000 (Fri, 09 Jan 2009)
New Revision: 13264

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
   branches/kde4/packages/kdebase-workspace/debian/rules
Log:
* New upstream release.
* Bump build-deps and shlibs.
* Add kconf_update scripts

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2009-01-09 22:55:14 UTC (rev 13264)
@@ -1,10 +1,14 @@
-kdebase-workspace (4:4.1.3-3) experimental; urgency=low
+kdebase-workspace (4:4.1.4-1) experimental; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Sune Vuorela:
 
   * Fix kde-window-manager overrides.
+  * Bump build-deps and shlibs.
+  * Add kconf_update scripts
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Dec 2008 11:19:04 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Jan 2009 23:03:49 +0100
 
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2009-01-09 22:55:14 UTC (rev 13264)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdelibs5-dev (>= 4:4.1.3-2),
+ kdelibs5-dev (>= 4:4.1.4),
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev,
  libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,

Modified: branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install	2009-01-09 22:55:14 UTC (rev 13264)
@@ -54,6 +54,8 @@
 usr/share/kde4/apps/kconf_update/kwin_focus2.upd
 usr/share/kde4/apps/kconf_update/kwin_fsp_workarounds_1.upd
 usr/share/kde4/apps/kconf_update/kwin_on_off.upd
+usr/share/kde4/apps/kconf_update/kwin_window_shortcuts.sh
+usr/share/kde4/apps/kconf_update/kwin_window_shortcuts.upd
 usr/share/kde4/apps/kconf_update/kwiniconify.upd
 usr/share/kde4/apps/kconf_update/kwinsticky.upd
 usr/share/kde4/apps/kconf_update/kwinupdatewindowsettings.upd

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-01-09 22:55:14 UTC (rev 13264)
@@ -29,6 +29,7 @@
 usr/bin/solid-powermanagement
 usr/bin/startkde
 usr/lib/kconf_update_bin/khotkeys_update
+usr/lib/kconf_update_bin/krdb_clearlibrarypath
 usr/lib/kde4/fontthumbnail.so
 usr/lib/kde4/ion_bbcukmet.so
 usr/lib/kde4/ion_envcan.so
@@ -89,3 +90,5 @@
 usr/lib/libkdeinit4_kxkb.so
 usr/lib/libkdeinit4_plasma.so
 usr/lib/strigi/strigita_font.so
+usr/share/kde4/apps/kconf_update/khotkeys_remove_shortcuts.upd
+usr/share/kde4/apps/kconf_update/krdb.upd

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff	2009-01-09 22:55:14 UTC (rev 13264)
@@ -1,9 +1,7 @@
 We renamed ktrash to ktrash4. See bug #494427.
-Index: kdebase-workspace/plasma/applets/trash/trash.cpp
-===================================================================
---- kdebase-workspace.orig/plasma/applets/trash/trash.cpp	2008-09-06 11:24:09.000000000 +0200
-+++ kdebase-workspace/plasma/applets/trash/trash.cpp	2008-09-06 11:24:40.000000000 +0200
-@@ -193,7 +193,7 @@
+--- a/plasma/applets/trash/trash.cpp
++++ b/plasma/applets/trash/trash.cpp
+@@ -192,7 +192,7 @@
          // we can simply call ktrash.
          //KonqOperations::emptyTrash(&m_menu);
          KProcess process;

Modified: branches/kde4/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/rules	2009-01-09 22:26:23 UTC (rev 13263)
+++ branches/kde4/packages/kdebase-workspace/debian/rules	2009-01-09 22:55:14 UTC (rev 13264)
@@ -8,8 +8,8 @@
 PLASMA_ABI=plasma-abi-4.1-1
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
-DEB_DH_MAKESHLIBS_ARGS_libplasma2 := -V'libplasma2 (>= 4:4.1.2), $(PLASMA_ABI)'
-DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.1.2)'
+DEB_DH_MAKESHLIBS_ARGS_libplasma2 := -V'libplasma2 (>= 4:4.1.4), $(PLASMA_ABI)'
+DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.1.4)'
 
 DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard
 DEB_DH_SHLIBDEPS_ARGS_libplasma2 := -- -xkdebase-runtime