[SCM] kinfocenter packaging branch, master, updated. debian/5.4.0-1-18-gd35a54a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4079c672593405064ae61976c3a3ded668e937a4
Merge: a1ff361fb28e1cc0740a96836c3ee035a208a118 56c8370b9bfa7650af66e26eda5ddf9ceffcb5de
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 10 21:28:45 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_wily_archive'

 debian/changelog                     | 28 ++++++++++++++++++++++++++++
 debian/control                       |  4 ++--
 debian/kinfocenter.lintian-overrides |  2 --
 debian/kinfocenter.qml-ignore        |  1 +
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 6547e90,ca81fdb..8e53eec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,31 +1,61 @@@
 +kinfocenter (4:5.4.1-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.4.1).
 +  * Check it the file is there before deleting it. (Closes: #798453)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Sep 2015 21:49:41 +0200
 +
+ kinfocenter (4:5.4.1-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:16:18 +0100
+ 
 +kinfocenter (4:5.4.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.4.0).
 +  * 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>  Fri, 04 Sep 2015 01:18:57 +0200
 +
+ kinfocenter (4:5.4.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:50:03 +0100
+ 
+ kinfocenter (4:5.3.95-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:13:56 +0200
+ 
 +kinfocenter (4:5.3.2-2) unstable; urgency=medium
 +
 +  * Add the missing Breaks/Replaces. (Closes: #790806)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 14:07:48 +0200
 +
 +kinfocenter (4:5.3.2-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 01 Jul 2015 11:04:12 +0200
 +
+ kinfocenter (4:5.3.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:27:52 +0000
+ 
  kinfocenter (4:5.3.1-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]
diff --cc debian/control
index ad868a1,d0ec2c1..ef8e5f6
--- a/debian/control
+++ b/debian/control
@@@ -37,15 -37,13 +37,15 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  
  Package: kinfocenter
  Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ieee-data, usbutils
 -Depends: plasma-workspace, ${misc:Depends}, ${shlibs:Depends}
++Depends: plasma-workspace, ${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)
 +        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),
 -          kinfocenter5-data (<< 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
   The kinfocenter provides you with a centralized and convenient
   overview of your system and desktop environment.
diff --cc debian/kinfocenter.lintian-overrides
index 07e13a8,3dbcdb2..2eec0be
--- a/debian/kinfocenter.lintian-overrides
+++ b/debian/kinfocenter.lintian-overrides
@@@ -1,3 -1,4 +1,1 @@@
  kinfocenter: binary-without-manpage usr/bin/kinfocenter
--# The format is different than the one provided in ieee-data.
--kinfocenter: package-install-ieee-data usr/share/kcmview1394/oui.db
 -kinfocenter: package-installs-ieee-data usr/share/kcmview1394/oui.db

-- 
kinfocenter packaging