[saga] 03/05: Also install 22x22 icon in hicolor theme.

[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 fa7f36d9fa667131f0e350904ace6f59b828a35c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 14:57:45 2016 +0200

    Also install 22x22 icon in hicolor theme.
---
 debian/changelog                        |   1 +
 debian/patches/hicolor-icon-22x22.patch |  23 +++++++++++++++++++++++
 debian/patches/series                   |   1 +
 debian/rules                            |   4 +++-
 debian/saga_icon_22.png                 | Bin 0 -> 1867 bytes
 debian/source/include-binaries          |   1 +
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3ccf9ae..333a433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ saga (2.2.7+dfsg-1) UNRELEASED; urgency=medium
     - Use standalone license paragraph for BSD-2-clause & GPL-3+
     - Reorder Files sections for imagery subdirectories
   * Add lintian override for no-symbols-control-file.
+  * Also install 22x22 icon in hicolor theme.
 
  -- Johan Van de Wauw <johan at vandewauw.be>  Fri, 04 Mar 2016 17:34:50 +0100
 
diff --git a/debian/patches/hicolor-icon-22x22.patch b/debian/patches/hicolor-icon-22x22.patch
new file mode 100644
index 0000000..b636255
--- /dev/null
+++ b/debian/patches/hicolor-icon-22x22.patch
@@ -0,0 +1,23 @@
+Description: Also install 22x22 PNG icon in hicolor theme.
+ For compliance with Debian Policy section 9.6:
+ "
+  Unless hidden by default, the desktop entry must point to a PNG or SVG
+  icon with a transparent background, providing at least the 22×22 size,
+  and preferably up to 64×64. The icon should be neutral enough to
+  integrate well with the default icon themes. It is encouraged to ship
+  the icon in the default hicolor icon theme directories, or to use an
+  existing icon from the hicolor theme.
+ "
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/saga_core/saga_gui/Makefile.am
++++ b/src/saga_core/saga_gui/Makefile.am
+@@ -223,7 +223,7 @@ 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
++ICON_SIZES = 8 16 22 24 32 48 64 72 80 96 128 192
+ 
+ install-icons:
+ 	@for size in $(ICON_SIZES); do \
diff --git a/debian/patches/series b/debian/patches/series
index 471f54b..bb8e378 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Use-debian-version-of-libsvm.patch
 0001-vigra-hdf5-include.patch
 Use-debian-version-dxflib.patch
 fix-spelling.patch
+hicolor-icon-22x22.patch
diff --git a/debian/rules b/debian/rules
index af7200e..81fb630 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,11 @@ templates:
 	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_22.png
 
 override_dh_auto_configure: templates
+	cp debian/saga_icon_22.png src/saga_core/saga_gui/res/
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--disable-libfire \
diff --git a/debian/saga_icon_22.png b/debian/saga_icon_22.png
new file mode 100644
index 0000000..08d7f27
Binary files /dev/null and b/debian/saga_icon_22.png differ
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..a7aec95
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/saga_icon_22.png

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