[Python-modules-commits] [python-gear] 04/06: bla

[Thomas Goirand]

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

zigo pushed a commit to branch debian/unstable
in repository python-gear.

commit 67f67160b23c6ab3e09d1cef7fb27d937b0470a1
Author: Thomas Goirand <thomas at goirand.fr>
Date:   Tue Sep 8 09:36:40 2015 +0000

    bla
---
 debian/changelog | 1 +
 debian/control   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8a56f99..2f48b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ python-gear (0.5.8-1) unstable; urgency=medium
   * Calling testr directly instead of using python setup.py testr.
   * Added Python3 support.
   * Fixed debian/gbp.conf
+  * Switched to dh 9.
 
  -- Thomas Goirand <zigo at debian.org>  Tue, 08 Sep 2015 09:11:03 +0000
 
diff --git a/debian/control b/debian/control
index 43e9ec7..9b75757 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,13 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Antoine Musso <hashar at free.fr>,
            Thomas Goirand <zigo at debian.org>,
+<<<<<<< cc684f08efc58b25e744f6432e82f41937c10ec8
 Build-Depends: debhelper (>= 9),
                dh-python,
+=======
+           Paul Belanger <paul.belanger at polybeacon.com>,
+Build-Depends: debhelper (>= 9),
+>>>>>>> Switched to dh 9.
                openstack-pkg-tools,
                python-all,
                python-pbr,

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