[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-25-g0d053db

Wed Oct 5 20:06:26 UTC 2011

The following commit has been merged in the master branch:
commit 0d053db26c2984dbd70487db21368bf7c04efeab
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Oct 5 22:04:47 2011 +0200

    Rename various binary packages to match upstream namimg.
---
 debian/changelog                                   |   10 +++
 debian/control                                     |   69 ++++++++++++++------
 ...space-bin.install => kde-workspace-bin.install} |    0
 ...stall.linux => kde-workspace-bin.install.linux} |    0
 ...errides => kde-workspace-bin.lintian-overrides} |    0
 ...ace-bin.manpages => kde-workspace-bin.manpages} |    0
 ...ace-bin.postinst => kde-workspace-bin.postinst} |    0
 ...workspace-bin.prerm => kde-workspace-bin.prerm} |    0
 ...ace-data.install => kde-workspace-data.install} |    0
 ...tall.linux => kde-workspace-data.install.linux} |    0
 ...space-dev.install => kde-workspace-dev.install} |    0
 ...nstall => kde-workspace-kgreet-plugins.install} |    0
 debian/rules                                       |    8 +-
 13 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52f50ce..ef57794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,16 @@ kde-workspace (4:4.7.2-0r0) UNRELEASED; urgency=low
   * Bump kdepimlibs5-dev build dependency to 4:4.7.
   * Change the source package name from kdebase-workspace to kde-workspace in
     order to match upstream naming.
+  * Rename the following binary packages to match upstream namimg:
+    - kdebase-workspace -> kde-workspace
+    - kdebase-workspace-bin -> kde-workspace-bin
+    - kdebase-workspace-data -> kde-workspace-data
+    - kdebase-workspace-dev -> kde-workspace-dev
+    - kdebase-workspace-kgreet-plugins -> kde-workspace-kgreet-plugins
+  * Add the following dummy packages (which depend on kde-workspace-*):
+    - kdebase-workspace
+    - kdebase-workspace-dev
+    - kdebase-workspace-dbg
   * Update patches:
     - Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
     - Remove backport_kwin_multihead_improvements.diff, applied usptream.
diff --git a/debian/control b/debian/control
index 0805b76..85231eb 100644
--- a/debian/control
+++ b/debian/control
@@ -39,13 +39,15 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdebase-workspace.git
 
-Package: kdebase-workspace
+Package: kde-workspace
 Architecture: all
-Depends:  kdebase-workspace-bin (>= ${source:Version}), ${misc:Depends},
+Depends:  kde-workspace-bin (>= ${source:Version}), ${misc:Depends},
  klipper (>= ${source:Version}), ksysguard (>= ${source:Version}), 
  kde-window-manager (>= ${source:Version}), systemsettings (>= ${source:Version}),
  freespacenotifier (>= ${source:Version})
 Recommends: kdm (>= ${source:Version}), kinfocenter (>= ${source:Version})
+Breaks: kdebase-workspace (<< 4:4.7.2) 
+Replaces: kdebase-workspace (<< 4:4.7.2) 
 Description: KDE Plasma Workspace components
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -56,10 +58,17 @@ Description: KDE Plasma Workspace components
  .
  This package provides a basic KDE desktop installation.
 
+Package: kdebase-workspace
+Architecture: all
+Depends: ${misc:Depends}, kde-workspace
+Description: transitional package for kde-workspace
+ This is a dummy transitional package for kde-workspace and can be safely
+ removed after the installation is complete.
+
 Package: plasma-desktop
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
-Recommends: kdebase-workspace
+Recommends: kde-workspace
 Replaces: kdebase-workspace-bin (<< 4:4.5), kdebase-workspace-data (<< 4:4.5)
 Breaks: kdebase-workspace-bin (<< 4:4.5), kdebase-workspace-data (<< 4:4.5),
  plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+)
@@ -75,7 +84,7 @@ Description: KDE Plasma workspace for desktop and laptop computers
 Package: plasma-netbook
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, plasma-widgets-workspace (= ${binary:Version})
-Recommends: kdebase-workspace
+Recommends: kde-workspace
 Description: KDE Plasma workspace for netbook computers
  Provides the environment for running and managing applications and integrating
  interaction of applications. It is designed as generic environment for all
@@ -85,19 +94,20 @@ Description: KDE Plasma workspace for netbook computers
  .
  This package is part of the KDE base workspace module.
 
-Package: kdebase-workspace-bin
+Package: kde-workspace-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, iso-codes,
  plasma-desktop (= ${binary:Version}) | plasma-netbook (= ${binary:Version}),
- kdebase-workspace-data (= ${source:Version}), x11-utils, x11-xserver-utils,
- kdebase-workspace-kgreet-plugins (= ${binary:Version})
+ kde-workspace-data (= ${source:Version}), x11-utils, x11-xserver-utils,
+ kde-workspace-kgreet-plugins (= ${binary:Version})
 Recommends: plasma-scriptengines, polkit-kde-1 (>= 0.99) | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
 Replaces: kcontrol, kmenuedit, ktip, libkfontinst4, ksplash, kdesktop,
- kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5)
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2) 
 Breaks: kcontrol, kmenuedit, ktip, libkfontinst4, kdesktop, ksplash,
- kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), polkit-kde-1 (<< 0.99)
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2),
+ polkit-kde-1 (<< 0.99)
 Description: core binaries for the KDE Plasma Workspace
  This package contains miscellaneous programs needed for a basic desktop
  installation. Among other standard KDE Workspace components, the package
@@ -107,29 +117,40 @@ Description: core binaries for the KDE Plasma Workspace
  .
  This package is part of the KDE base workspace module.
 
-Package: kdebase-workspace-data
+Package: kde-workspace-data
 Architecture: all
 Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}
 Replaces: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
- kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80)
+ kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
+ kdebase-workspace-data (<< 4:4.7.2) 
 Breaks: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
- kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80)
+ kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
+ kdebase-workspace-data (<< 4:4.7.2) 
 Description: shared data files for the KDE Plasma Workspace
  This package contains architecture-independent shared data files needed for a
  basic KDE Workspace installation.
  .
  This package is part of the KDE base workspace module.
 
-Package: kdebase-workspace-dev
+Package: kde-workspace-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${allLibraries},
- ${sameVersionDep:kdelibs5-dev:kdebase-workspace-bin},
+ ${sameVersionDep:kdelibs5-dev:kde-workspace-bin}
+Breaks: kdebase-workspace-dev (<< 4:4.7.2) 
+Replaces: kdebase-workspace-dev (<< 4:4.7.2) 
 Description: development files for the KDE Plasma Workspace
  This package contains development files for building software that uses
  libraries from the KDE Plasma Workspace.
  .
  This package is part of the KDE base workspace module.
 
+Package: kdebase-workspace-dev
+Architecture: all
+Depends: ${misc:Depends}, kde-workspace-dev
+Description: transitional package for kde-workspace-dev
+ This is a dummy transitional package for kde-workspace-dev and can be safely
+ removed after the installation is complete.
+
 Package: plasma-dataengines-workspace
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -239,7 +260,7 @@ Package: kdm
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, lsb-base (>= 3.2-14), consolekit, ${misc:Depends},
- kdebase-workspace-kgreet-plugins (= ${binary:Version}), adduser
+ kde-workspace-kgreet-plugins (= ${binary:Version}), adduser
 Recommends: logrotate, xserver-xorg | xserver,
  kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator
 Suggests: kdepasswd
@@ -342,7 +363,7 @@ Description: System Settings
  .
  This package is part of the KDE base workspace module.
 
-Package: kdebase-workspace-kgreet-plugins
+Package: kde-workspace-kgreet-plugins
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -511,15 +532,25 @@ Description: library which provides an interface for weather information service
  .
  This package is part of the KDE base workspace module.
 
-Package: kdebase-workspace-dbg
+Package: kde-workspace-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg, ${misc:Depends}
-Replaces: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5)
-Breaks: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5)
+Replaces: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5),
+ kdebase-workspace-dbg (<< 4:4.7.2)
+Breaks: kdebase-dbg (<< 4:4.5), kdebase-runtime-dbg (<< 4:4.5),
+ kdebase-workspace-dbg (<< 4:4.7.2)
 Suggests: kdebase-workspace (>= ${source:Version})
 Description: debugging symbols for the KDE Plasma Workspaces
  This package contains debugging files used to investigate problems with
  binaries included in the KDE base workspace module.
 
+Package: kdebase-workspace-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, kde-workspace-dbg
+Description: transitional package for kde-workspace-dbg
+ This is a dummy transitional package for kde-workspace-dbg and can be safely
+ removed after the installation is complete.
diff --git a/debian/kdebase-workspace-bin.install b/debian/kde-workspace-bin.install
similarity index 100%
rename from debian/kdebase-workspace-bin.install
rename to debian/kde-workspace-bin.install
diff --git a/debian/kdebase-workspace-bin.install.linux b/debian/kde-workspace-bin.install.linux
similarity index 100%
rename from debian/kdebase-workspace-bin.install.linux
rename to debian/kde-workspace-bin.install.linux
diff --git a/debian/kdebase-workspace-bin.lintian-overrides b/debian/kde-workspace-bin.lintian-overrides
similarity index 100%
rename from debian/kdebase-workspace-bin.lintian-overrides
rename to debian/kde-workspace-bin.lintian-overrides
diff --git a/debian/kdebase-workspace-bin.manpages b/debian/kde-workspace-bin.manpages
similarity index 100%
rename from debian/kdebase-workspace-bin.manpages
rename to debian/kde-workspace-bin.manpages
diff --git a/debian/kdebase-workspace-bin.postinst b/debian/kde-workspace-bin.postinst
similarity index 100%
rename from debian/kdebase-workspace-bin.postinst
rename to debian/kde-workspace-bin.postinst
diff --git a/debian/kdebase-workspace-bin.prerm b/debian/kde-workspace-bin.prerm
similarity index 100%
rename from debian/kdebase-workspace-bin.prerm
rename to debian/kde-workspace-bin.prerm
diff --git a/debian/kdebase-workspace-data.install b/debian/kde-workspace-data.install
similarity index 100%
rename from debian/kdebase-workspace-data.install
rename to debian/kde-workspace-data.install
diff --git a/debian/kdebase-workspace-data.install.linux b/debian/kde-workspace-data.install.linux
similarity index 100%
rename from debian/kdebase-workspace-data.install.linux
rename to debian/kde-workspace-data.install.linux
diff --git a/debian/kdebase-workspace-dev.install b/debian/kde-workspace-dev.install
similarity index 100%
rename from debian/kdebase-workspace-dev.install
rename to debian/kde-workspace-dev.install
diff --git a/debian/kdebase-workspace-kgreet-plugins.install b/debian/kde-workspace-kgreet-plugins.install
similarity index 100%
rename from debian/kdebase-workspace-kgreet-plugins.install
rename to debian/kde-workspace-kgreet-plugins.install
diff --git a/debian/rules b/debian/rules
index 9315e3f..c6a9fd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 dh = --with=python2
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-libpkgs_addsubst_allLibraries = kdebase-workspace-dev
+libpkgs_addsubst_allLibraries = kde-workspace-dev
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
@@ -20,15 +20,15 @@ override_dh_auto_install:
 .PHONY: override_dh_auto_test
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kdebase-workspace-dbg
+	$(overridden_command) --dbg-package=kde-workspace-dbg
 
 override_dh_makeshlibs:
 	$(overridden_command) -pplasma-desktop -Xlibkickoff.so
 	$(overridden_command) --remaining-packages -- -c0
 
 override_dh_shlibdeps:
-	$(overridden_command) -pkdebase-workspace-bin -- -xksysguard
-	$(overridden_command) -pkdebase-workspace-dev -- -xkdebase-runtime
+	$(overridden_command) -pkde-workspace-bin -- -xksysguard
+	$(overridden_command) -pkde-workspace-dev -- -xkdebase-runtime
 	$(overridden_command) $(foreach p,$(filter lib%,$(shell dh_listpackages -a)),-p$p) -- -xkdebase-runtime
 	$(overridden_command) --remaining-packages
 

-- 
KDE Base Workspace module packaging

