From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 16 Oct 2015 16:20:25 +0000 (+0200)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.5.0-4~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a61885c13fc5ef16a357eb7af15e36147d1ce38;p=pkg-collectd.git

Merge branch 'master' into sid
---

0a61885c13fc5ef16a357eb7af15e36147d1ce38
diff --cc debian/gbp.conf
index 4576b8d,dc23ff8..93e84ee
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,4 +1,5 @@@
  # Configuration file for git-buildpackage and friends
  [DEFAULT]
  pristine-tar = True
 +debian-branch = sid
+ debian-tag = collectd-%(version)s