diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/gbp.conf | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6152dcd4..35698867 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@debian.org> Sun, 02 Jun 2013 18:03:48 +0200 + -- Arno Töll <arno@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 23897aac..cacc4efe 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 |