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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 5a88940d8d7d5774c41f71c56728ac5fcb17e888
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Oct 11 13:20:28 2015 +0200

    Use desktop file in favor of menu file per CTTE #741573.
---
 debian/changelog          |   6 +++
 debian/menu               |   3 --
 debian/merkaartor.png.b64 | 134 ----------------------------------------------
 debian/rules              |  12 +----
 4 files changed, 7 insertions(+), 148 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f957e3d..86abab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+merkaartor (0.18.2-1~exp3) UNRELEASED; urgency=medium
+
+  * Use desktop file in favor of menu file per CTTE #741573.
+
+ -- Bas Couwenberg <sebas...@debian.org>  Sun, 11 Oct 2015 12:55:19 +0200
+
 merkaartor (0.18.2-1~exp2) experimental; urgency=medium
 
   * Add patches for improved GDAL 2.0 support, and debug build fix.
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 2826e65..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(merkaartor):needs="X11" section="Applications/Science/Geoscience"\
-  title="merkaartor" command="/usr/bin/merkaartor"\
-  icon="/usr/share/pixmaps/merkaartor.xpm"
diff --git a/debian/merkaartor.png.b64 b/debian/merkaartor.png.b64
deleted file mode 100644
index ce969de..0000000
--- a/debian/merkaartor.png.b64
+++ /dev/null
@@ -1,134 +0,0 @@
-begin-base64 644 merkaartor.png
-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
-s3Z4AAAAAElFTkSuQmCC
-====
diff --git a/debian/rules b/debian/rules
index 350db2c..592f30a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_clean:
        cd translations && make clean
 
 override_dh_clean:
-       dh_clean merkaartor.png src/revision.h
+       dh_clean src/revision.h
        rm -rf binaries
 
 override_dh_auto_configure:
@@ -37,16 +37,6 @@ override_dh_auto_configure:
                NODEBUG=1 \
                RELEASE=1
 
-override_dh_auto_build:
-       dh_auto_build
-       uudecode debian/merkaartor.png.b64
-
-override_dh_auto_install:
-       dh_auto_install
-       install -d $(CURDIR)/debian/merkaartor/usr/share/pixmaps
-       install -D -m644 $(CURDIR)/Icons/Merkaartor.xpm \
-                        
$(CURDIR)/debian/merkaartor/usr/share/pixmaps/merkaartor.xpm
-
 override_dh_install:
        dh_install --list-missing
 

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to