[saga] 01/01: Rely on Automake to install application icons.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository saga.

commit e3062399a57b7b74d405aba9f54c48f9dbce1382
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 6 19:45:46 2016 +0100

    Rely on Automake to install application icons.
---
 debian/patches/install-icons.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       | 29 +++++++++--------------------
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/debian/patches/install-icons.patch b/debian/patches/install-icons.patch
new file mode 100644
index 0000000..c94e66e
--- /dev/null
+++ b/debian/patches/install-icons.patch
@@ -0,0 +1,30 @@
+Description: Install application icon per Icon Theme Specification.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://sourceforge.net/p/saga-gis/bugs/217/
+
+--- a/src/saga_core/saga_gui/Makefile.am
++++ b/src/saga_core/saga_gui/Makefile.am
+@@ -226,12 +226,22 @@ dist_applications_DATA = res/saga.deskto
+ pixmapdir = $(datadir)/pixmaps
+ dist_pixmap_DATA = res/saga.png
+ 
++ICON_SIZES = 8 16 24 32 48 64 72 80 96 128 192
++
++install-icons:
++	@for size in $(ICON_SIZES); do \
++		mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
++		$(INSTALL_DATA) res/saga_icon_$${size}.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/saga.png; \
++	done; \
++	mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps; \
++	$(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
++
+ appdatadir = $(datadir)/appdata
+ dist_appdata_DATA = res/saga.appdata.xml
+ 
+ dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
+ 
+-install-data-hook:
++install-data-hook: install-icons
+ 	cd $(DESTDIR)/$(pkgdatadir); \
+ 	mv saga_srs.txt saga_prj.srs; \
+ 	mv saga_dic.txt saga_prj.dic;
diff --git a/debian/patches/series b/debian/patches/series
index 187a3fe..c72bd00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 disable-grid-gridding.patch
 desktop-keywords.patch
 spelling-errors.patch
+install-icons.patch
diff --git a/debian/rules b/debian/rules
index b27b459..d54ad3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,17 @@ debian/% :: debian/%.in
 	dh $@ --with python2 --with autoreconf --parallel
 
 override_dh_clean:
-	dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
+	dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1 \
+		 src/saga_core/saga_gui/res/saga_icon_8.png src/saga_core/saga_gui/res/saga_icon_16.png \
+		 src/saga_core/saga_gui/res/saga_icon_24.png src/saga_core/saga_gui/res/saga_icon_32.png \
+		 src/saga_core/saga_gui/res/saga_icon_48.png src/saga_core/saga_gui/res/saga_icon_72.png \
+		 src/saga_core/saga_gui/res/saga_icon_80.png src/saga_core/saga_gui/res/saga_icon_96.png \
+		 src/saga_core/saga_api/res/saga_icon_192.png
 
 override_dh_auto_configure:
+	for size in 8 16 24 32 48 72 80 96 192; do \
+		cp debian/saga_icon_$${size}.png src/saga_core/saga_gui/res/ ; \
+	done
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--disable-libfire \
@@ -32,25 +40,6 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 
-	# Install application icon
-	for size in 8 16 24 32 48 72 80 96 192; do \
-		install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
-		install -o root -g root -m 644 $(CURDIR)/debian/saga_icon_$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}x$${size}/apps/saga.png ; \
-	done
-
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps
-	install -o root -g root -m 644 $(CURDIR)/src/saga_core/saga_gui/res/saga_icon_64.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps/saga.png
-
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/128x128/apps
-	install -o root -g root -m 644 $(CURDIR)/src/saga_core/saga_gui/res/saga_icon_128.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/128x128/apps/saga.png
-
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/256x256/apps
-	install -o root -g root -m 644 $(CURDIR)/src/saga_core/saga_gui/res/saga.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/256x256/apps/saga.png
-
-	# Install desktop file
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
-	install -o root -g root -m 644 $(CURDIR)/src/saga_core/saga_gui/res/saga.desktop $(CURDIR)/debian/tmp/usr/share/applications/saga.desktop
-
 	# Remove executable bit from resource files
 	chmod -x debian/*/usr/share/saga/*.*
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git