[SCM] FFmpeg packaging branch, ubuntu.lucid, updated. debian/0.5+svn20090706-2ubuntu5.ppa1

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.lucid branch:
commit ca5e8d041b2813c1fef4697c15966da4b27a5bb5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Dec 21 23:57:34 2009 +0100

    Imported Debian patch 0.5+svn20090706-2ubuntu4

diff --git a/debian/changelog b/debian/changelog
index 32dbd16..0d7f0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+  * add build dependency on 'yasm', since it is now moved to main.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 21 Dec 2009 23:57:34 +0100
+
 ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
 
   * security backports from ffmpeg trunk (Closes: #550442)
diff --git a/debian/control b/debian/control
index dbc5543..77b0a5a 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 7),
                libxvmc-dev,
                quilt,
                texi2html,
+               yasm,
                zlib1g-dev
 
 Package: ffmpeg
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6d87620..1615f89 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = ubuntu.lucid
+debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
old mode 100755
new mode 100644

-- 
FFmpeg packaging