r28910 - in /desktop/unstable/gnome-icon-theme/debian: changelog postinst preinst prerm rules swirl-foot.svg

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jul 17 08:48:27 2011
New Revision: 28910

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28910
Log:
* Drop swirl-foot.svg upon upstream request.
* prerm:
  + Drop the pre-squeeze upgrade code.
  + Add code to remove the swirl-foot.svg alternative.

Removed:
    desktop/unstable/gnome-icon-theme/debian/swirl-foot.svg
Modified:
    desktop/unstable/gnome-icon-theme/debian/changelog
    desktop/unstable/gnome-icon-theme/debian/postinst
    desktop/unstable/gnome-icon-theme/debian/preinst
    desktop/unstable/gnome-icon-theme/debian/prerm
    desktop/unstable/gnome-icon-theme/debian/rules

Modified: desktop/unstable/gnome-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/changelog?rev=28910&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-icon-theme/debian/changelog [utf-8] Sun Jul 17 08:48:27 2011
@@ -1,3 +1,12 @@
+gnome-icon-theme (3.0.0-5) UNRELEASED; urgency=low
+
+  * Drop swirl-foot.svg upon upstream request.
+  * prerm:
+    + Drop the pre-squeeze upgrade code.
+    + Add code to remove the swirl-foot.svg alternative.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 17 Jul 2011 10:48:10 +0200
+
 gnome-icon-theme (3.0.0-4) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-icon-theme/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/postinst?rev=28910&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/postinst [utf-8] (original)
+++ desktop/unstable/gnome-icon-theme/debian/postinst [utf-8] Sun Jul 17 08:48:27 2011
@@ -26,7 +26,6 @@
   done ) << EOF
 debian-swirl 30
 gnome-foot 20
-swirl-foot 20
 EOF
 
 write_cache

Modified: desktop/unstable/gnome-icon-theme/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/preinst?rev=28910&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/preinst [utf-8] (original)
+++ desktop/unstable/gnome-icon-theme/debian/preinst [utf-8] Sun Jul 17 08:48:27 2011
@@ -2,15 +2,8 @@
 
 set -e
 
-if [ "$1" = "upgrade" ] && [ "$2" = 2.30.0-1 ]; then
-  ( while read name prio; do
-      update-alternatives --remove start-here-32.png /usr/share/icons/gnome/32x32/places/$name.png 2> /dev/null || true
-    done ) << EOF
-debian-swirl 30
-gnome-foot 20
-swirl-foot 20
-EOF
-
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "3.0.0-5"; then
+  update-alternatives --remove start-here.svg /usr/share/icons/gnome/scalable/places/swirl-foot.svg
 fi
 
 #DEBHELPER#

Modified: desktop/unstable/gnome-icon-theme/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/prerm?rev=28910&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/prerm [utf-8] (original)
+++ desktop/unstable/gnome-icon-theme/debian/prerm [utf-8] Sun Jul 17 08:48:27 2011
@@ -2,7 +2,7 @@
 set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
-  for name in debian-swirl gnome-foot swirl-foot; do
+  for name in debian-swirl gnome-foot; do
     update-alternatives --remove start-here.svg /usr/share/icons/gnome/scalable/places/$name.svg
   done
   rm -f /usr/share/icons/gnome/icon-theme.cache

Modified: desktop/unstable/gnome-icon-theme/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/rules?rev=28910&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-icon-theme/debian/rules [utf-8] Sun Jul 17 08:48:27 2011
@@ -22,6 +22,5 @@
 		if [ -d $(INSTDIR)/$$d/places ]; then \
 			mv $(INSTDIR)/$$d/places/start-here.png $(INSTDIR)/$$d/places/gnome-foot.png ; \
 			rsvg-convert -w $$i -h $$i -o $(INSTDIR)/$$d/places/debian-swirl.png debian/debian-swirl.svg ; \
-			rsvg-convert -w $$i -h $$i -o $(INSTDIR)/$$d/places/swirl-foot.png debian/swirl-foot.svg ; \
 		fi ; \
 	done