rev 12355 - branches/kde4-backports/packages/kdebase-workspace/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-10-07 17:21:51 +0000 (Tue, 07 Oct 2008)
New Revision: 12355

Modified:
   branches/kde4-backports/packages/kdebase-workspace/debian/changelog
   branches/kde4-backports/packages/kdebase-workspace/debian/control
   branches/kde4-backports/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4-backports/packages/kdebase-workspace/debian/rules
Log:
kdebase-workspace backport for Lenny

Modified: branches/kde4-backports/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdebase-workspace/debian/changelog	2008-10-07 17:20:50 UTC (rev 12354)
+++ branches/kde4-backports/packages/kdebase-workspace/debian/changelog	2008-10-07 17:21:51 UTC (rev 12355)
@@ -1,9 +1,18 @@
-kdebase-workspace (4:4.1.1-2~lenny+1) lenny; urgency=low
+kdebase-workspace (4:4.1.2-1~lenny+1) lenny; urgency=low
 
   * Backport for Lenny.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 11 Sep 2008 01:28:44 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 07 Oct 2008 18:17:59 +0200
 
+kdebase-workspace (4:4.1.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update installed files.
+  * Some files have been moved from kdebase-runtime-data to
+    kdebase-workspace-data, add Conflicts with previous version.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 29 Sep 2008 16:42:31 +0200
+
 kdebase-workspace (4:4.1.1-2) experimental; urgency=low
 
   +++ Changes by Fathi Boudra:
@@ -51,12 +60,6 @@
 
  -- Armin Berres <trigger+debian at space-based.de>  Thu, 21 Aug 2008 11:35:14 +0200
 
-kdebase-workspace (4:4.1.0-2~lenny+1) lenny; urgency=low
-
-  * Backport for Lenny.
-
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 19 Aug 2008 12:12:47 +0200
-
 kdebase-workspace (4:4.1.0-2) experimental; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: branches/kde4-backports/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4-backports/packages/kdebase-workspace/debian/control	2008-10-07 17:20:50 UTC (rev 12354)
+++ branches/kde4-backports/packages/kdebase-workspace/debian/control	2008-10-07 17:21:51 UTC (rev 12355)
@@ -65,7 +65,7 @@
 Architecture: all
 Depends: oxygencursors
 Conflicts: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, libplasma1
+ kmenuedit, ktip, libplasma1, kdebase-runtime-data (<<4:4.1.2-1)
 Replaces: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
  kmenuedit, ktip, kdebase-runtime-data (<< 4:4.0.81)
 Description: shared data files for the KDE 4 base workspace module

Modified: branches/kde4-backports/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4-backports/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-10-07 17:20:50 UTC (rev 12354)
+++ branches/kde4-backports/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-10-07 17:21:51 UTC (rev 12355)
@@ -13,7 +13,8 @@
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/common
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/bell/common                                                                                                            usr/share/doc/kde4/HTML/en/kcontrol/bell/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/bell/common
+usr/share/doc/kde4/HTML/en/kcontrol/bell/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/bell/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/clock/common
 usr/share/doc/kde4/HTML/en/kcontrol/clock/index.cache.bz2
@@ -53,6 +54,9 @@
 usr/share/doc/kde4/HTML/en/kcontrol/keys/common
 usr/share/doc/kde4/HTML/en/kcontrol/keys/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/keys/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/mouse/common
+usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common 
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.docbook
@@ -61,6 +65,12 @@
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/splashscreen/splash-main.png
+usr/share/doc/kde4/HTML/en/kcontrol/windowbehaviour/common
+usr/share/doc/kde4/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/windowbehaviour/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/common
+usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/windowspecific/index.docbook
 usr/share/doc/kde4/HTML/en/klipper/index.cache.bz2
 usr/share/doc/kde4/HTML/en/klipper/index.docbook
 usr/share/doc/kde4/HTML/en/klipper/screenshot.png

Modified: branches/kde4-backports/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdebase-workspace/debian/rules	2008-10-07 17:20:50 UTC (rev 12354)
+++ branches/kde4-backports/packages/kdebase-workspace/debian/rules	2008-10-07 17:21:51 UTC (rev 12355)
@@ -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.1), $(PLASMA_ABI)'
-DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.1.0)'
+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_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard