[SCM] breeze packaging branch, kubuntu_stable, updated. 9efa9a5bc438987750760bc6a0a73ba66b843bf1

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 9efa9a5bc438987750760bc6a0a73ba66b843bf1
Merge: b1781b268c2a9e1025ce3529e08ee725fd07b1f0 7de15b93b4e19f5c1175dc1efa8bcb2888bac80d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:04:45 2015 +0200

    add breeze

 debian/.gitattributes               |   1 +
 debian/breeze.install               |   8 +++
 debian/changelog                    |  32 +++++++++-
 debian/control                      |  42 +++++++++-----
 debian/copyright                    | 113 ++++++++++++++++++++++++++++++++++++
 debian/kde-style-breeze-qt4.install |   3 +
 debian/kde-style-breeze.install     |   9 ++-
 debian/kwin-style-breeze.install    |   5 ++
 debian/rules                        |  18 ++++++
 debian/watch                        |   5 +-
 10 files changed, 217 insertions(+), 19 deletions(-)

diff --cc debian/breeze.install
index c86cd04,1da3213..ac88a44
--- a/debian/breeze.install
+++ b/debian/breeze.install
@@@ -1,5 -1,7 +1,13 @@@
++<<<<<<< HEAD
++=======
++>>>>>>> master
  usr/bin/breeze-settings5
 +usr/lib/*/kconf_update_bin
+ usr/lib/*/kconf_update_bin/gtkbreeze
+ usr/lib/*/kconf_update_bin/kde4breeze
 +usr/share/icons/hicolor/*/apps/breeze-settings.*
+ usr/share/icons/hicolor/scalable/apps/breeze-settings.svgz
 +usr/share/kconf_update
+ usr/share/kconf_update/gtkbreeze.upd
+ usr/share/kconf_update/kde4breeze.upd
  usr/share/wallpapers/Next
diff --cc debian/changelog
index 728956c,06051bb..f3e8ee7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,20 +1,40 @@@
 +breeze (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:20:12 +0200
 +
 +breeze (4:5.2.2-0ubuntu3) vivid; urgency=medium
 +
 +  * Make sure we assign a different priority to secondary cursor themes
 +
 + -- Harald Sitter <sitter at kde.org>  Mon, 30 Mar 2015 13:30:40 +0200
 +
 +breeze (4:5.2.2-0ubuntu2) vivid; urgency=medium
 +
 +  * Revise postinst and prerm for cursor themes. The themes now
 +    get inheritance configs created that we use for the default symlink which
 +    should make the default setup work as expected.
 +
 + -- Harald Sitter <sitter at kde.org>  Mon, 30 Mar 2015 12:59:09 +0200
+ breeze (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 12:00:36 +0200
+ 
+ breeze (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+   [ Felix Geyer ]
+   * Improve the copyright file.
+   * Turn breeze-cursor-theme and breeze-icon-theme into arch-all packages.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:18:01 +0100
  
  breeze (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
diff --cc debian/kde-style-breeze.install
index c9a13da,c6c1f98..0bec91c
--- a/debian/kde-style-breeze.install
+++ b/debian/kde-style-breeze.install
@@@ -1,8 -1,8 +1,15 @@@
++<<<<<<< HEAD
++=======
++>>>>>>> master
  usr/lib/*/qt5/plugins/kstyle_breeze_config.so
  usr/lib/*/qt5/plugins/styles/breeze.so
 +usr/share/QtCurve
+ usr/share/QtCurve/Breeze.qtcurve
 +usr/share/color-schemes
+ usr/share/color-schemes/Breeze.colors
+ usr/share/color-schemes/BreezeDark.colors
++usr/share/kservices5/breezestyleconfig.desktop
 +usr/share/kservices5/breezestyleconfig.desktop
 +usr/share/kstyle
  usr/share/kstyle/themes/breeze.themerc
- usr/share/locale/*/LC_MESSAGES/breeze_style_config.mo
+ usr/share/locale/*/*/breeze_style_config.mo
 -usr/share/kservices5/breezestyleconfig.desktop
diff --cc debian/kwin-style-breeze.install
index 0a81f28,81b9114..710f992
--- a/debian/kwin-style-breeze.install
+++ b/debian/kwin-style-breeze.install
@@@ -1,3 -1,3 +1,8 @@@
++<<<<<<< HEAD
++=======
++>>>>>>> master
  usr/lib/*/qt5/plugins/org.kde.kdecoration2/breezedecoration.so
 -usr/share/locale/*/*/breeze_kwin_deco.mo
  usr/share/kservices5/breezedecorationconfig.desktop
++usr/share/kservices5/breezedecorationconfig.desktop
++usr/share/locale/*/*/breeze_kwin_deco.mo
 +usr/share/locale/*/LC_MESSAGES/breeze_kwin_deco.mo
diff --cc debian/rules
index 5c0ee63,fcebaa8..02fe2c0
--- a/debian/rules
+++ b/debian/rules
@@@ -2,10 -2,22 +2,28 @@@
  
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
++<<<<<<< HEAD
 +override_dh_install:
 +	debian/wrapperthemes.sh breeze_cursors
 +	debian/wrapperthemes.sh Breeze_Snow
 +	$(overridden_command)
++=======
+ override_dh_auto_clean:
+ 	$(overridden_command)
+ 	rm -rf build-qt4
+ 
+ override_dh_auto_configure:
+ 	$(overridden_command)
+ 	$(overridden_command) --builddirectory=build-qt4 -- -DUSE_KDE4=true
+ 
+ override_dh_auto_build:
+ 	$(overridden_command)
+ 	$(overridden_command) --builddirectory=build-qt4
+ 
+ override_dh_auto_install:
+ 	$(overridden_command)
+ 	$(overridden_command) --builddirectory=build-qt4
++>>>>>>> master
  
  override_dh_strip:
  	$(overridden_command) --dbg-package=breeze-dbg

-- 
breeze packaging