[SCM] libksysguard packaging branch, kubuntu_stable, updated. a45ab0f349fd888d07b8bcf6e928caab6c610f2c

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Thu May 28 01:35:45 UTC 2015


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

The following commit has been merged in the kubuntu_stable branch:
commit a45ab0f349fd888d07b8bcf6e928caab6c610f2c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed May 27 17:52:43 2015 -0700

    Vivid backport
    
    * Vivid backport
    * wrap-and-sort
---
 debian/changelog                  |  9 +++++++--
 debian/control                    | 11 ++++++++---
 debian/libksgrd7.install          |  2 +-
 debian/libksignalplotter7.install |  2 +-
 debian/liblsofui7.install         |  2 +-
 debian/libprocesscore7.install    |  2 +-
 debian/libprocessui7.install      |  2 +-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 987484b..a6aeba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-libksysguard (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
+libksysguard (4:5.3.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * Plasma 5.3 beta
   * new upstream release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 Apr 2015 17:04:58 +0200
+  [ Scarlett Clark ]
+  * Vivid backport
+  * wrap-and-sort 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 07:43:40 -0700
 
 libksysguard (4:5.2.2-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8d18586..3fd9eda 100644
--- a/debian/control
+++ b/debian/control
@@ -120,8 +120,12 @@ Description: library for monitoring your system - shared library
 Package: libkf5sysguard-data
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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})
+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.
@@ -140,7 +144,8 @@ Package: libkf5sysguard-dbg
 Section: debug
 Architecture: any
 Recommends: libqt5-dbg
-Depends: ${misc:Depends}, libprocessui7 (= ${binary:Version}) | libprocesscore7 (= ${binary:Version}) | liblsofui7 (= ${binary:Version}) | libksignalplotter7 (= ${binary:Version}) | libksgrd7 (= ${binary:Version})
+Depends: libprocessui7 (= ${binary:Version}) | libprocesscore7 (= ${binary:Version}) | liblsofui7 (= ${binary:Version}) | libksignalplotter7 (= ${binary:Version}) | libksgrd7 (= ${binary:Version}),
+         ${misc:Depends}
 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/libksgrd7.install b/debian/libksgrd7.install
index 28c34bb..425b8b0 100644
--- a/debian/libksgrd7.install
+++ b/debian/libksgrd7.install
@@ -1,2 +1,2 @@
-usr/lib/*/libksgrd.so.7
 usr/lib/*/libksgrd.so.5.*
+usr/lib/*/libksgrd.so.7
diff --git a/debian/libksignalplotter7.install b/debian/libksignalplotter7.install
index 7f8c64c..37e3103 100644
--- a/debian/libksignalplotter7.install
+++ b/debian/libksignalplotter7.install
@@ -1,2 +1,2 @@
-usr/lib/*/libksignalplotter.so.7
 usr/lib/*/libksignalplotter.so.5.*
+usr/lib/*/libksignalplotter.so.7
diff --git a/debian/liblsofui7.install b/debian/liblsofui7.install
index 8dbfde4..0704b1c 100644
--- a/debian/liblsofui7.install
+++ b/debian/liblsofui7.install
@@ -1,2 +1,2 @@
-usr/lib/*/liblsofui.so.7
 usr/lib/*/liblsofui.so.5.*
+usr/lib/*/liblsofui.so.7
diff --git a/debian/libprocesscore7.install b/debian/libprocesscore7.install
index 53f36b3..1f2cce6 100644
--- a/debian/libprocesscore7.install
+++ b/debian/libprocesscore7.install
@@ -1,2 +1,2 @@
-usr/lib/*/libprocesscore.so.7
 usr/lib/*/libprocesscore.so.5.*
+usr/lib/*/libprocesscore.so.7
diff --git a/debian/libprocessui7.install b/debian/libprocessui7.install
index 64bc82f..0413a0c 100644
--- a/debian/libprocessui7.install
+++ b/debian/libprocessui7.install
@@ -1,2 +1,2 @@
-usr/lib/*/libprocessui.so.7
 usr/lib/*/libprocessui.so.5.*
+usr/lib/*/libprocessui.so.7

-- 
libksysguard packaging



More information about the pkg-kde-commits mailing list