Revert "drop d/links and d/gbp.conf"

This reverts commit 88b406aba96c65027cd05949cbffbecbff34a1cf.

diff --git a/debian/changelog b/debian/changelog
index 3f55b4d13894211b3ac39156c6c0e92f605bb003..add14e07ca61850ffc98cf0cb2ed7f9bd98ec5c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ git-remote-gcrypt (1.0.2-1) UNRELEASED; urgency=medium
     At least with passwordless PGP keys, git-remote-gcrypt works fine with
     only the gpg package installed.
     Thanks to Yuri D'Elia for the report.
-  * Drop d/gbp.conf and d/links.
   * Bump copyright years.
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 19 Feb 2017 07:42:05 -0700

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..ff9c2ec
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,20 @@
+[DEFAULT]
+
+# Debian package maintainer is upstream project maintainer, so
+# everything lives on the master branch (from ver. 1.0.0-1 onwards)
+upstream-branch = master
+debian-branch = master
+# However, separate tags (e.g. one commit tagged both 1.0.0 and
+# debian/1.0.0-1) because git-remote-gcrypt is meant to be usable
+# outside of Debian
+upstream-tag = %(version)s
+debian-tag = debian/%(version)s
+
+# Some standard gbp settings
+sign-tags = True
+pristine-tar = True
+pristine-tar-commit = True
+
+color = on
+compression = xz
+compression-level = 9

diff --git a/debian/links b/debian/links
new file mode 100644 (file)
index 0000000..d61fdf7
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+/usr/share/doc/git-remote-gcrypt/changelog /usr/share/doc/git-remote-gcrypt/changelog.Debian