[SCM] FFmpeg packaging branch, ubuntu, updated. debian/0.6-1ubuntu1-28-g66ae34b

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 372d3d3267345a11e3cfc4fdd744276de4e91a55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:02:48 2010 -0400

    make rtmp dependency conditional
    
    librtmp is in universe only, so we can only enable it for the
    ffmpeg-extra package.

diff --git a/debian/confflags b/debian/confflags
index 52742ba..96c1871 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -87,8 +87,6 @@ confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
 confflags += --enable-libvorbis
-# only in ubuntu universe
-# confflags += --enable-librtmp
 confflags += --enable-vaapi
 confflags += --enable-pthreads
 confflags += --enable-zlib
@@ -105,6 +103,7 @@ confflags += $(extra_common_confflags)
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
 gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
 confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 
 # Opencore-amr requires GPL v3
diff --git a/debian/control b/debian/control
index 13949d3..d978eef 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 7),
                libgsm1-dev,
                libimlib2-dev,
                libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               librtmp-dev (>= 2.2e-4),
                libschroedinger-dev,
                libsdl1.2-dev,
                libspeex-dev,

-- 
FFmpeg packaging