[grass] 01/02: Install additional icon sizes in hicolor icon theme.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 15 22:19:14 UTC 2016


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

sebastic pushed a commit to branch master
in repository grass.

commit aa84b21d20dc528d70006a674a4c2c83d53c8806
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 15 23:35:09 2016 +0200

    Install additional icon sizes in hicolor icon theme.
---
 debian/changelog                   |   1 +
 debian/gui/icons/grass-128x128.png | Bin 0 -> 12275 bytes
 debian/gui/icons/grass-16x16.png   | Bin 0 -> 1190 bytes
 debian/gui/icons/grass-192x192.png | Bin 0 -> 17277 bytes
 debian/gui/icons/grass-22x22.png   | Bin 0 -> 1380 bytes
 debian/gui/icons/grass-24x24.png   | Bin 0 -> 1504 bytes
 debian/gui/icons/grass-32x32.png   | Bin 0 -> 1983 bytes
 debian/gui/icons/grass-36x36.png   | Bin 0 -> 2248 bytes
 debian/gui/icons/grass-40x40.png   | Bin 0 -> 2630 bytes
 debian/gui/icons/grass-42x42.png   | Bin 0 -> 2894 bytes
 debian/gui/icons/grass-72x72.png   | Bin 0 -> 5516 bytes
 debian/gui/icons/grass-80x80.png   | Bin 0 -> 6492 bytes
 debian/gui/icons/grass-8x8.png     | Bin 0 -> 597 bytes
 debian/gui/icons/grass-96x96.png   | Bin 0 -> 8223 bytes
 debian/patches/hicolor-icons.patch |  44 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |   1 +
 debian/rules                       |   8 ++++++-
 debian/source/include-binaries     |  13 +++++++++++
 18 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b0fddd3..47586f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ grass (7.0.3-4) UNRELEASED; urgency=medium
     via dh_numpy.
   * Have dh_python & dh_numpy act on specific packages only.
   * Use dynamic list of wxpython images files to move to use /usr/share.
+  * Install additional icon sizes in hicolor icon theme.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Apr 2016 20:20:29 +0200
 
diff --git a/debian/gui/icons/grass-128x128.png b/debian/gui/icons/grass-128x128.png
new file mode 100644
index 0000000..1a7f35b
Binary files /dev/null and b/debian/gui/icons/grass-128x128.png differ
diff --git a/debian/gui/icons/grass-16x16.png b/debian/gui/icons/grass-16x16.png
new file mode 100644
index 0000000..5c33436
Binary files /dev/null and b/debian/gui/icons/grass-16x16.png differ
diff --git a/debian/gui/icons/grass-192x192.png b/debian/gui/icons/grass-192x192.png
new file mode 100644
index 0000000..43d79a9
Binary files /dev/null and b/debian/gui/icons/grass-192x192.png differ
diff --git a/debian/gui/icons/grass-22x22.png b/debian/gui/icons/grass-22x22.png
new file mode 100644
index 0000000..d35b82c
Binary files /dev/null and b/debian/gui/icons/grass-22x22.png differ
diff --git a/debian/gui/icons/grass-24x24.png b/debian/gui/icons/grass-24x24.png
new file mode 100644
index 0000000..a2a230f
Binary files /dev/null and b/debian/gui/icons/grass-24x24.png differ
diff --git a/debian/gui/icons/grass-32x32.png b/debian/gui/icons/grass-32x32.png
new file mode 100644
index 0000000..6f64722
Binary files /dev/null and b/debian/gui/icons/grass-32x32.png differ
diff --git a/debian/gui/icons/grass-36x36.png b/debian/gui/icons/grass-36x36.png
new file mode 100644
index 0000000..a2f1d2d
Binary files /dev/null and b/debian/gui/icons/grass-36x36.png differ
diff --git a/debian/gui/icons/grass-40x40.png b/debian/gui/icons/grass-40x40.png
new file mode 100644
index 0000000..e534142
Binary files /dev/null and b/debian/gui/icons/grass-40x40.png differ
diff --git a/debian/gui/icons/grass-42x42.png b/debian/gui/icons/grass-42x42.png
new file mode 100644
index 0000000..35f847d
Binary files /dev/null and b/debian/gui/icons/grass-42x42.png differ
diff --git a/debian/gui/icons/grass-72x72.png b/debian/gui/icons/grass-72x72.png
new file mode 100644
index 0000000..6cfb291
Binary files /dev/null and b/debian/gui/icons/grass-72x72.png differ
diff --git a/debian/gui/icons/grass-80x80.png b/debian/gui/icons/grass-80x80.png
new file mode 100644
index 0000000..ab73745
Binary files /dev/null and b/debian/gui/icons/grass-80x80.png differ
diff --git a/debian/gui/icons/grass-8x8.png b/debian/gui/icons/grass-8x8.png
new file mode 100644
index 0000000..d01b7be
Binary files /dev/null and b/debian/gui/icons/grass-8x8.png differ
diff --git a/debian/gui/icons/grass-96x96.png b/debian/gui/icons/grass-96x96.png
new file mode 100644
index 0000000..a00d071
Binary files /dev/null and b/debian/gui/icons/grass-96x96.png differ
diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch
new file mode 100644
index 0000000..7c9aed4
--- /dev/null
+++ b/debian/patches/hicolor-icons.patch
@@ -0,0 +1,44 @@
+Description: Install additional hicolor icon sizes.
+ Debian Policy requires at least 22x22 PNG icons.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/2988
+
+--- a/gui/icons/Makefile
++++ b/gui/icons/Makefile
+@@ -20,10 +20,36 @@ HTMLDIRS = \
+ default: $(ETCICONS) $(HTMLICONS)
+ 	$(MKDIR) $(ARCH_DISTDIR)/share/applications
+ 	$(INSTALL_DATA) grass.desktop $(ARCH_DISTDIR)/share/applications
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps
++	$(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps
++	$(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps
++	$(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps
++	$(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps
++	$(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps
++	$(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps
++	$(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps
++	$(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass70.png
+ 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps
+ 	$(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass70.png
+ 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps
+ 	$(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps
++	$(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps
++	$(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps
++	$(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps
++	$(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass70.png
++	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps
++	$(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass70.png
+ 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps
+ 	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
+ 	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
diff --git a/debian/patches/series b/debian/patches/series
index 47b926c..0bc68cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ various-typos.patch
 various-typos2.patch
 various-typos3.patch
 spelling-errors.patch
+hicolor-icons.patch
diff --git a/debian/rules b/debian/rules
index 21d5c2c..ac7d207 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,12 @@ templates:
 	dh $@ --with autotools_dev,python2 --parallel
 
 override_dh_clean:
-	dh_clean build-arch-stamp install-arch-stamp debian/grass-gui.image-file-in-usr-lib.list
+	dh_clean build-arch-stamp install-arch-stamp debian/grass-gui.image-file-in-usr-lib.list \
+		gui/icons/grass-8x8.png    gui/icons/grass-16x16.png  gui/icons/grass-22x22.png \
+		gui/icons/grass-24x24.png  gui/icons/grass-32x32.png  gui/icons/grass-36x36.png \
+		gui/icons/grass-40x40.png  gui/icons/grass-42x42.png  gui/icons/grass-72x72.png \
+		gui/icons/grass-80x80.png  gui/icons/grass-96x96.png  gui/icons/grass-128x128.png \
+		gui/icons/grass-192x192.png
 
 	$(RM) lib/proj/nad2bin
 	$(RM) tools/timer/main.o
@@ -68,6 +73,7 @@ override_dh_auto_clean:
 	[ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean
 
 override_dh_auto_configure: templates
+	cp debian/gui/icons/* gui/icons/
 	dh_auto_configure -- \
                     --prefix=/usr/lib \
                     --enable-socket \
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..ff2d193
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,13 @@
+debian/gui/icons/grass-8x8.png
+debian/gui/icons/grass-16x16.png
+debian/gui/icons/grass-22x22.png
+debian/gui/icons/grass-24x24.png
+debian/gui/icons/grass-32x32.png
+debian/gui/icons/grass-36x36.png
+debian/gui/icons/grass-40x40.png
+debian/gui/icons/grass-42x42.png
+debian/gui/icons/grass-72x72.png
+debian/gui/icons/grass-80x80.png
+debian/gui/icons/grass-96x96.png
+debian/gui/icons/grass-128x128.png
+debian/gui/icons/grass-192x192.png

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



More information about the Pkg-grass-devel mailing list