[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.6.5-1-16-g1afc772

Sun Oct 9 14:06:26 UTC 2011

The following commit has been merged in the master branch:
commit 09aab3d90f0f6252ebd3cc22171ab5e6e2fdf682
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Oct 9 14:49:05 2011 +0200

    Rename some binary packages, add dummy packages.
---
 debian/changelog                                   |    6 ++
 debian/control                                     |   52 +++++++++++++++----
 ...ntime-data.install => kde-runtime-data.install} |    0
 debian/kde-runtime-data.lintian-overrides          |    2 +
 ...kdebase-runtime.install => kde-runtime.install} |    0
 .../{kdebase-runtime.links => kde-runtime.links}   |    0
 debian/kde-runtime.lintian-overrides               |    6 ++
 ...ebase-runtime.manpages => kde-runtime.manpages} |    0
 debian/kdebase-runtime-data.lintian-overrides      |    2 -
 debian/kdebase-runtime.lintian-overrides           |    6 --
 debian/rules                                       |    5 +-
 11 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 996a807..ab7f8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,12 @@ kde-runtime (4:4.7.2-0r1) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Rename source package from kdebase-runtime to kde-runtime in order
     to match upstream naming.
+  * Rename the following binary packages:
+    - kdebase-runtime -> kde-runtime
+    - kdebase-runtime-data -> kde-runtime-data
+  * Add the following dummy packages (which depend on kde-runtime-*):
+    - kdebase-runtime
+    - kdebase-runtime-dbg
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 22 Aug 2011 19:53:35 -0300
 
diff --git a/debian/control b/debian/control
index 15e627e..c52a6e1 100644
--- a/debian/control
+++ b/debian/control
@@ -23,21 +23,23 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-runtime.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdebase-runtime.git
 
-Package: kdebase-runtime
+Package: kde-runtime
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
- kdebase-runtime-data (>= ${source:Version}), ${sameVersionDep:kdelibs5-plugins:kdebase-runtime},
+ kde-runtime-data (>= ${source:Version}), ${sameVersionDep:kdelibs5-plugins:kde-runtime},
  oxygen-icon-theme (>= 4:4.6),
  shared-desktop-ontologies, plasma-scriptengine-javascript (= ${binary:Version})
 Recommends: virtuoso-minimal
 Suggests: djvulibre-bin, icoutils, finger
 Replaces: kdebase-runtime-bin-kde4,
  kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
- kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95)
+ kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95),
+ kdebase-runtime (<< 4:4.7.2)
 Breaks: kdebase-runtime-bin-kde4,
  kdelibs5-plugins (<< 4:4.5), kdebase-workspace-bin (<< 4:4.6),
- kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95)
+ kdebluetooth (<< 1.0~beta7-1), plasma-netbook (<< 4:4.5.95),
+ kdebase-runtime (<< 4:4.7.2)
 Conflicts: kdelibs4-dev
 Description: runtime components from the official KDE release
  KDE is produced by an international technology team that creates free and open
@@ -49,16 +51,33 @@ Description: runtime components from the official KDE release
  .
  This package contains programs and data needed at runtime by KDE applications.
 
-Package: kdebase-runtime-data
+Package: kdebase-runtime
+Section: kde
+Architecture: all
+Depends: ${misc:Depends}, kde-runtime
+Description: Transitional package for the KDE runtime 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
+ modern desktop system for Linux and UNIX platforms, comprehensive office
+ productivity and groupware suites and hundreds of software titles in many
+ categories including Internet and web applications, multimedia, entertainment,
+ educational, graphics and software development.
+ .
+ This transitional package takes care of pulling in the new kde-runtime package
+ and can safely be removed after installation.
+
+Package: kde-runtime-data
 Section: kde
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}
 Replaces: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
  kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
- plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+)
+ plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+),
+ kdebase-runtime-data (<< 4:4.7.2)
 Breaks: kdebase-bin-kde3, kcontrol, kdebase-kio-plugins, kdebase-runtime-data-common,
  kdelibs5-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.5.95), plasma-netbook (<< 4:4.5.95),
- plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+)
+ plasma-widget-networkmanagement (<< 0.1+git20110422.810bc16-1+),
+ kdebase-runtime-data (<< 4:4.7.2)
 Description: shared data files for the KDE base runtime module
  This package contains the architecture-independent shared data files needed to
  run KDE applications.
@@ -100,15 +119,26 @@ Description: JavaScript script engine for Plasma
  .
  This package is part of the KDE base runtime module.
 
-Package: kdebase-runtime-dbg
+Package: kde-runtime-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
-Replaces: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
-Breaks: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
+Depends: ${misc:Depends}, kde-runtime (= ${binary:Version}), kdelibs5-dbg
+Replaces: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6),
+ kdebase-runtime-dbg (<< 4:4.7.2)
+Breaks: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6),
+ kdebase-runtime-dbg (<< 4:4.7.2)
 Conflicts: kdelibs-dbg
 Description: debugging symbols for KDE base runtime module
  This package contains the debugging symbols associated with kdebase-runtime.
  They will automatically be used by gdb for debugging kdebase-runtime related
  issues.
+
+Package: kdebase-runtime-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${misc:Depends}, kde-runtime-dbg
+Description: transitional package for kde-runtime-dbg
+ This is a dummy transitional package for kde-runtime-dbg and can be safely
+ removed after the installation is complete.
diff --git a/debian/kdebase-runtime-data.install b/debian/kde-runtime-data.install
similarity index 100%
rename from debian/kdebase-runtime-data.install
rename to debian/kde-runtime-data.install
diff --git a/debian/kde-runtime-data.lintian-overrides b/debian/kde-runtime-data.lintian-overrides
new file mode 100644
index 0000000..fd9aeb0
--- /dev/null
+++ b/debian/kde-runtime-data.lintian-overrides
@@ -0,0 +1,2 @@
+kde-runtime-data: desktop-command-not-in-package usr/share/applications/kde4/nepomukbackup.desktop nepomukbackup
+kde-runtime-data: unknown-locale-code currency
diff --git a/debian/kdebase-runtime.install b/debian/kde-runtime.install
similarity index 100%
rename from debian/kdebase-runtime.install
rename to debian/kde-runtime.install
diff --git a/debian/kdebase-runtime.links b/debian/kde-runtime.links
similarity index 100%
rename from debian/kdebase-runtime.links
rename to debian/kde-runtime.links
diff --git a/debian/kde-runtime.lintian-overrides b/debian/kde-runtime.lintian-overrides
new file mode 100644
index 0000000..05a3d4e
--- /dev/null
+++ b/debian/kde-runtime.lintian-overrides
@@ -0,0 +1,6 @@
+kde-runtime: package-name-doesnt-match-sonames
+kde-runtime: setgid-binary usr/lib/kde4/libexec/kdesud 2755 root/nogroup
+kde-runtime: desktop-command-not-in-package usr/share/applications/kde4/knetattach.desktop knetattach
+kde-runtime: shlib-without-versioned-soname usr/lib/attica_kde.so attica_kde.so
+kde-runtime: shlib-without-versioned-soname usr/lib/libknotifyplugin.so libknotifyplugin.so
+kde-runtime: shlib-without-versioned-soname usr/lib/libnepomukcommon.so libnepomukcommon.so
diff --git a/debian/kdebase-runtime.manpages b/debian/kde-runtime.manpages
similarity index 100%
rename from debian/kdebase-runtime.manpages
rename to debian/kde-runtime.manpages
diff --git a/debian/kdebase-runtime-data.lintian-overrides b/debian/kdebase-runtime-data.lintian-overrides
deleted file mode 100644
index d9bfbda..0000000
--- a/debian/kdebase-runtime-data.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-kdebase-runtime-data: desktop-command-not-in-package usr/share/applications/kde4/nepomukbackup.desktop nepomukbackup
-kdebase-runtime-data: unknown-locale-code currency
diff --git a/debian/kdebase-runtime.lintian-overrides b/debian/kdebase-runtime.lintian-overrides
deleted file mode 100644
index bdac339..0000000
--- a/debian/kdebase-runtime.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-kdebase-runtime: package-name-doesnt-match-sonames
-kdebase-runtime: setgid-binary usr/lib/kde4/libexec/kdesud 2755 root/nogroup
-kdebase-runtime: desktop-command-not-in-package usr/share/applications/kde4/knetattach.desktop knetattach
-kdebase-runtime: shlib-without-versioned-soname usr/lib/attica_kde.so attica_kde.so
-kdebase-runtime: shlib-without-versioned-soname usr/lib/libknotifyplugin.so libknotifyplugin.so
-kdebase-runtime: shlib-without-versioned-soname usr/lib/libnepomukcommon.so libnepomukcommon.so
diff --git a/debian/rules b/debian/rules
index 0a2b0e2..953e48c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,15 @@ override_dh_makeshlibs:
 	$(overridden_command) -Xusr/lib/attica_kde.so
 
 override_dh_shlibdeps:
-	$(overridden_command) -pplasma-scriptengine-javascript -- -xkdebase-runtime
+	$(overridden_command) -pplasma-scriptengine-javascript -- \
+		-xkdebase-runtime -xkde-runtime
 	$(overridden_command) --remaining-packages
 
 override_dh_fixperms:
 	$(overridden_command) -Xusr/lib/kde4/libexec/kdesud
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kdebase-runtime-dbg
+	$(overridden_command) --dbg-package=kde-runtime-dbg
 
 override_dh_xine:
 	$(overridden_command) -pkde-config-phonon-xine

-- 
KDE Base Runtime module packaging

