summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-06-29 13:20:32 +0200
committerMichael Biebl <biebl@debian.org>2014-06-29 14:40:51 +0200
commita4eaebd56dcfb46bf3e931aa16135c565d040af9 (patch)
treeccc9ac37800944cd3bc1f65a97ee584a51c83d41 /debian
parent831a765b390bdacc7f7e57329975b26b1b296975 (diff)
downloadrsyslog-a4eaebd56dcfb46bf3e931aa16135c565d040af9.tar.gz
Upload to unstable
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/gbp.conf2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fc89cac..78b968b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rsyslog (8.2.2-3) UNRELEASED; urgency=low
+
+ * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org> Sun, 29 Jun 2014 13:20:25 +0200
+
rsyslog (8.2.2-2) experimental; urgency=medium
* Merge changes from unstable branch.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 32f2a1f..c31be83 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
pristine-tar = True
-debian-branch = experimental
+debian-branch = master