r16472 - in /packages/unstable/human-icon-theme/debian: ./ Debian/22x22/places/ Debian/24x24/places/ Debian/48x48/places/ Parsix/22x22/places/ Parsix/24x24/places/ Parsix/48x48/places/

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Jul  6 17:02:55 2008
New Revision: 16472

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16472
Log:
Rewrite uue -> png conversion completely to not hardcode extension,
location, directory names, to avoid a copy and to do the conversion in the
post-install part.

Added:
    packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here.png
      - copied unchanged from r16467, packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here.uue
Removed:
    packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here.uue
    packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here.uue
Modified:
    packages/unstable/human-icon-theme/debian/changelog
    packages/unstable/human-icon-theme/debian/rules

Modified: packages/unstable/human-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/human-icon-theme/debian/changelog?rev=16472&op=diff
==============================================================================
--- packages/unstable/human-icon-theme/debian/changelog (original)
+++ packages/unstable/human-icon-theme/debian/changelog Sun Jul  6 17:02:55 2008
@@ -13,6 +13,9 @@
     - Repacked tarball without debian/ and .bzr-builddeb/ dirs.
     - Updated debian/changelog.ubuntu.
   * Fix location of scalable start-here override for Debian.
+  * Rewrite uue -> png conversion completely to not hardcode extension,
+    location, directory names, to avoid a copy and to do the conversion in the
+    post-install part.
 
  -- Alan Baghumian <alan at technotux.org>  Tue, 01 Apr 2008 20:28:19 +0200
 

Modified: packages/unstable/human-icon-theme/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/human-icon-theme/debian/rules?rev=16472&op=diff
==============================================================================
--- packages/unstable/human-icon-theme/debian/rules (original)
+++ packages/unstable/human-icon-theme/debian/rules Sun Jul  6 17:02:55 2008
@@ -7,7 +7,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
 
 DISTRO := $(shell lsb_release -si)
-DIRLIST := 22x22 24x24 48x48
 
 # Anyway, defaults to Debian
 ifeq ($(DISTRO),)
@@ -16,27 +15,23 @@
 
 clean::
 	@echo "=== Building for distribution: $(DISTRO) ==="
-	find debian/$(DISTRO) -name '*.png' | xargs rm -fv
 	$(SHELL) debian/clean-up.sh
 
 makebuilddir/human-icon-theme::
 	./autogen.sh --prefix=/usr
 
-build:
-	@echo "=== Installing distribution specific overrides ==="
-	if [ -d debian/$(DISTRO) ]; then \
-	    for dir in $(DIRLIST) ; do \
-	      (cd debian/$(DISTRO)/$$dir/places/ && uudecode -o start-here.png start-here.uue) \
-	    done; \
-	fi
-
 ICON_DIR := debian/human-icon-theme/usr/share/icons/Human
 
 binary-post-install/human-icon-theme::
 	# replace the Ubuntu logos with the distribution overrides
+	@echo "=== Installing distribution specific overrides ==="
 	if [ -d debian/$(DISTRO) ]; then \
 	    cp -rvf debian/$(DISTRO)/* $(ICON_DIR)/; \
+	    find $(ICON_DIR) -name '*.uue' | while read encoded; do \
+	        decoded="`echo $$encoded | sed 's/\.uue$$//'`"; \
+	        echo "Converting $$encoded to $$decoded"; \
+	        uudecode -o "$$decoded" "$$encoded"; \
+	        rm -vf "$$encoded"; \
+	    done; \
 	fi
-	# don't ship the uue files
-	find $(ICON_DIR) -name '*.uue' | xargs rm -fv