debian/changelog

+merkaartor (0.18.4+ds-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add gbp.conf to use pristine-tar & --source-only-changes by default.
+  * Restructure control file with cme.
+  * Drop Name field from upstream metadata.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 07 Feb 2020 15:31:58 +0100
+
 merkaartor (0.18.4+ds-1) unstable; urgency=medium
 
   * Reintroduction release (Closes: #949792), new package uploader.

debian/control

 Source: merkaartor
-Section: science
-Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus@rezozer.net>
-Rules-Requires-Root: no
-Build-Depends:
- debhelper-compat (= 12),
+Section: science
+Priority: optional
+Build-Depends: debhelper-compat (= 12),
                libboost-dev,
                libboost-math-dev,
                libboost-serialization-dev,
@@ -30,6 +28,7 @@ Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/merkaartor
 Vcs-Git: https://salsa.debian.org/debian-gis-team/merkaartor.git
 Homepage: http://www.merkaartor.be/
+Rules-Requires-Root: no
 
 Package: merkaartor
 Architecture: any

debian/gbp.conf

+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes

debian/upstream/metadata

 ---
 Bug-Database: https://github.com/openstreetmap/merkaartor/issues
 Bug-Submit: https://github.com/openstreetmap/merkaartor/issues/new
-Name: Merkaartor
 Repository: https://github.com/openstreetmap/merkaartor.git
 Repository-Browse: https://github.com/openstreetmap/merkaartor