[SCM] idjc/master: Apply libav-0.7.patch only on Ubuntu; the two series files will be merged when libav 0.7 hits unstable.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 035e0715ede6d464b88b44916ba93f66792286f1
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 30 11:43:36 2011 +0200

    Apply libav-0.7.patch only on Ubuntu; the two series files will be merged when libav 0.7 hits unstable.

diff --git a/debian/patches/series b/debian/patches/series
index 4d83d77..0ca9912 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 desktop_file.patch
 idjc_script.patch
-libav-0.7.patch
 bashism-in-configure.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 0ca9912..4d83d77 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,3 +1,4 @@
 desktop_file.patch
 idjc_script.patch
+libav-0.7.patch
 bashism-in-configure.patch

-- 
idjc packaging