[SCM] kinfocenter packaging branch, kubuntu_wily_backports, updated. debian/5.4.3-1-19-g0418305

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 474b6027c08da9a9d16b1198605c8a489da4776c
Merge: a32a68382db4ff67217045ba1d65147521601de7 24ad46a16ec1e607553205d75464b5f4543a6d12
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 4 21:07:33 2015 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:52 +0100 * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:10 +0200 * New upstream release (5.4.1). * Check it the file is there before deleting it. (Closes: #798453)
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:18 +0200
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:52 +0100
     * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:10 +0200
     * New upstream release (5.4.1).
     * Check it the file is there before deleting it. (Closes: #798453)
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:18 +0200

 debian/changelog                     |  71 ++++++---
 debian/control                       |  25 +++-
 debian/copyright                     | 281 +++++++++++++++++++++++++++--------
 debian/kinfocenter.install           |   1 +
 debian/kinfocenter.links             |   2 +
 debian/kinfocenter.lintian-overrides |   3 -
 debian/kinfocenter.postinst          |  15 ++
 debian/kinfocenter.postrm            |  13 ++
 debian/kinfocenter_oui.sh            |  17 +++
 debian/rules                         |  12 ++
 10 files changed, 354 insertions(+), 86 deletions(-)

diff --cc debian/changelog
index fb4d275,28fc612..36d86d2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,22 +1,50 @@@
++kinfocenter (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++  * Debian merge: No remaining changes. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 21:04:40 -0800
++
 +kinfocenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream bugfix release
 +
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:31:06 +0100
 +
+ kinfocenter (4:5.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:52 +0100
+ 
+ kinfocenter (4:5.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:10 +0200
+ 
 +kinfocenter (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 11:43:35 -0700
 +
 +kinfocenter (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:53:54 +0100
 +
+ kinfocenter (4:5.4.1-1) unstable; 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>  Fri, 11 Sep 2015 18:45:18 +0200
+ 
  kinfocenter (4:5.4.1-0ubuntu1) wily; urgency=medium
  
    * new upstream release
diff --cc debian/control
index f7e0b73,8512d30..41e9445
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,8 +9,12 @@@ Build-Depends: cmake (>= 2.8.12)
                 kdoctools-dev (>= 5.9.0~),
                 kinit-dev,
                 kio-dev (>= 5.9.0~),
++<<<<<<< HEAD
 +               kwayland-dev (>= 4:5.4.3~),
++=======
+                kwayland-dev (>= 4:5.4.1~),
+                libegl1-mesa-dev,
++>>>>>>> master
                 libkf5completion-dev (>= 5.9.0~),
                 libkf5config-dev (>= 5.9.0~),
                 libkf5configwidgets-dev (>= 5.9.0~),
@@@ -37,13 -38,19 +42,23 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  
  Package: kinfocenter
  Architecture: any
++<<<<<<< HEAD
 +Depends: baloo-kf5, plasma-workspace, ${misc:Depends}, ${shlibs:Depends}
++=======
+ Depends: ieee-data,
+          plasma-workspace,
+          usbutils,
+          ${misc:Depends},
+          ${shlibs:Depends}
++>>>>>>> master
  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.

-- 
kinfocenter packaging