[Git][debian-gis-team/merkaartor][master] 3 commits: Add gbp.conf to use pristine-tar & --source-only-changes by default.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor


Commits:
b8a0f08a by Bas Couwenberg at 2020-02-07T15:32:33+01:00
Add gbp.conf to use pristine-tar & --source-only-changes by default.

- - - - -
30f66ee2 by Bas Couwenberg at 2020-02-07T15:33:14+01:00
Restructure control file with cme.

- - - - -
c2400908 by Bas Couwenberg at 2020-02-07T15:33:41+01:00
Drop Name field from upstream metadata.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/gbp.conf
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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 at 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
=====================================
@@ -1,35 +1,34 @@
 Source: merkaartor
-Section: science
-Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
-Rules-Requires-Root: no
-Build-Depends:
- debhelper-compat (= 12),
- libboost-dev,
- libboost-math-dev,
- libboost-serialization-dev,
- libexiv2-dev,
- libgdal-dev,
- libgps-dev,
- libproj-dev,
- libproxy-dev,
- libqt5svg5-dev,
- libqt5webkit5-dev,
- libquazip5-dev,
- libspatialite-dev,
- libxml2-dev,
- libxslt1-dev,
- qt5-qmake,
- qt5-qmake:native,
- qtbase5-dev,
- qttools5-dev-tools,
- sharutils,
- zlib1g-dev
+Section: science
+Priority: optional
+Build-Depends: debhelper-compat (= 12),
+               libboost-dev,
+               libboost-math-dev,
+               libboost-serialization-dev,
+               libexiv2-dev,
+               libgdal-dev,
+               libgps-dev,
+               libproj-dev,
+               libproxy-dev,
+               libqt5svg5-dev,
+               libqt5webkit5-dev,
+               libquazip5-dev,
+               libspatialite-dev,
+               libxml2-dev,
+               libxslt1-dev,
+               qt5-qmake,
+               qt5-qmake:native,
+               qtbase5-dev,
+               qttools5-dev-tools,
+               sharutils,
+               zlib1g-dev
 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
=====================================
@@ -0,0 +1,19 @@
+[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
=====================================
@@ -1,6 +1,5 @@
 ---
 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/compare/25e98d5f5305878474c85d1187ea400fde1a7f0f...c24009088cb7f89b53b6a876e2c9a810b9a1001a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/compare/25e98d5f5305878474c85d1187ea400fde1a7f0f...c24009088cb7f89b53b6a876e2c9a810b9a1001a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200207/67df6d99/attachment-0001.html>