[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.118+svn3796-3-67-gc1f6914

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c1f6914092d2eadc12bb6cf76ca8dc5a9fc96019
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 19 08:00:20 2010 +0200

    update gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index ceefed7..175606a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-upstream-branch = upstream.jackd1
-debian-branch = master.jackd1
+upstream-branch = upstream
+debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = False

-- 
Debian packaging for jack-audio-connection-kit