[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-108-g08e9031

[Arno Töll]

The following commit has been merged in the master branch:
commit 08e9031f97b694e642f44ea8657f245844ec6dd3
Author: Arno Töll <arno at debian.org>
Date:   Sun Jun 2 18:28:23 2013 +0200

    Update the gbp.conf

diff --git a/debian/changelog b/debian/changelog
index 6152dcd..3569886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
 
   * Denote exact versions breaking gnome-user-share now that Gnome maintainers
     have a fixed version in the works. That makes Gnome installable again.
+  * Update our gbp.conf for our big merge next -> master. The eagle has
+    landed, 2.4 is here.
 
- -- Arno Töll <arno at debian.org>  Sun, 02 Jun 2013 18:03:48 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 02 Jun 2013 18:27:39 +0200
 
 apache2 (2.4.4-5) unstable; urgency=low
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 23897aa..cacc4ef 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,6 +2,6 @@
 pristine-tar = True
 builder=dpkg-buildpackage -i\.git -I.git
 #cleaner=true
-upstream-branch=next-upstream
-debian-branch=next
+upstream-branch=upstream
+debian-branch=master
 

-- 
Debian packaging for apache2