[SCM] breeze packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-34-g974e95a

Scarlett Clark sgclark-guest at moszumanska.debian.org
Fri Jan 15 01:43:55 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=974e95a

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 974e95a0a3f60b602f61af29e59c0bf8bc8e3c6b
Merge: 810ab3662212bff35c790e5308a2075906d8f6e0 4221680ef8379bb2c0bac8639639614ae0aa46d5
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jan 15 01:39:41 2016 +0000

     * Remove breeze-icon-theme now part of Frameworks * Debian merge: Remaining changes: Split breeze icons to frameworks.  * Fix stable->unstable merge.  * Fix control file merge.  * New upstream release Xenial * new upstream release * Don't build-depend on the specific kdelibs5-dev version
    -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:33:36 +0000
    
     * Remove breeze-icon-theme now part of Frameworks
     * Debian merge: Remaining changes:
       Split breeze icons to frameworks.
     * Fix stable->unstable merge.
     * Fix control file merge.
     * New upstream release Xenial
     * new upstream release
     * Don't build-depend on the specific kdelibs5-dev version
    -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:33:36 +0000

 debian/changelog | 23 +++++++++++++++++++++++
 debian/control   |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 733418d,c82d5bc..8ae9634
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,23 +1,44 @@@
 +breeze (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Remove breeze-icon-theme now part of Frameworks
 +
 +  [ Scarlett Clark ]
 +  * Debian merge: Remaining changes:
 +    Split breeze icons to frameworks. 
 +  * Fix stable->unstable merge. 
 +  * Fix control file merge. 
 +  * New upstream release Xenial
 +
 +  [ Clive Johnston ]
 +  * new upstream release
 +  * New upstream release
 +
++  [ Scarlett Clark ]
++  * Merge unstable to get debian merge changes. 
++
 + -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:51:33 +0000
 +
+ breeze (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * Remove breeze-icon-theme now part of Frameworks
+ 
+   [ Scarlett Clark ]
+   * Debian merge: Remaining changes:
+     Split breeze icons to frameworks. 
+   * Fix stable->unstable merge. 
+   * Fix control file merge. 
+   * New upstream release Xenial
+ 
+   [ Clive Johnston ]
+   * new upstream release
+ 
+   [ Bhushan Shah ]
+   * Don't build-depend on the specific kdelibs5-dev version
+ 
+  -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:33:36 +0000
+ 
  breeze (4:5.4.3-0ubuntu1) xenial; urgency=medium
  
    [ Scarlett Clark ]
diff --cc debian/control
index 1c8368e,c9d2931..d40a0ef
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,19 +5,19 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.18.0~),
-                kdelibs5-dev (>= 4:4.14.15~),
+                extra-cmake-modules (>= 5.17.0~),
+                kdelibs5-dev,
                 libkdecorations2-dev (>= 4:5.5.1~),
 -               libkf5config-dev (>= 5.17.0~),
 -               libkf5configwidgets-dev (>= 5.17.0~),
 -               libkf5coreaddons-dev (>= 5.17.0~),
 -               libkf5guiaddons-dev (>= 5.17.0~),
 -               libkf5i18n-dev (>= 5.17.0~),
 -               libkf5iconthemes-dev (>= 5.17.0~),
 -               libkf5kcmutils-dev (>= 5.17.0~),
 -               libkf5service-dev (>= 5.17.0~),
 -               libkf5style-dev (>= 5.17.0~),
 -               libkf5windowsystem-dev (>= 5.17.0~),
 +               libkf5config-dev (>= 5.18.0~),
 +               libkf5configwidgets-dev (>= 5.18.0~),
 +               libkf5coreaddons-dev (>= 5.18.0~),
 +               libkf5guiaddons-dev (>= 5.18.0~),
 +               libkf5i18n-dev (>= 5.18.0~),
 +               libkf5iconthemes-dev (>= 5.18.0~),
 +               libkf5kcmutils-dev (>= 5.18.0~),
 +               libkf5service-dev (>= 5.18.0~),
 +               libkf5style-dev (>= 5.18.0~),
 +               libkf5windowsystem-dev (>= 5.18.0~),
                 libqt5x11extras5-dev (>= 5.4),
                 libx11-dev,
                 pkg-config,

-- 
breeze packaging



More information about the pkg-kde-commits mailing list