Code

Merge branch 'master' into sid
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 16 Oct 2015 16:20:25 +0000 (18:20 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 16 Oct 2015 16:20:25 +0000 (18:20 +0200)
1  2 
debian/gbp.conf

diff --cc debian/gbp.conf
index 4576b8d03cc8a8aebf40828d2cb61d459415309f,dc23ff8dbfc8b6914a5e073f2c2da441e44a302c..93e84ee4f0ce457f85d716e608ca3d57f19462c7
@@@ -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