[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3+svn20100502-3-14-g0c42aea

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit d452788cac05c3a126b0edad21b300f96888cdb1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 1 22:51:28 2010 +0200

    track 'ubuntu' branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1615f89..d6bc349 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = master
+debian-branch = ubuntu
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True

-- 
mplayer packaging