r42163 - in /desktop/unstable/adwaita-icon-theme/debian: README.Debian changelog debian-swirl.svg gnome-foot.svg postinst prerm rules triggers

[ah at users.alioth.debian.org]

Author: ah
Date: Sun Aug 10 22:58:43 2014
New Revision: 42163

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42163
Log:
* debian/README.Debian, debian/debian-swirl.svg, debian/gnome-foot.svg,
  debian/postinst, debian/prerm, debian/triggers:
  Drop files related to gnome-foot and debian-swirl icons to avoid these
  files conflicting with gnome-icon-theme.
  (They are mainly useful for gnome-panel and I doubt gnome-panel will
  switch to this new package anytime soon.)
* debian/rules: remove gnome-foot and debian-swirl related manual
                handling of the icon cache (drop --no-act).

Removed:
    desktop/unstable/adwaita-icon-theme/debian/README.Debian
    desktop/unstable/adwaita-icon-theme/debian/debian-swirl.svg
    desktop/unstable/adwaita-icon-theme/debian/gnome-foot.svg
    desktop/unstable/adwaita-icon-theme/debian/postinst
    desktop/unstable/adwaita-icon-theme/debian/prerm
    desktop/unstable/adwaita-icon-theme/debian/triggers
Modified:
    desktop/unstable/adwaita-icon-theme/debian/changelog
    desktop/unstable/adwaita-icon-theme/debian/rules

Modified: desktop/unstable/adwaita-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/adwaita-icon-theme/debian/changelog?rev=42163&op=diff
==============================================================================
--- desktop/unstable/adwaita-icon-theme/debian/changelog	[utf-8] (original)
+++ desktop/unstable/adwaita-icon-theme/debian/changelog	[utf-8] Sun Aug 10 22:58:43 2014
@@ -7,6 +7,14 @@
   * debian/copyright: minor update for new download location and mention
                       that packaging is originally from gnome-icon-theme.
   * debian/preinst: drop file with obsolete upgrade commands.
+  * debian/README.Debian, debian/debian-swirl.svg, debian/gnome-foot.svg,
+    debian/postinst, debian/prerm, debian/triggers:
+    Drop files related to gnome-foot and debian-swirl icons to avoid these
+    files conflicting with gnome-icon-theme.
+    (They are mainly useful for gnome-panel and I doubt gnome-panel will
+    switch to this new package anytime soon.)
+  * debian/rules: remove gnome-foot and debian-swirl related manual
+                  handling of the icon cache (drop --no-act).
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 11 Aug 2014 00:28:22 +0200
 

Modified: desktop/unstable/adwaita-icon-theme/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/adwaita-icon-theme/debian/rules?rev=42163&op=diff
==============================================================================
--- desktop/unstable/adwaita-icon-theme/debian/rules	[utf-8] (original)
+++ desktop/unstable/adwaita-icon-theme/debian/rules	[utf-8] Sun Aug 10 22:58:43 2014
@@ -6,20 +6,3 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-BITMAPS := $(shell ls gnome | sed -rn 's/^([0-9]+)x[0-9]+$$/\1/p')
-
-INSTDIR := $(CURDIR)/debian/adwaita-icon-theme/usr/share/icons/gnome
-
-DEB_DH_ICONS_ARGS := --no-act
-
-install/adwaita-icon-theme::
-	rm -r $(CURDIR)/debian/adwaita-icon-theme/usr/share/locale
-	mkdir -p $(INSTDIR)/scalable/places
-	cp debian/*.svg $(INSTDIR)/scalable/places/
-	for i in $(BITMAPS); do \
-		d=$${i}x$${i} ; \
-		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 ; \
-		fi ; \
-	done