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

sebastic pushed a commit to branch master
in repository merkaartor.

commit a619dd099beb2a4376c0b99f29d284e9b3697c2b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Sep 18 13:01:24 2015 +0200

    Use dh_auto_* commands in overrides.
---
 debian/changelog | 1 +
 debian/rules     | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c7eb58..37dc1b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
   * Add patch to fix version detection for tarball releases.
   * Switch to Qt5.
   * Disable zbar, is Qt4-only.
+  * Use dh_auto_* commands in overrides.
 
  -- Bas Couwenberg <sebas...@debian.org>  Fri, 18 Sep 2015 01:17:53 +0200
 
diff --git a/debian/rules b/debian/rules
index a735ea0..b1dcf60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,15 +56,14 @@ override_dh_auto_configure:
                $(RELEASEFLAGS)
 
 override_dh_auto_build:
-       $(MAKE)
+       dh_auto_build
        uudecode debian/merkaartor.png.b64
-       touch $@
 
 override_dh_auto_install:
-       make install INSTALL_ROOT=$(CURDIR)/debian/merkaartor
+       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
+                        
$(CURDIR)/debian/merkaartor/usr/share/pixmaps/merkaartor.xpm
        install -D -m644 $(CURDIR)/merkaartor.png \
                         
$(CURDIR)/debian/merkaartor/usr/share/icons/merkaartor.png
        install -D -m644 $(CURDIR)/src/merkaartor.desktop \

-- 
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