[SCM] kinfocenter packaging branch, master, updated. debian/5.7.4-1-4-g5c08b9a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 924903e5bed41d724693215d8594d2296f49092e
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 5 07:53:07 2016 +0200

    remove transitional about-distro package
---
 debian/changelog           |  7 +++++++
 debian/control             | 15 ++-------------
 debian/kinfocenter.install |  2 --
 debian/rules               |  4 ++--
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fa24f2..773adca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 kinfocenter (4:5.7.4-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Remove the transitional about-distro package, since it was never part of
+    a stable Debian release:
+    - adjust the paths in rules to point to the kinfocenter installation
+      directory
+    - simplify kinfocenter.install
+    - remove breaks/replaces in kinfocenter for it
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 Sep 2016 07:44:59 +0200
 
diff --git a/debian/control b/debian/control
index 511bac4..1e5e8cf 100644
--- a/debian/control
+++ b/debian/control
@@ -43,12 +43,10 @@ Depends: ieee-data,
          usbutils,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: about-distro (<< 4:5.2.95),
-        kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
+Breaks: kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
         kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
         ${kde-l10n:all}
-Replaces: about-distro (<< 4:5.2.95),
-          kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
+Replaces: kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
           kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
           ${kde-l10n:all}
 Description: overview of your system library
@@ -56,12 +54,3 @@ Description: overview of your system library
  overview of your system and desktop environment.
  .
  This package contains the shared library
-
-Package: about-distro
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: transitional package for kinfocenter
- This is a transitional package for kinfocenter and can be safely
- removed.
diff --git a/debian/kinfocenter.install b/debian/kinfocenter.install
index 4f011f8..de6b748 100644
--- a/debian/kinfocenter.install
+++ b/debian/kinfocenter.install
@@ -1,3 +1 @@
 debian/kinfocenter_oui.sh /var/lib/ieee-data/update.d
-etc/xdg/menus/kinfocenter.menu
-usr/*
diff --git a/debian/rules b/debian/rules
index d08ab71..f1f8293 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ override_dh_strip:
 	$(overridden_command) --dbgsym-migration='kinfocenter-dbg (<= 4:5.5.5-1~~)'
 
 override_dh_install:
-	rm debian/tmp/usr/share/kcmview1394/oui.db
-	rm debian/tmp/usr/share/kcmusb/usb.ids
+	rm debian/kinfocenter/usr/share/kcmview1394/oui.db
+	rm debian/kinfocenter/usr/share/kcmusb/usb.ids
 	$(overridden_command)
 
 override_dh_fixperms:

-- 
kinfocenter packaging