[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-6-22-gef11c38

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3ab91e8908ffe65c2e386094c8734ed776e1d9f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:44:54 2010 +0100

    track upstream-0.5 branch
    
    the 'upstream' branch has already started to track trunk again, but we
    are working on the 0.5.1 point release

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1615f89..abdc598 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-upstream-branch = upstream
+upstream-branch = upstream-0.5
 debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s

-- 
FFmpeg packaging