Merge branch 'master' into jessie-backports

diff --git a/debian/changelog b/debian/changelog
index 1e4071c33f8a6b27c0622a5adf2b59ea8e54ffcb..5ecb0fe7b6acfbba2d196b2f4bc13365290c749a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+collectd (5.5.0-3~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Set jessie-backports as gbp branch. 
+
+ -- Bernd Zeimetz <bzed@debian.org>  Thu, 01 Oct 2015 14:39:43 +0200
+
 collectd (5.5.0-3) unstable; urgency=medium
 
   * debian/rules, debian/control:

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c867900a30ac1181889068dc6be8422f77c91a10..6c67fd8f26b762a501db66797b24530ca9e00917 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,5 @@
 # Configuration file for git-buildpackage and friends
 [DEFAULT]
 pristine-tar = True
+debian-branch = jessie-backports
+debian-tag = collectd-%(version)s