[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-152-g1abc2d2

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 43314d2c3f3adf0cae8e28168f513b9b76ead657
Author: David Steele <dsteele at gmail.com>
Date:   Sun Feb 24 09:57:21 2013 -0500

    Replace the Tango symlinks with copies of the files.
    
    The symlinks were broken under /var...htdocs/images, and Apache
    won't follow them without opening a security hole.
    
    This does not introduce a purge failure.
    
    Acked-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index b4aa8e4..035d24d 100644
--- a/Makefile
+++ b/Makefile
@@ -127,8 +127,6 @@ install: build-stamp
 
 	install -d $(DESTDIR)$(htdocsdir)/images
 	install -m 0644 htdocs/images/*.* $(DESTDIR)$(htdocsdir)/images/
-	ln -sf /usr/share/icons/Tango/24x24/status/sunny.png $(DESTDIR)$(htdocsdir)/images/sunny.png
-	ln -sf /usr/share/icons/Tango/24x24/status/weather-severe-alert.png $(DESTDIR)$(htdocsdir)/images/weather-severe-alert.png
 
 	install -d $(DESTDIR)$(htdocsdir)/templates/mail
 	install -m 0644 bug-templates/*.mail $(DESTDIR)$(htdocsdir)/templates/mail/
diff --git a/debian/changelog b/debian/changelog
index 57e7ae9..8ba2d6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,9 @@ piuparts (0.50) UNRELEASED; urgency=low
   * Mention http://piuparts.debian.org in README.txt prominently.
   * Mention github clone in htdocs/index.tpl.
 
+  [David Steele]
+  * Replace the Tango icon symlinks with copies.
+
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 15 Jan 2013 11:51:43 +0100
 
 piuparts (0.49) unstable; urgency=low
diff --git a/debian/piuparts-master.postinst b/debian/piuparts-master.postinst
index c9c9140..ee25ded 100644
--- a/debian/piuparts-master.postinst
+++ b/debian/piuparts-master.postinst
@@ -48,6 +48,18 @@ case "$1" in
     install -d -o $muser -g $pgroup -m 0755 $userhome/htdocs
     cp -rf $scriptroot/htdocs/* $userhome/htdocs/
 
+    for icon in weather-severe-alert.png sunny.png
+    do
+        if [ -h $userhome/htdocs/images/$icon ] ; then
+            rm -f $userhome/htdocs/images/$icon
+        fi
+
+        if [ -e /usr/share/icons/Tango/24x24/status/$icon ] ; then
+            cp -f /usr/share/icons/Tango/24x24/status/$icon $userhome/htdocs/images/$icon
+        fi
+    done
+
+
     if dpkg --compare-versions "$2" lt-nl "0.50" ; then
         rm -rf $userhome/master/monitor-slave
     fi

-- 
piuparts git repository