diff -Nru breeze-5.2.2/debian/breeze-cursor-theme.install breeze-5.2.2/debian/breeze-cursor-theme.install --- breeze-5.2.2/debian/breeze-cursor-theme.install 2015-03-24 13:32:52.000000000 +0000 +++ breeze-5.2.2/debian/breeze-cursor-theme.install 2015-03-30 11:31:12.000000000 +0000 @@ -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 -Nru breeze-5.2.2/debian/breeze-cursor-theme.postinst breeze-5.2.2/debian/breeze-cursor-theme.postinst --- breeze-5.2.2/debian/breeze-cursor-theme.postinst 2015-03-24 13:32:52.000000000 +0000 +++ breeze-5.2.2/debian/breeze-cursor-theme.postinst 2015-03-30 11:31:12.000000000 +0000 @@ -2,19 +2,26 @@ 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 +MAIN_THEMES="breeze_cursors" +SECONDARY_THEMES="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 $MAIN_THEMES; do + update-alternatives --install $TARGET \ + x-cursor-theme \ + $ICONDIR/$theme.theme \ + $MAINPRIORITY +done + +for theme in $SECONDARY_THEMES; do + update-alternatives --install $TARGET \ + x-cursor-theme \ + $ICONDIR/$theme.theme \ + $SECONDARYPRIORITY +done #DEBHELPER# diff -Nru breeze-5.2.2/debian/breeze-cursor-theme.prerm breeze-5.2.2/debian/breeze-cursor-theme.prerm --- breeze-5.2.2/debian/breeze-cursor-theme.prerm 2015-03-24 13:32:52.000000000 +0000 +++ breeze-5.2.2/debian/breeze-cursor-theme.prerm 2015-03-30 11:31:12.000000000 +0000 @@ -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 -Nru breeze-5.2.2/debian/changelog breeze-5.2.2/debian/changelog --- breeze-5.2.2/debian/changelog 2015-03-24 13:32:53.000000000 +0000 +++ breeze-5.2.2/debian/changelog 2015-03-30 11:31:12.000000000 +0000 @@ -1,3 +1,17 @@ +breeze (4:5.2.2-0ubuntu3) vivid; urgency=medium + + * Make sure we assign a different priority to secondary cursor themes + + -- Harald Sitter 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 Mon, 30 Mar 2015 12:59:09 +0200 + breeze (4:5.2.2-0ubuntu1) vivid; urgency=medium [ Scarlett Clark ] diff -Nru breeze-5.2.2/debian/rules breeze-5.2.2/debian/rules --- breeze-5.2.2/debian/rules 2015-03-24 13:32:52.000000000 +0000 +++ breeze-5.2.2/debian/rules 2015-03-30 11:31:12.000000000 +0000 @@ -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 -Nru breeze-5.2.2/debian/wrapperthemes.sh breeze-5.2.2/debian/wrapperthemes.sh --- breeze-5.2.2/debian/wrapperthemes.sh 1970-01-01 00:00:00.000000000 +0000 +++ breeze-5.2.2/debian/wrapperthemes.sh 2015-03-30 11:31:12.000000000 +0000 @@ -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