[SCM] breeze packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%5.3.2-0ubuntu1-11-g7473fd1

Scarlett Clark sgclark-guest at moszumanska.debian.org
Wed Aug 5 04:13:14 UTC 2015


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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 7473fd16fbcb37e7dff530b5cd45fb152177a564
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Aug 4 21:12:56 2015 -0700

    Fix merge.
    
    * Fix merge.
    * Fix merge again.
    * Fix merge yet again.
    * generate /etc/X11/cursors/{breeze_cursors,Breeze_Snow}.theme again
      to fix the breeze-cursor-theme.postinst failure
---
 debian/changelog | 14 ++++++++++++--
 debian/rules     |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa50936..708ae7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-breeze (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+breeze (4:5.3.2-0ubuntu3) UNRELEASED; urgency=medium
 
   * Vivid backport
   * Manual merge. 
+  * Fix merge. 
+  * Fix merge again. 
+  * Fix merge yet again. 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 11:21:36 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 04 Aug 2015 21:01:53 -0700
+
+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
 
diff --git a/debian/rules b/debian/rules
index 567b112..51f6119 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ 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
 
 override_dh_install:
 	# This is required to make sure Plasma does not

-- 
breeze packaging



More information about the pkg-kde-commits mailing list