[Python-modules-commits] [pytest-catchlog] 02/02: drop git-dpm patch regime; update deb/gbp.conf

[Daniel Stender]

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

stender pushed a commit to branch debian/master
in repository pytest-catchlog.

commit 19e5d150145cc91e554caa26dcc61663ec7b4a3f
Author: Daniel Stender <stender at debian.org>
Date:   Tue Jul 18 16:26:35 2017 +0200

    drop git-dpm patch regime; update deb/gbp.conf
---
 debian/.git-dpm  | 11 -----------
 debian/changelog |  8 ++++++--
 debian/gbp.conf  |  5 ++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 41081da..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-be1d0ae882f0f14e9dab5cb085914ee26a71803e
-be1d0ae882f0f14e9dab5cb085914ee26a71803e
-be1d0ae882f0f14e9dab5cb085914ee26a71803e
-be1d0ae882f0f14e9dab5cb085914ee26a71803e
-pytest-catchlog_1.2.2.orig.tar.xz
-6e8d81bdd3267584bdab8b923b3210ec5eafd088
-10456
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/changelog b/debian/changelog
index 8068b97..9194596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-pytest-catchlog (1.2.2-2) UNRELEASED; urgency=medium
+pytest-catchlog (1.2.2-3) UNRELEASED; urgency=medium
 
+  * drop git-dpm patch regime (remove deb/.git-dpm).
+  * deb/gbp.conf:
+    + change debian-branch to meet DEP-14.
+    + add sign-tags.
   * deb/tests/control: dropped allow-stderr (not needed).
 
- -- Daniel Stender <stender at debian.org>  Wed, 30 Mar 2016 13:46:01 +0200
+ -- Daniel Stender <stender at debian.org>  Tue, 18 Jul 2017 16:28:36 +0200
 
 pytest-catchlog (1.2.2-1) unstable; urgency=medium
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 78ab127..7eebb30 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,6 @@
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True
-
-[import-orig]
 upstream-branch = upstream
-debian-branch = master
+debian-branch = debian/master
+sign-tags = True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-catchlog.git