diff -Naupr ffmpeg-0.svn20080206/debian/changelog ffmpeg-0.svn20080206-motion/debian/changelog
--- ffmpeg-0.svn20080206/debian/changelog	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/changelog	2009-07-14 13:14:16.000000000 +0200
@@ -1,4 +1,4 @@
-ffmpeg (3:0.svn20080206-12ubuntu3+unstripped5) intrepid; urgency=low
+ffmpeg (3:0.svn20080206-12ubuntu3.1+unstripped6) intrepid; urgency=low
 
   * Compile against libfaac-dev, libxvidcore-dev | libxvidcore4-dev for aac
     encoding and xvid support. (LP: #285540)
diff -Naupr ffmpeg-0.svn20080206/debian/control ffmpeg-0.svn20080206-motion/debian/control
--- ffmpeg-0.svn20080206/debian/control	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/control	2009-07-14 13:14:16.000000000 +0200
@@ -75,18 +75,18 @@ Description: ffmpeg device handling libr
  This package contains a Debian-specific version of the libavdevice shared
  object that should only be used by Debian packages.
 
-Package: libpostproc-unstripped-51
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libpostproccvs51, libpostproc51
-Replaces: libpostproccvs51, libpostproc51
-Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libpostproc shared
- object that should only be used by Debian packages.
+#Package: libpostproc-unstripped-51
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends}
+#Conflicts: libpostproccvs51, libpostproc51
+#Replaces: libpostproccvs51, libpostproc51
+#Description: ffmpeg video postprocessing library
+# This is the video postprocessing library from the ffmpeg project.
+# .
+# This package contains a Debian-specific version of the libpostproc shared
+# object that should only be used by Debian packages.
 
 Package: libavformat-unstripped-52
 Section: libs
@@ -102,16 +102,128 @@ Description: ffmpeg file format library
  This package contains a Debian-specific version of the libavformat shared
  object that should only be used by Debian packages.
 
-Package: libswscale-unstripped-0
-Section: libs
+#Package: libswscale-unstripped-0
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends}
+#Conflicts: libswscalecvs0, libswscale0
+#Replaces: libswscalecvs0, libswscale0
+#Description: ffmpeg video scaling library
+# This is the video scaling library from the ffmpeg project.
+# .
+# This package contains a Debian-specific version of the libswscale shared
+# object that should only be used by Debian packages.
+
+
+Package: libavutil-dev-unstripped
+Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Conflicts: libswscalecvs0, libswscale0
-Replaces: libswscalecvs0, libswscale0
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
+Depends: libavutil-unstripped-49 (= ${binary:Version})
+Conflicts: libavformat-dev (<< 3:0.cvs20060329-4),
+           libavcodec-dev (<< 0.svn20080206-7),
+           libavutilcvs49-dev,
+           libavutilcvs-dev
+Replaces: libavformat-dev (<< 3:0.cvs20060329-4),
+          libavcodec-dev (<< 3:0.svn20080206-7),
+          libavutilcvs49-dev,
+          libavutilcvs-dev
+Description: development files for libavutil
+ This is the common utility library from the ffmpeg project. It is required
+ by all other ffmpeg libraries.
  .
- This package contains a Debian-specific version of the libswscale shared
- object that should only be used by Debian packages.
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavutil.
+
+Package: libavcodec-dev-unstripped
+Section: libdevel
+Architecture: any
+Depends: libavcodec-unstripped-51 (= ${binary:Version}),
+         libavutil-dev-unstripped (= ${binary:Version}),
+         libgsm1-dev,
+         libogg-dev,
+         libtheora-dev (>> 0.0.0.alpha4),
+         libvorbis-dev,
+         zlib1g-dev,
+         ${lib1394-dev}
+Conflicts: libavformat-dev (<< 3:0.cvs20060329-4),
+           libavutil-dev (<< 3:0.svn20080206-8),
+           libavcodeccvs51-dev,
+           libavcodeccvs-dev
+Replaces: libavformat-dev (<< 3:0.cvs20060329-4),
+          libavutil-dev (<< 3:0.svn20080206-8),
+          libavcodeccvs51-dev,
+          libavcodeccvs-dev
+Description: development files for libavcodec
+ This is the codec library from the ffmpeg project. It supports most existing
+ encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavcodec.
+
+#Package: libavdevice-dev-unstripped
+#Section: libdevel
+#Architecture: any
+#Depends: libavdevice-unstripped-52 (= ${binary:Version}),
+#         libavformat-dev-unstripped (= ${binary:Version})
+#Conflicts: libavformat-dev (<< 3:0.cvs20060329-4),
+#           libavdevicecvs52-dev,
+#           libavdevicecvs-dev
+#Replaces: libavformat-dev (<< 3:0.cvs20060329-4),
+#          libavdevicecvs52-dev,
+#          libavdevicecvs-dev
+#Description: development files for libavdevice
+# This is the device handling library from the ffmpeg project.
+# .
+# This package contains the header files and static libraries needed to
+# compile applications or shared objects that use libavdevice.
+
+#Package: libpostproc-dev-unstripped
+#Section: libdevel
+#Architecture: any
+#Depends: libpostproc-unstripped-51 (= ${binary:Version}),
+#         libavcodec-dev-unstripped (= ${binary:Version})
+#Conflicts: libpostproccvs51-dev,
+#           libpostproccvs-dev
+#Replaces: libpostproccvs51-dev,
+#          libpostproccvs-dev
+#Description: development files for libpostproc
+# This is the video postprocessing library from the ffmpeg project.
+# .
+# This package contains the header files and static libraries needed to
+# compile applications or shared objects that use libpostproc.
+
+Package: libavformat-dev-unstripped
+Section: libdevel
+Architecture: any
+Depends: libavformat-unstripped-52 (= ${binary:Version}),
+         libavcodec-dev-unstripped (= ${binary:Version})
+Conflicts: libavcodec-dev (<< 3:0.cvs20060306-1),
+           libavformatcvs51-dev,
+           libavformatcvs52-dev,
+           libavformatcvs-dev
+Replaces: libavcodec-dev (<< 3:0.cvs20060306-1),
+          libavformatcvs51-dev,
+          libavformatcvs52-dev,
+          libavformatcvs-dev
+Description: development files for libavformat
+ This is the demuxer library from the ffmpeg project. It supports most
+ existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavformat.
 
+#Package: libswscale-dev-unstripped
+#Section: libdevel
+#Architecture: any
+#Depends: libswscale-unstripped-0 (= ${binary:Version}),
+#         libavutil-dev-unstripped (= ${binary:Version})
+#Conflicts: libswscalecvs0-dev,
+#           libswscalecvs-dev
+#Replaces: libswscalecvs0-dev,
+#          libswscalecvs-dev
+#Description: development files for libswscale
+# This is the video scaling library from the ffmpeg project.
+# .
+# This package contains the header files and static libraries needed to
+# compile applications or shared objects that use libswscale.
diff -Naupr ffmpeg-0.svn20080206/debian/fixup-config.sh ffmpeg-0.svn20080206-motion/debian/fixup-config.sh
--- ffmpeg-0.svn20080206/debian/fixup-config.sh	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/fixup-config.sh	2009-07-14 13:14:16.000000000 +0200
@@ -6,10 +6,10 @@
 # This script fixes up the build by adding adding required #defines to
 # config.h
 
-EXPECTED_CODECS="H261 H263 H263P MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MPEG4 MPEG2VIDEO"
-echo "#ifndef FIXUP_CONFIG_"
-echo "#define FIXUP_CONFIG_"
-for codec in $EXPECTED_CODECS; do
-    echo "#define ENABLE_${codec}_ENCODER 0"
-done
-echo "#endif"
+#EXPECTED_CODECS="H261 H263 H263P MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MPEG4 MPEG2VIDEO"
+#echo "#ifndef FIXUP_CONFIG_"
+#echo "#define FIXUP_CONFIG_"
+#for codec in $EXPECTED_CODECS; do
+#    echo "#define ENABLE_${codec}_ENCODER 0"
+#done
+#echo "#endif"
diff -Naupr ffmpeg-0.svn20080206/debian/libavcodec-dev.install ffmpeg-0.svn20080206-motion/debian/libavcodec-dev.install
--- ffmpeg-0.svn20080206/debian/libavcodec-dev.install	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/libavcodec-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/lib/pkgconfig/libavcodec.pc
-usr/include/ffmpeg/avcodec.h
-usr/include/ffmpeg/dsputil.h
-usr/lib/libavcodec.a
-usr/lib/{,*/,*/*/}libavcodec.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavcodec-dev-unstripped.install ffmpeg-0.svn20080206-motion/debian/libavcodec-dev-unstripped.install
--- ffmpeg-0.svn20080206/debian/libavcodec-dev-unstripped.install	1970-01-01 01:00:00.000000000 +0100
+++ ffmpeg-0.svn20080206-motion/debian/libavcodec-dev-unstripped.install	2009-07-14 13:13:23.000000000 +0200
@@ -0,0 +1,5 @@
+usr/lib/pkgconfig/libavcodec.pc
+usr/include/ffmpeg/avcodec.h
+usr/include/ffmpeg/dsputil.h
+usr/lib/libavcodec.a
+usr/lib/{,*/,*/*/}libavcodec.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavdevice-dev.install ffmpeg-0.svn20080206-motion/debian/libavdevice-dev.install
--- ffmpeg-0.svn20080206/debian/libavdevice-dev.install	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/libavdevice-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/pkgconfig/libavdevice.pc
-usr/include/ffmpeg/avdevice.h
-usr/lib/libavdevice.a
-usr/lib/{,*/,*/*/}libavdevice.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavdevice-dev-unstripped.install ffmpeg-0.svn20080206-motion/debian/libavdevice-dev-unstripped.install
--- ffmpeg-0.svn20080206/debian/libavdevice-dev-unstripped.install	1970-01-01 01:00:00.000000000 +0100
+++ ffmpeg-0.svn20080206-motion/debian/libavdevice-dev-unstripped.install	2009-07-14 13:13:23.000000000 +0200
@@ -0,0 +1,4 @@
+usr/lib/pkgconfig/libavdevice.pc
+usr/include/ffmpeg/avdevice.h
+usr/lib/libavdevice.a
+usr/lib/{,*/,*/*/}libavdevice.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavformat-dev.install ffmpeg-0.svn20080206-motion/debian/libavformat-dev.install
--- ffmpeg-0.svn20080206/debian/libavformat-dev.install	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/libavformat-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-usr/lib/pkgconfig/libavformat.pc
-usr/include/ffmpeg/avformat.h
-usr/include/ffmpeg/avio.h
-usr/include/ffmpeg/rtsp.h
-usr/include/ffmpeg/rtspcodes.h
-usr/lib/libavformat.a
-usr/lib/{,*/,*/*/}libavformat.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavformat-dev-unstripped.install ffmpeg-0.svn20080206-motion/debian/libavformat-dev-unstripped.install
--- ffmpeg-0.svn20080206/debian/libavformat-dev-unstripped.install	1970-01-01 01:00:00.000000000 +0100
+++ ffmpeg-0.svn20080206-motion/debian/libavformat-dev-unstripped.install	2009-07-14 13:13:23.000000000 +0200
@@ -0,0 +1,7 @@
+usr/lib/pkgconfig/libavformat.pc
+usr/include/ffmpeg/avformat.h
+usr/include/ffmpeg/avio.h
+usr/include/ffmpeg/rtsp.h
+usr/include/ffmpeg/rtspcodes.h
+usr/lib/libavformat.a
+usr/lib/{,*/,*/*/}libavformat.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavutil-dev.install ffmpeg-0.svn20080206-motion/debian/libavutil-dev.install
--- ffmpeg-0.svn20080206/debian/libavutil-dev.install	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/libavutil-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-usr/lib/pkgconfig/libavutil.pc
-usr/include/ffmpeg/adler32.h
-usr/include/ffmpeg/avstring.h
-usr/include/ffmpeg/avutil.h
-usr/include/ffmpeg/base64.h
-usr/include/ffmpeg/common.h
-usr/include/ffmpeg/crc.h
-usr/include/ffmpeg/fifo.h
-usr/include/ffmpeg/intfloat_readwrite.h
-usr/include/ffmpeg/log.h
-usr/include/ffmpeg/lzo.h
-usr/include/ffmpeg/mathematics.h
-usr/include/ffmpeg/md5.h
-usr/include/ffmpeg/mem.h
-usr/include/ffmpeg/opt.h
-usr/include/ffmpeg/random.h
-usr/include/ffmpeg/rational.h
-usr/include/ffmpeg/sha1.h
-usr/lib/libavutil.a
-usr/lib/{,*/,*/*/}libavutil.so
diff -Naupr ffmpeg-0.svn20080206/debian/libavutil-dev-unstripped.install ffmpeg-0.svn20080206-motion/debian/libavutil-dev-unstripped.install
--- ffmpeg-0.svn20080206/debian/libavutil-dev-unstripped.install	1970-01-01 01:00:00.000000000 +0100
+++ ffmpeg-0.svn20080206-motion/debian/libavutil-dev-unstripped.install	2009-07-14 13:13:23.000000000 +0200
@@ -0,0 +1,20 @@
+usr/lib/pkgconfig/libavutil.pc
+usr/include/ffmpeg/adler32.h
+usr/include/ffmpeg/avstring.h
+usr/include/ffmpeg/avutil.h
+usr/include/ffmpeg/base64.h
+usr/include/ffmpeg/common.h
+usr/include/ffmpeg/crc.h
+usr/include/ffmpeg/fifo.h
+usr/include/ffmpeg/intfloat_readwrite.h
+usr/include/ffmpeg/log.h
+usr/include/ffmpeg/lzo.h
+usr/include/ffmpeg/mathematics.h
+usr/include/ffmpeg/md5.h
+usr/include/ffmpeg/mem.h
+usr/include/ffmpeg/opt.h
+usr/include/ffmpeg/random.h
+usr/include/ffmpeg/rational.h
+usr/include/ffmpeg/sha1.h
+usr/lib/libavutil.a
+usr/lib/{,*/,*/*/}libavutil.so
diff -Naupr ffmpeg-0.svn20080206/debian/strip.sh ffmpeg-0.svn20080206-motion/debian/strip.sh
--- ffmpeg-0.svn20080206/debian/strip.sh	2009-07-14 13:13:53.000000000 +0200
+++ ffmpeg-0.svn20080206-motion/debian/strip.sh	2009-07-14 13:14:16.000000000 +0200
@@ -1,9 +1,9 @@
 
 # strip/clean the code from potentially dangerous patented code
-for codec in 'h26.*' mpeg2video mpeg4 'msmpeg4.*'; do
-    F=libavcodec/allcodecs.c
-    sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
-    sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F
-    F=libavcodec/*.c
-    sed -i "/AVCodec *${codec}_encoder *=/,/^[[:space:]]*}/d" $F
-done
+#for codec in 'h26.*' mpeg2video mpeg4 'msmpeg4.*'; do
+#    F=libavcodec/allcodecs.c
+#    sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
+#    sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F
+#    F=libavcodec/*.c
+#    sed -i "/AVCodec *${codec}_encoder *=/,/^[[:space:]]*}/d" $F
+#done