diff -u xscreensaver-5.30/debian/changelog xscreensaver-5.30/debian/changelog --- xscreensaver-5.30/debian/changelog +++ xscreensaver-5.30/debian/changelog @@ -1,3 +1,21 @@ +xscreensaver (5.30-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove old cruft in maitainer script, not compliant + with policy of the day: + - xscreensaver.preinst snippet used for lenny->squeeze + transition (move configuration file). + - xscreensaver*.post* snippet used for potato->woody + transition (rm symlink /usr/doc/xscreensaver + and rm symlink + /usr/X11R6/lib/X11/app-defaults/XScreenSaver and + /etc/X11/app-defaults/XScreenSaver + and dpkg-divert stuff) + * Bug fix: "postinst overwrites /etc/X11/app-defaults/XScreenSaver + without asking", thanks to Bjørn Mork (Closes: #767019). + + -- Bastien Roucariès Sun, 16 Nov 2014 17:26:25 +0100 + xscreensaver (5.30-1) unstable; urgency=low * New upstream release 5.30 diff -u xscreensaver-5.30/debian/xscreensaver-gl.postinst xscreensaver-5.30/debian/xscreensaver-gl.postinst --- xscreensaver-5.30/debian/xscreensaver-gl.postinst +++ xscreensaver-5.30/debian/xscreensaver-gl.postinst @@ -3,20 +3,15 @@ set -e -# remove old link if it exists -if [ -L /usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then - rm /usr/X11R6/lib/X11/app-defaults/XScreenSaver -fi - cd /etc/X11/app-defaults -if [ -f XScreenSaver-gl ]; then - ln -sf XScreenSaver-gl XScreenSaver -else - ln -sf XScreenSaver-nogl XScreenSaver +# do not write symlink if file exist +if [ ! -e XScreenSaver ]; then + if [ -f XScreenSaver-gl ]; then + ln -sf XScreenSaver-gl XScreenSaver + else + ln -sf XScreenSaver-nogl XScreenSaver + fi fi -# Remove /usr/doc symlink -if [ -d /usr/doc -a -h /usr/doc/xscreensaver-gl -a -d /usr/share/doc/xscreensaver-gl ]; then - rm -f /usr/doc/xscreensaver-gl -fi + #DEBHELPER# diff -u xscreensaver-5.30/debian/xscreensaver-gl.postrm xscreensaver-5.30/debian/xscreensaver-gl.postrm --- xscreensaver-5.30/debian/xscreensaver-gl.postrm +++ xscreensaver-5.30/debian/xscreensaver-gl.postrm @@ -4,17 +4,19 @@ case "$1" in remove|purge) + # remove config link if [ -L /etc/X11/app-defaults/XScreenSaver ]; then - rm /etc/X11/app-defaults/XScreenSaver - if [ -f /etc/X11/app-defaults/XScreenSaver-nogl ]; then - ln -sf XScreenSaver-nogl /etc/X11/app-defaults/XScreenSaver - fi - fi - if [ -L /usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then - rm /usr/X11R6/lib/X11/app-defaults/XScreenSaver - fi - if [ -L /usr/doc/xscreensaver-gl ]; then - rm -f /usr/doc/xscreensaver-gl + # check if not customized + if [ "$(readlink /etc/X11/app-defaults/XScreenSaver)" = "XScreenSaver-gl"]; then + # trying to go back to XScreenSaver-nogl + if [ -e /etc/X11/app-defaults/XScreenSaver-nogl ]; then + ln -sf XScreenSaver-nogl /etc/X11/app-defaults/XScreenSaver.dpkg-new + mv -f /etc/X11/app-defaults/XScreenSaver.dpkg-new /etc/X11/app-defaults/XScreenSaver + # no XScrenSaver-nogl + else + rm -f /etc/X11/app-defaults/XScreenSaver + fi + fi fi ;; esac diff -u xscreensaver-5.30/debian/xscreensaver.postinst xscreensaver-5.30/debian/xscreensaver.postinst --- xscreensaver-5.30/debian/xscreensaver.postinst +++ xscreensaver-5.30/debian/xscreensaver.postinst @@ -3,33 +3,15 @@ set -e -#fix up our old screwup -if dpkg-divert --list /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop | grep -q "diversion of /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop to /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop.orig by xscreensaver"; then - rm -f /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop - rm -f /usr/share/control-center/Desktop/screensaver-properties.desktop - dpkg-divert --package xscreensaver --remove --rename --divert \ - /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop.orig \ - /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop - dpkg-divert --package xscreensaver --remove --rename --divert \ - /usr/share/control-center/Desktop/screensaver-properties.desktop.orig \ - /usr/share/control-center/Desktop/screensaver-properties.desktop -fi - -# remove old link if it exists -if [ -L /usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then - rm /usr/X11R6/lib/X11/app-defaults/XScreenSaver -fi - # Use the correct app defaults cd /etc/X11/app-defaults -if [ -f XScreenSaver-gl ]; then - ln -sf XScreenSaver-gl XScreenSaver -else - ln -sf XScreenSaver-nogl XScreenSaver +# do not write symlink if file exist +if [ ! -e XScreenSaver ]; then + if [ -f XScreenSaver-gl ]; then + ln -sf XScreenSaver-gl XScreenSaver + else + ln -sf XScreenSaver-nogl XScreenSaver + fi fi -# Remove /usr/doc symlink -if [ -d /usr/doc -a -h /usr/doc/xscreensaver -a -d /usr/share/doc/xscreensaver ]; then - rm -f /usr/doc/xscreensaver -fi #DEBHELPER# diff -u xscreensaver-5.30/debian/xscreensaver.postrm xscreensaver-5.30/debian/xscreensaver.postrm --- xscreensaver-5.30/debian/xscreensaver.postrm +++ xscreensaver-5.30/debian/xscreensaver.postrm @@ -11,14 +11,13 @@ suidunregister -s xscreensaver /usr/bin/xscreensaver suidunregister -s xscreensaver /usr/lib/xscreensaver/sonar fi + + # remove custom link if [ -L /etc/X11/app-defaults/XScreenSaver ]; then - rm /etc/X11/app-defaults/XScreenSaver - fi - if [ -L /usr/X11R6/lib/X11/app-defaults/XScreenSaver ]; then - rm /usr/X11R6/lib/X11/app-defaults/XScreenSaver - fi - if [ -L /usr/doc/xscreensaver ]; then - rm -f /usr/doc/xscreensaver + if [ "$(readlink /etc/X11/app-defaults/XScreenSaver)" = "XScreenSaver-nogl" -o \ + "$(readlink /etc/X11/app-defaults/XScreenSaver)" = "XScreenSaver-gl"]; then + rm /etc/X11/app-defaults/XScreenSaver + fi fi ;; esac diff -u xscreensaver-5.30/debian/xscreensaver.preinst xscreensaver-5.30/debian/xscreensaver.preinst --- xscreensaver-5.30/debian/xscreensaver.preinst +++ xscreensaver-5.30/debian/xscreensaver.preinst @@ -5,39 +5,6 @@ set -e -# Remove a no-longer used conffile -rm_conffile() { - local PKGNAME="$1" - local CONFFILE="$2" - - [ -e "$CONFFILE" ] || return 0 - - local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" - local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ - sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi -} - -case "$1" in -install|upgrade) - # Remove a file which was mistakenly shipped in 5.10-2 - # and kept in 5.10-3 but deleted unconditionally since 5.10-4 - if dpkg --compare-versions "$2" le "5.10-3"; then - rm_conffile xscreensaver "/etc/X11/Xsession.d/80xscreensaver_start" - fi - # Was shipped in -3,-4,-5 but deleted unconditionally since 5.10-6 - if dpkg --compare-versions "$2" le "5.10-5"; then - rm_conffile xscreensaver "/etc/xdg/autostart/xscreensaver-daemon.desktop" - fi -esac - #DEBHELPER# exit 0