[SCM] kinfocenter packaging branch, master, updated. debian/5.3.2-1-10-g9d94d5b

Maximiliano Curia maxy at moszumanska.debian.org
Thu Sep 3 23:10:53 UTC 2015


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

The following commit has been merged in the master branch:
commit 9d94d5b523140b167f5abf5dafa2db242c3f1382
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 3 22:31:56 2015 +0200

    Use usb.ids from usbutils.
---
 debian/changelog         | 3 ++-
 debian/control           | 2 +-
 debian/kinfocenter.links | 1 +
 debian/rules             | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac9d5f9..95bb5e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 kinfocenter (4:5.4.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.4.0).
-  * Overkill oui.db update. (Closes: #696459, #791426)
+  * Overkill oui.db update. (Closes: #791426) Thanks to Bastien ROUCARIES
+  * Use usb.ids from usbutils. (Closes: #696459) Thanks to Bob Bib
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Sep 2015 23:37:03 +0200
 
diff --git a/debian/control b/debian/control
index 66148c4..ad868a1 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kinfocenter.git
 
 Package: kinfocenter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ieee-data
+Depends: ${misc:Depends}, ${shlibs:Depends}, ieee-data, usbutils
 Breaks: about-distro (<< 4:5.2.95),
         kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
         kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
diff --git a/debian/kinfocenter.links b/debian/kinfocenter.links
index 8ef3d7d..3ff0ca4 100644
--- a/debian/kinfocenter.links
+++ b/debian/kinfocenter.links
@@ -1 +1,2 @@
 var/lib/ieee-data/kinfocenter_oui.db usr/share/kcmview1394/oui.db
+usr/share/misc/usb.ids usr/share/kcmusb/usb.ids
diff --git a/debian/rules b/debian/rules
index 4d93e31..1e70c6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,4 +11,5 @@ override_dh_strip:
 
 override_dh_install:
 	rm debian/tmp/usr/share/kcmview1394/oui.db
+	rm debian/tmp/usr/share/kcmusb/usb.ids
 	$(overridden_command)

-- 
kinfocenter packaging



More information about the pkg-kde-commits mailing list