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

lool at users.alioth.debian.org lool at users.alioth.debian.org
Wed May 2 21:12:07 UTC 2007


Author: lool
Date: Wed May  2 21:12:06 2007
New Revision: 10711

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10711
Log:
* Rewrite the layout of the overrides for simpler rules.

Added:
    packages/unstable/human-icon-theme/debian/Debian/22x22/
    packages/unstable/human-icon-theme/debian/Debian/22x22/places/
    packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Debian/start-here-22x22.sng
    packages/unstable/human-icon-theme/debian/Debian/24x24/
    packages/unstable/human-icon-theme/debian/Debian/24x24/places/
    packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Debian/start-here-24x24.sng
    packages/unstable/human-icon-theme/debian/Debian/48x48/
    packages/unstable/human-icon-theme/debian/Debian/48x48/places/
    packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here-48x48.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Debian/start-here-48x48.sng
    packages/unstable/human-icon-theme/debian/Debian/scalable/
    packages/unstable/human-icon-theme/debian/Debian/scalable/places/
    packages/unstable/human-icon-theme/debian/Debian/scalable/start-here.svg
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Debian/start-here.svg
    packages/unstable/human-icon-theme/debian/Parsix/22x22/
    packages/unstable/human-icon-theme/debian/Parsix/22x22/places/
    packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here-22x22.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Parsix/start-here-22x22.sng
    packages/unstable/human-icon-theme/debian/Parsix/24x24/
    packages/unstable/human-icon-theme/debian/Parsix/24x24/places/
    packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here-24x24.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Parsix/start-here-24x24.sng
    packages/unstable/human-icon-theme/debian/Parsix/48x48/
    packages/unstable/human-icon-theme/debian/Parsix/48x48/places/
    packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here-48x48.sng
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Parsix/start-here-48x48.sng
    packages/unstable/human-icon-theme/debian/Parsix/scalable/
    packages/unstable/human-icon-theme/debian/Parsix/scalable/places/
    packages/unstable/human-icon-theme/debian/Parsix/scalable/places/start-here.svg
      - copied unchanged from r10710, packages/unstable/human-icon-theme/debian/Parsix/start-here.svg
Removed:
    packages/unstable/human-icon-theme/debian/Debian/start-here-22x22.sng
    packages/unstable/human-icon-theme/debian/Debian/start-here-24x24.sng
    packages/unstable/human-icon-theme/debian/Debian/start-here-48x48.sng
    packages/unstable/human-icon-theme/debian/Debian/start-here.svg
    packages/unstable/human-icon-theme/debian/Parsix/start-here-22x22.sng
    packages/unstable/human-icon-theme/debian/Parsix/start-here-24x24.sng
    packages/unstable/human-icon-theme/debian/Parsix/start-here-48x48.sng
    packages/unstable/human-icon-theme/debian/Parsix/start-here.svg
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=10711&op=diff
==============================================================================
--- packages/unstable/human-icon-theme/debian/changelog (original)
+++ packages/unstable/human-icon-theme/debian/changelog Wed May  2 21:12:06 2007
@@ -25,6 +25,7 @@
   * Add missing build-dep on gnome-pkg-tools.
   * Build-depend on libxml-parser-perl instead of intltool.
   * Fix Makefile logic for DISTRO default fallback.
+  * Rewrite the layout of the overrides for simpler rules.
 
- -- Loic Minier <lool at dooz.org>  Sat, 28 Apr 2007 10:46:03 +0200
+ -- Loic Minier <lool at dooz.org>  Wed, 02 May 2007 23:10:08 +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=10711&op=diff
==============================================================================
--- packages/unstable/human-icon-theme/debian/rules (original)
+++ packages/unstable/human-icon-theme/debian/rules Wed May  2 21:12:06 2007
@@ -13,26 +13,18 @@
 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
+
 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)/* debian/human-icon-theme/usr/share/icons/Human/; \
+	fi
 




More information about the pkg-gnome-commits mailing list