[SCM] libksysguard packaging branch, kubuntu_unstable, updated. 1eabe3adb850fc8b4a4fd366a44420b568947eef

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libksysguard.git;a=commitdiff;h=1eabe3a

The following commit has been merged in the kubuntu_unstable branch:
commit 1eabe3adb850fc8b4a4fd366a44420b568947eef
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 20 11:51:26 2015 +0100

    rename non-lib packages
    
    random note: this entire package is not multi-arched, I suppose this is
    intentional even if a bit weird, it does have the profound advantage of
    allowing the data to be depends though. I am content to like it ;)
    
    remove versions from non-coinstallable packages, they are sort of versioned
    through their kf5 component so in the long run this should be save of
    conflicts come kf6:
    - libkf5sysguard5 => libkf5sysguard-bin
    - libkf5sysguard5-data => libkf5sysguard-data
    
    remove version and align with the rest of the names:
    - libksysguard5-dbg => libkf5sysguard-dbg
---
 debian/control | 46 ++++++++++++++++++++++++++++++++--------------
 debian/rules   |  3 +--
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 1e04062..1aced3a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Homepage: https://projects.kde.org/projects/kde/workspace/libksysguard
 Package: libkf5sysguard-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5sysguard5 (= ${binary:Version}),
+Depends: libkf5sysguard-bin (= ${binary:Version}),
          libksgrd6 (= ${binary:Version}),
          libksignalplotter6 (= ${binary:Version}),
          liblsofui6 (= ${binary:Version}),
@@ -38,20 +38,30 @@ Description: library for monitoring your system - development files
  .
  This package contains the files necessary for development.
 
-Package: libkf5sysguard5
+Package: libkf5sysguard-bin
 Architecture: any
-Depends: libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: libkf5sysguard5 (<< ${source:Version})
+Replaces: libkf5sysguard5 (<< ${source:Version})
 Description: library for monitoring your system - shared library
  KSysGuard is a program to monitor various elements of your system, or any
  other remote system with the KSysGuard daemon (ksysgardd) installed.
  .
  This package contains the shared library
 
+Package: libkf5sysguard5
+Depends: libkf5sysguard-bin (>= ${source:Version}), ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
 Package: libksgrd6
 Architecture: any
-Depends: libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: library for monitoring your system - shared library
@@ -62,8 +72,8 @@ Description: library for monitoring your system - shared library
 
 Package: libksignalplotter6
 Architecture: any
-Depends: libkf5sysguard5 (= ${binary:Version}),
-         libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-bin (= ${binary:Version}),
+         libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: library for monitoring your system - shared library
@@ -74,7 +84,7 @@ Description: library for monitoring your system - shared library
 
 Package: liblsofui6
 Architecture: any
-Depends: libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: library for monitoring your system - shared library
@@ -85,7 +95,7 @@ Description: library for monitoring your system - shared library
 
 Package: libprocesscore6
 Architecture: any
-Depends: libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: library for monitoring your system - shared library
@@ -96,7 +106,7 @@ Description: library for monitoring your system - shared library
 
 Package: libprocessui6
 Architecture: any
-Depends: libkf5sysguard5-data (= ${binary:Version}),
+Depends: libkf5sysguard-data (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: library for monitoring your system - shared library
@@ -105,22 +115,30 @@ Description: library for monitoring your system - shared library
  .
  This package contains the shared library
 
-Package: libkf5sysguard5-data
+Package: libkf5sysguard-data
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ksysguard (<< 4:5.0.0), libkf5sysguard5 (<< 4:5.0.95)
-Replaces: ksysguard (<< 4:5.0.0), libkf5sysguard5 (<< 4:5.0.95)
+Breaks: ksysguard (<< 4:5.0.0), libkf5sysguard-bin (<< 4:5.0.95), libkf5sysguard5-data (<< ${source:Version})
+Replaces: ksysguard (<< 4:5.0.0), libkf5sysguard-bin (<< 4:5.0.95), libkf5sysguard5-data (<< ${source:Version})
 Description: library for monitoring your system - shared library
  KSysGuard is a program to monitor various elements of your system, or any
  other remote system with the KSysGuard daemon (ksysgardd) installed.
  .
  This package contains the data files
 
-Package: libksysguard5-dbg
+Package: libkf5sysguard5-data
+Depends: libkf5sysguard-data (>= ${source:Version}), ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libkf5sysguard-dbg
 Section: debug
 Architecture: any
 Recommends: libqt5-dbg
-Depends: libkf5sysguard5 (= ${binary:Version}), ${misc:Depends}
+Depends: ${misc:Depends}, libprocessui6 (= ${binary:Version}) | libprocesscore6 (= ${binary:Version}) | liblsofui6 (= ${binary:Version}) | libksignalplotter6 (= ${binary:Version}) | libksgrd6 (= ${binary:Version})
 Description: library for monitoring your system - debug info
  KSysGuard is a program to monitor various elements of your system, or any
  other remote system with the KSysGuard daemon (ksysgardd) installed.
diff --git a/debian/rules b/debian/rules
index ed5a2e0..c834191 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=libksysguard5-dbg
+	$(overridden_command) --dbg-package=libkf5sysguard-dbg
 
 .PHONY: override_dh_auto_test

-- 
libksysguard packaging