[merkaartor] 03/04: Switch to source format 3.0 (quilt).

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit fcf2f685b27858a9675889e4f6d8841e1afc1aa0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 22 21:49:37 2015 +0200

    Switch to source format 3.0 (quilt).
---
 debian/changelog     | 1 +
 debian/control       | 2 +-
 debian/rules         | 4 +---
 debian/source/format | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5afbe9e..ce6c21d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ merkaartor (0.18.1-4) UNRELEASED; urgency=medium
   * Updates for new upstream development by the OpenStreetMap community:
     - Update watch file for move to GitHub.
     - Update Homepage URL to www.merkaartor.be.
+  * Switch to source format 3.0 (quilt).
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Aug 2015 21:39:31 +0200
 
diff --git a/debian/control b/debian/control
index a167942..2e7224e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), zlib1g-dev,
  libexiv2-dev, sharutils, libgdal-dev, libxml2-dev, libxslt1-dev,
  libboost-dev (>= 1.38), libboost-math-dev (>= 1.38), libboost-serialization-dev (>= 1.38),
  libgps-dev, libzbarqt-dev (>= 0.10), libzbar-dev (>= 0.10), libspatialite-dev, libproj-dev,
- libproxy-dev, quilt
+ libproxy-dev
 Standards-Version: 3.8.4
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/merkaartor.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/merkaartor.git
diff --git a/debian/rules b/debian/rules
index 8552aa4..2bc09bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 DISTRIBUTION = $(shell dpkg-parsechangelog | grep '^Distribution:')
 ifneq (,$(findstring experimental,$(DISTRIBUTION)))
 RELEASEFLAGS = NODEBUG=0 RELEASE=0
@@ -48,7 +46,7 @@ build-stamp: configure-stamp
 	uudecode debian/merkaartor.png.b64
 	touch $@
 
-clean: clean-patched unpatch
+clean: clean-patched
 clean-patched: 
 	dh_testdir
 	dh_testroot
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

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