[SCM] libksysguard packaging branch, kubuntu_unstable, updated. e678c8a9ae59519734094e6dd23506b18aedd025

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 0802a1d04862b0eee1fcbae3eba9c27933cb928e
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 7 09:15:22 2014 +0200

    Bump rules to new pkg-kde include for kde frameworks 5
    
    * Bump rules to new pkg-kde include for kde frameworks 5
      + This is to build the package as any other frameworks 5 based package.
      + Drop the manual path change on the dbus config in the -data.install
        as the new pkg-kde should automatically make config content go to
        /etc making the manual move from /usr/etc to /etc pointless.
      + Drop not-installed as the only filelisted there was the moved /usr/etc/
        file
---
 debian/changelog                    | 7 +++++++
 debian/libkf5sysguard-dev.install   | 1 -
 debian/libkf5sysguard5-data.install | 2 +-
 debian/not-installed                | 2 --
 debian/rules                        | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3a357e..453acb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,13 @@ libksysguard (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
   * Revise build-dependencies to only include direct build dependencies,
     dependencies of build dependencies should be pulled in by the build
     dependencies themselves.
+  * Bump rules to new pkg-kde include for kde frameworks 5
+    + This is to build the package as any other frameworks 5 based package.
+    + Drop the manual path change on the dbus config in the -data.install
+      as the new pkg-kde should automatically make config content go to
+      /etc making the manual move from /usr/etc to /etc pointless.
+    + Drop not-installed as the only filelisted there was the moved /usr/etc/
+      file
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:27:56 +0200
 
diff --git a/debian/libkf5sysguard-dev.install b/debian/libkf5sysguard-dev.install
index c34fce1..cea2939 100644
--- a/debian/libkf5sysguard-dev.install
+++ b/debian/libkf5sysguard-dev.install
@@ -1,4 +1,3 @@
-
 usr/include/*
 usr/lib/*/*.so
 usr/lib/*/cmake/*
diff --git a/debian/libkf5sysguard5-data.install b/debian/libkf5sysguard5-data.install
index 9fe2c55..b8998b4 100644
--- a/debian/libkf5sysguard5-data.install
+++ b/debian/libkf5sysguard5-data.install
@@ -1,4 +1,4 @@
-usr/etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
 usr/share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
 usr/share/ksysguard/*
 usr/share/locale/*
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 39d9488..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,2 +0,0 @@
-#installed to /etc
-./usr/etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf 
diff --git a/debian/rules b/debian/rules
index ddb4721..11e64f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libksysguard5-dbg

-- 
libksysguard packaging