[saga] 09/20: Use desktop file in favor of menu file per CTTE #741573.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Mar 4 20:29:54 UTC 2016 

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

sebastic pushed a commit to branch master
in repository saga.

commit 7741996ec6bd2d8930a3f3f38b2681c7704d9cfc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 4 16:41:04 2016 +0100

    Use desktop file in favor of menu file per CTTE #741573.
    
    Install application icon in hicolor theme.
---
 debian/changelog               |   2 ++
 debian/menu                    |   2 --
 debian/rules                   |  22 ++++++++++++++++++++++
 debian/saga.install            |   6 ++++--
 debian/saga_icon_16.png        | Bin 0 -> 1511 bytes
 debian/saga_icon_192.png       | Bin 0 -> 19228 bytes
 debian/saga_icon_24.png        | Bin 0 -> 2010 bytes
 debian/saga_icon_32.png        | Bin 0 -> 2806 bytes
 debian/saga_icon_48.png        | Bin 0 -> 4440 bytes
 debian/saga_icon_72.png        | Bin 0 -> 6892 bytes
 debian/saga_icon_8.png         | Bin 0 -> 631 bytes
 debian/saga_icon_80.png        | Bin 0 -> 7730 bytes
 debian/saga_icon_96.png        | Bin 0 -> 9320 bytes
 debian/source/include-binaries |   9 +++++++++
 14 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b61ef81..12d8d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ saga (2.2.5+dfsg-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Separate copyright years and holders with a comma
     - Files on separate lines
+  * Use desktop file in favor of menu file per CTTE #741573.
+  * Install application icon in hicolor theme.
 
  -- Johan Van de Wauw <Johan Van de Wauw johan.vandewauw at gmail.com>  Fri, 04 Mar 2016 17:34:50 +0100
 
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 2300228..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(saga):needs="X11" section="Applications/Science/Geoscience"\
-  title="saga" command="/usr/bin/saga_gui" 
diff --git a/debian/rules b/debian/rules
index d61e296..3b9ad62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,28 @@ man:
 	pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod >saga_cmd.1
 	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
+
 override_dh_python2:
 	dh_python2 --no-guessing-versions
 
diff --git a/debian/saga.install b/debian/saga.install
index 7432d38..8661a6b 100644
--- a/debian/saga.install
+++ b/debian/saga.install
@@ -1,5 +1,3 @@
-src/saga_core/saga_gui/res/saga.desktop /usr/share/applications/
-src/saga_core/saga_gui/res/saga.png     /usr/share/pixmaps/
 src/saga_core/saga_gui/res/saga_*.txt   /usr/share/saga/
 usr/bin
 usr/lib/*/saga/*.so
@@ -7,3 +5,7 @@ usr/share/man/man1/*
 usr/share/saga/saga_prj.dic
 usr/share/saga/saga_prj.srs
 usr/share/saga/saga_tip.txt
+usr/share/appdata
+usr/share/applications
+usr/share/icons
+usr/share/pixmaps
diff --git a/debian/saga_icon_16.png b/debian/saga_icon_16.png
new file mode 100644
index 0000000..0829a10
Binary files /dev/null and b/debian/saga_icon_16.png differ
diff --git a/debian/saga_icon_192.png b/debian/saga_icon_192.png
new file mode 100644
index 0000000..bf101fe
Binary files /dev/null and b/debian/saga_icon_192.png differ
diff --git a/debian/saga_icon_24.png b/debian/saga_icon_24.png
new file mode 100644
index 0000000..2b0e190
Binary files /dev/null and b/debian/saga_icon_24.png differ
diff --git a/debian/saga_icon_32.png b/debian/saga_icon_32.png
new file mode 100644
index 0000000..bff79bd
Binary files /dev/null and b/debian/saga_icon_32.png differ
diff --git a/debian/saga_icon_48.png b/debian/saga_icon_48.png
new file mode 100644
index 0000000..9323284
Binary files /dev/null and b/debian/saga_icon_48.png differ
diff --git a/debian/saga_icon_72.png b/debian/saga_icon_72.png
new file mode 100644
index 0000000..0c629dd
Binary files /dev/null and b/debian/saga_icon_72.png differ
diff --git a/debian/saga_icon_8.png b/debian/saga_icon_8.png
new file mode 100644
index 0000000..f647150
Binary files /dev/null and b/debian/saga_icon_8.png differ
diff --git a/debian/saga_icon_80.png b/debian/saga_icon_80.png
new file mode 100644
index 0000000..92887f1
Binary files /dev/null and b/debian/saga_icon_80.png differ
diff --git a/debian/saga_icon_96.png b/debian/saga_icon_96.png
new file mode 100644
index 0000000..95fda8d
Binary files /dev/null and b/debian/saga_icon_96.png differ
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..9a541a1
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,9 @@
+debian/saga_icon_8.png
+debian/saga_icon_16.png
+debian/saga_icon_24.png
+debian/saga_icon_32.png
+debian/saga_icon_48.png
+debian/saga_icon_72.png
+debian/saga_icon_80.png
+debian/saga_icon_96.png
+debian/saga_icon_192.png

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

More information about the Pkg-grass-devel mailing list