[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20090303-1ubuntu1.ppa1-21-gceb4ce7

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty branch:
commit dc2c88ab48cf859de5b2287d50c6648002ed3d9a
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Thu Mar 19 17:26:36 2009 +0000

    Imported Debian patch 0.svn20090303-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index e20bd3c..ef7b5ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
 
-  * don't disable ffserver in specialised flavors. Fixes LP: #345370
+  * No-change rebuild to fix lpia shared library dependencies.
 
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:28:58 +0100
+ -- Colin Watson <cjwatson at ubuntu.com>  Thu, 19 Mar 2009 17:26:36 +0000
 
 ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
 
diff --git a/debian/confflags b/debian/confflags
index 05c4537..39cbed7 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -104,6 +104,7 @@ cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
 cmov_build_confflags += --disable-ffmpeg
+cmov_build_confflags += --disable-ffserver
 cmov_build_confflags += --disable-ffplay
 
 ## powerpc architecture specific
@@ -116,6 +117,7 @@ altivec_build_confflags += --disable-static
 altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
 altivec_build_confflags += --enable-altivec
 altivec_build_confflags += --disable-ffmpeg
+altivec_build_confflags += --disable-ffserver
 altivec_build_confflags += --disable-ffplay
 
 ## sparc architecture specific
@@ -127,6 +129,7 @@ vis_build_confflags += --enable-shared
 vis_build_confflags += --disable-static
 vis_build_confflags += --extra-cflags="-fPIC -DPIC"
 vis_build_confflags += --disable-ffmpeg
+vis_build_confflags += --disable-ffserver
 vis_build_confflags += --disable-ffplay
 
 # Support multiple makes at once (taken from the qemu package)
diff --git a/debian/control b/debian/control
index 50d16c9..d92e89c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ffmpeg-debian
 Section: libs
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>,
            Reinhard Tartler <siretart at tauware.de>,
diff --git a/debian/strip.sh b/debian/strip.sh
old mode 100755
new mode 100644

-- 
FFmpeg packaging