[SCM] libav-extra/ubuntu: revert the bits that we need to keep in ubuntu

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 3c45e04a8eaf2887a7c890cabf01054db3586f7e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Sep 28 11:52:38 2011 +0200

    revert the bits that we need to keep in ubuntu

diff --git a/debian/control b/debian/control
index aefbb23..09f8fd3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libav-extra
 Section: libs
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Loic Minier <lool at dooz.org>,
  Reinhard Tartler <siretart at tauware.de>,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e5b6e27..a5b8c7c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = master
+debian-branch = ubuntu
 upstream-tag = upstream/%(version)s
 debian-tag = extra/debian/%(version)s
 pristine-tar = False

-- 
libav-extra packaging