[SCM] breeze packaging branch, master, updated. ubuntu/4%5.4.1-0ubuntu1-33-g5fd05ba

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8b1bb81922ec50d4ad0dd6fee2010a797dd76fdd
Merge: 81299955b97291ca058b45c3d2f142780c3d313b 5e4000b997ed19fe9b31003d76c39fefd2901efd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 15 22:21:41 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'

 debian/breeze-cursor-theme.install  |  5 ++++
 debian/breeze-cursor-theme.postinst |  6 ++--
 debian/breeze-cursor-theme.prerm    |  4 +--
 debian/changelog                    | 59 +++++++++++++++++++++++++++++++++++++
 debian/rules                        |  7 +++++
 debian/wrapperthemes.sh             | 14 +++++++++
 6 files changed, 90 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 7ee00c9,f642185..1e276e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,62 +1,109 @@@
 +breeze (4:5.4.1-1) unstable; urgency=medium
 +
 +  * New upstream release (5.4.1).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:46 +0200
 +
+ breeze (4:5.4.1-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:10:36 +0100
+ 
 +breeze (4:5.4.0-1) unstable; urgency=medium
 +
 +  * New upstream release (5.4.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 22:07:07 +0200
 +
+ breeze (4:5.4.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:46:44 +0100
+ 
+ breeze (4:5.3.95-0ubuntu4) wily; urgency=medium
+ 
+   * No change rebuild to adopt kdecorationv5 everywhere.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Sun, 30 Aug 2015 17:07:35 +0200
+ 
+ breeze (4:5.3.95-0ubuntu3) wily; urgency=medium
+ 
+   * No change rebuild to adopt kdecorationv5. 2nd try after v5 was
+     accepted into proposed.
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 25 Aug 2015 14:37:48 +0200
+ 
+ breeze (4:5.3.95-0ubuntu2) wily; urgency=medium
+ 
+   * No change rebuild to adopt kdecorationv5
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 25 Aug 2015 13:44:31 +0200
+ 
+ breeze (4:5.3.95-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
 -  * Vivid backport 
 -  * Manual merge. 
 -  * Fix merge. 
 -  * Fix merge again. 
 -  * Fix merge yet again. 
++  * Vivid backport
++  * Manual merge.
++  * Fix merge.
++  * Fix merge again.
++  * Fix merge yet again.
+   * Merge problems again.
+ 
+   [ Jonathan Riddell ]
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:11:47 +0200
+ 
 +breeze (4:5.3.2-4) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Revert my changes from the last upload. (Closes: #794061)
 +    - Ship a symlink from the qt4 plugin to the kde4 plugin dir.
 +
 + -- Felix Geyer <fgeyer at debian.org>  Mon, 03 Aug 2015 22:46:20 +0200
 +
 +breeze (4:5.3.2-3) unstable; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * Add a symlink for kde-style-breeze-qt4 in the qt4 plugins dirs.
 +    (Closes: #792119)
 +
 +  [ Felix Geyer ]
 +  * Move the breeze qt4 plugin to the default qt4 plugin path instead
 +    of adding a symlink.
 +
 + -- Felix Geyer <fgeyer at debian.org>  Wed, 29 Jul 2015 22:42:28 +0200
 +
 +breeze (4:5.3.2-2) unstable; urgency=medium
 +
 +  * Improve Recommends.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 13:37:36 +0200
 +
 +breeze (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 12:21:01 +0200
 +
+ breeze (4:5.3.2-0ubuntu2) wily; urgency=medium
+ 
+   * generate /etc/X11/cursors/{breeze_cursors,Breeze_Snow}.theme again
+     to fix the breeze-cursor-theme.postinst failure
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 27 Jul 2015 21:12:41 +0200
+ 
+ breeze (4:5.3.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:25:44 +0000
+ 
  breeze (4:5.3.1-0ubuntu1) wily; urgency=medium
  
    [ Jonathan Riddell ]
diff --cc debian/rules
index 0d0ac15,51f6119..e315f3a
--- a/debian/rules
+++ b/debian/rules
@@@ -19,8 -17,15 +19,15 @@@ override_dh_auto_build
  override_dh_auto_install:
  	$(overridden_command)
  	$(overridden_command) --builddirectory=build-qt4
 -	debian/wrapperthemes.sh breeze_cursors
 -	debian/wrapperthemes.sh Breeze_Snow
 +	mkdir -p debian/kde-style-breeze-qt4/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/styles/
 +	ln -s /usr/lib/kde4/plugins/styles/breeze.so debian/kde-style-breeze-qt4/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/styles/
  
+ override_dh_install:
+ 	# This is required to make sure Plasma does not
+ 	# fall back to a cursor theme from the 90's
+ 	debian/wrapperthemes.sh breeze_cursors
+ 	debian/wrapperthemes.sh Breeze_Snow
+ 	$(overridden_command)
+ 
  override_dh_strip:
  	$(overridden_command) --dbg-package=breeze-dbg

-- 
breeze packaging