Changeset 1217 for pkg

Timestamp:

05/07/07 13:23:43 (6 years ago)

Author:

alanbach-guest

Message:

human-icon-theme updates

Location:

pkg/non-free/human-icon-theme/trunk/debian

Files:

• changelog (modified) (1 diff)
• rules (modified) (1 diff)

pkg/non-free/human-icon-theme/trunk/debian/changelog

@@ +1 @@
+human-icon-theme (1:0.18-parsix3) unstable; urgency=low
+
+  * Sync'd logo dir structure and rules file with Debian 
+
+ -- Alan Baghumian <alan@technotux.org>  Mon, 07 May 2007 14:52:00 +0330
+
 human-icon-theme (1:0.18-parsix2) unstable; urgency=low
 

pkg/non-free/human-icon-theme/trunk/debian/rules

@@ -6 +6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DISTRO=$(shell lsb_release -si)
+DISTRO := $(shell lsb_release -si)
 
 # Anyway, defaults to Debian
--test -z ${DISTRO} && DISTRO="Debian"
+ifeq ($(DISTRO),)
+DISTRO := Debian
+endif
 
 clean::
-        echo ${DISTRO}
-        -test -e debian/${DISTRO}/start-here-22x22.png && \
-                rm debian/${DISTRO}/start-here-22x22.png
-        -test -e debian/${DISTRO}/start-here-24x24.png && \
-                rm debian/${DISTRO}/start-here-24x24.png
-        -test -e debian/${DISTRO}/start-here-48x48.png && \
-                rm debian/${DISTRO}/start-here-48x48.png
+        @echo "=== Building for distribution: $(DISTRO) ==="
+        find debian/$(DISTRO) -name '*.png' | xargs rm -fv
 
 build:
-        sng debian/${DISTRO}/*.sng
-        
+        @echo "=== Installing distribution specific overrides ==="
+        if [ -d debian/$(DISTRO) ]; then \
+            find debian/$(DISTRO) -name '*.sng' | xargs sng; \
+        fi
+
+ICON_DIR := debian/human-icon-theme/usr/share/icons/Human
+
 binary-post-install/human-icon-theme::
-        # replace Ubuntu logo with Debian or Parsix
-        install -D -m 644 -o root -g root debian/${DISTRO}/start-here-22x22.png \
-                debian/human-icon-theme/usr/share/icons/Human/22x22/places/start-here.png
-        install -D -m 644 -o root -g root debian/${DISTRO}/start-here-24x24.png \
-                debian/human-icon-theme/usr/share/icons/Human/24x24/places/start-here.png
-        install -D -m 644 -o root -g root debian/${DISTRO}/start-here-48x48.png \
-                debian/human-icon-theme/usr/share/icons/Human/48x48/places/start-here.png
-        install -D -m 644 -o root -g root debian/${DISTRO}/start-here.svg \
-                debian/human-icon-theme/usr/share/icons/Human/scalable/places/start-here.svg    
-        
+        # replace the Ubuntu logos with the distribution overrides
+        if [ -d debian/$(DISTRO) ]; then \
+            cp -rvf debian/$(DISTRO)/* $(ICON_DIR)/; \
+        fi
+        # don't ship the sng files
+        find $(ICON_DIR) -name '*.sng' | xargs rm -fv