[SCM] xvidcore/master: Reset some changes back for Debian specific packaging.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 30994e7acdd599e46dd7b22e4297d224bdcd5985
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 27 21:53:44 2010 -0400

    Reset some changes back for Debian specific packaging.

diff --git a/debian/changelog b/debian/changelog
index 7337cc0..e5a4c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xvidcore (2:1.2.2+debian-3ubuntu1) UNRELEASED; urgency=low
-
-  * Merge from Debian.
-
- -- Maia Kozheva <sikon at ubuntu.com>  Sun, 29 Aug 2010 18:30:32 +0700
-
 xvidcore (2:1.2.2+debian-3) UNRELEASED; urgency=low
 
   [ Fabian Greffrath ]
diff --git a/debian/control b/debian/control
index e75d844..f9301cf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: xvidcore
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
            Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index f258ca2..37a196b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,2 @@
 [DEFAULT]
-debian-branch = master-ubuntu
+debian-branch = master

-- 
xvidcore packaging