[SCM] breeze packaging branch, kubuntu_vivid_archive, updated. 942cbbb4140ae35892e72fe3491be0978422f830

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 942cbbb4140ae35892e72fe3491be0978422f830
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 30 13:00:28 2015 +0200

    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.
---
 debian/breeze-cursor-theme.install  |  2 ++
 debian/breeze-cursor-theme.postinst | 19 +++++++++----------
 debian/breeze-cursor-theme.prerm    |  4 ++--
 debian/changelog                    |  8 ++++++++
 debian/rules                        |  6 +++++-
 debian/wrapperthemes.sh             | 14 ++++++++++++++
 6 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/debian/breeze-cursor-theme.install b/debian/breeze-cursor-theme.install
index 0c81eda..11947c0 100644
--- a/debian/breeze-cursor-theme.install
+++ b/debian/breeze-cursor-theme.install
@@ -1,2 +1,4 @@
+etc/X11/cursors/Breeze_Snow.theme
+etc/X11/cursors/breeze_cursors.theme
 usr/share/icons/Breeze_Snow/
 usr/share/icons/breeze_cursors/
diff --git a/debian/breeze-cursor-theme.postinst b/debian/breeze-cursor-theme.postinst
index 857e112..ebc8e63 100644
--- a/debian/breeze-cursor-theme.postinst
+++ b/debian/breeze-cursor-theme.postinst
@@ -2,19 +2,18 @@
 
 set -e
 
-MAINPRIORITY=101 # DMZ+1
+MAINPRIORITY=102 # DMZ+2 (was +1 previously, need upgrade)
 SECONDARYPRIORITY=41 # Oxygen+1
 TARGET=/usr/share/icons/default/index.theme
-ICONDIR=/usr/share/icons
+ICONDIR=/etc/X11/cursors
+THEMES="breeze_cursors Breeze_Snow"
 
-update-alternatives --install $TARGET \
-    x-cursor-theme \
-        $ICONDIR/breeze_cursors/index.theme \
-        $MAINPRIORITY
-update-alternatives --install $TARGET \
-    x-cursor-theme \
-        $ICONDIR/Breeze_Snow/index.theme \
-        $SECONDARYPRIORITY
+for theme in $THEMES; do
+    update-alternatives --install $TARGET \
+        x-cursor-theme \
+            $ICONDIR/$theme.theme \
+            $MAINPRIORITY
+done
 
 #DEBHELPER#
 
diff --git a/debian/breeze-cursor-theme.prerm b/debian/breeze-cursor-theme.prerm
index 3f122b2..1858e9d 100644
--- a/debian/breeze-cursor-theme.prerm
+++ b/debian/breeze-cursor-theme.prerm
@@ -2,14 +2,14 @@
 
 set -e
 
-ICONDIR=/usr/share/icons
+ICONDIR=/etc/X11/cursors
 THEMES="breeze_cursors Breeze_Snow"
 
 case "$1" in
     remove|deconfigure|failed-upgrade)
         for theme in $THEMES; do
             update-alternatives --remove x-cursor-theme \
-                $ICONDIR/$theme/index.theme
+                $ICONDIR/$theme.theme
         done
   ;;
 esac
diff --git a/debian/changelog b/debian/changelog
index ab49deb..bc64b3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.2.2-0ubuntu1) vivid; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/rules b/debian/rules
index 2011cc6..5c0ee63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_install:
+	debian/wrapperthemes.sh breeze_cursors
+	debian/wrapperthemes.sh Breeze_Snow
+	$(overridden_command)
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=breeze-dbg
diff --git a/debian/wrapperthemes.sh b/debian/wrapperthemes.sh
new file mode 100755
index 0000000..61c6d84
--- /dev/null
+++ b/debian/wrapperthemes.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+ICONDIR=usr/share/icons
+WRAPPERDIR=etc/X11/cursors
+CURDIR=`pwd`
+
+theme=$1
+
+mkdir -p debian/tmp/${WRAPPERDIR}
+cd debian/tmp/${ICONDIR}
+grep -v Inherits ${CURDIR}/debian/tmp/${ICONDIR}/${theme}/index.theme > tmp || exit 1
+echo "Inherits=${theme}" >> tmp  || exit 1
+install -m 644 tmp ${CURDIR}/debian/tmp/${WRAPPERDIR}/${theme}.theme || exit 1
+rm tmp || exit 1
+exit 0

-- 
breeze packaging