[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20081115-1ubuntu1-28-g678e3d9

Tue Jan 20 17:56:36 UTC 2009

The following commit has been merged in the ubuntu.jaunty branch:
commit 42c50e04ded40ab3ca7c3bc81f004b98b1d34350
Merge: c8154f407ff6814a89e113aa39876bfa01142840 0bee82e4ee8c715bb21d3c02f9b1d5e121a2682a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 00:15:26 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

diff --combined debian/changelog
index c70af0c,2805b64..9127520

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,30 +1,40 @@@
+ ffmpeg-debian (3:0.svn20090119-1) UNRELEASED; urgency=low
+ 
+   * New Upstream Version (svn revision 16681m libswscale revision 28341)
+   * update Vcs-Git tags. Packaging has now moved to git
+   
+   Upstream Changes:
+    - SVQ3 watermark decoding support
+    - hybrid WavPack support
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 12 Jan 2009 07:42:17 +0100
+ 
+ ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low
+ 
+   * new upstream svn snapshot (svn revision 16508, libswscale revision 28286)
+   
+   Upstream Changes:
+    - RV30 and RV40 decoder
+    - QCELP / PureVoice decoder
+   
+   * removed patch 050_fix_pkgconfig_files.patch. Merged upstream
+   * disabled patch 020_visibility_patch. It needs to be adapted to the new
+     upstream changes. Hopefully it will get merged into ffmpeg properly.
+   * install formats.txt in the libavcodec52 package to document what
+     formats this version of ffmpeg has enabled.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
+ 
 +ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    source packages come from the same packaging branch.
 +  * drop dependency on faad.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:44:29 +0100
 +
  ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
  
    * new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -17,31 -34,6 +44,31 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 21:37:16 +0100
  
 +ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
 +
 +  * really disable faad support completely.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:58:01 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
 +
 +  * drop the patch to dlopen faad at runtime for now. it needs more
 +    polishing, and we can have that functionality easier with the 'ffmpeg'
 +    source package that will appear in multiverse.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:31:47 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    source packages come from the same packaging branch.
 +  * drop dependency on faad.
 +  * import patches from old packaging to dlopen libfaad at runtime.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 07:31:16 +0100
 +
  ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
  
    * upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/confflags
index 122b035,df99071..75c914f
--- a/debian/confflags
+++ b/debian/confflags
@@@ -12,6 -12,8 +12,8 @@@ export DEB_HOST_GNU_TYPE  ?= $(shell dp
  export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  
+ SVNREVISION=$(shell cat .svnrevision 2>/dev/null || echo "UNKNOWN")
+ 
  # the other flavors always build dynamic versions
  ifeq      ($(DEB_HOST_ARCH),i386)
  FLAVORS += cmov
@@@ -23,6 -25,7 +25,6 @@@ endi
  
  # Configuration flags causing the libs to be GPL tainted
  gpl_confflags += --enable-gpl
 -gpl_confflags += --enable-libfaad
  gpl_confflags += --enable-postproc
  gpl_confflags += --enable-swscale
  gpl_confflags += --enable-x11grab
@@@ -30,7 -33,7 +32,7 @@@
  # Common configuration flags; comment out following line for LGPL versions of
  # the libraries
  confflags += $(gpl_confflags)
- confflags += --extra-version='svn15824+$(DEB_VERSION)'
+ confflags += --extra-version='svn$(SVNREVISION)+$(DEB_VERSION)'
  confflags += --prefix=/usr
  confflags += --enable-avfilter
  confflags += --enable-avfilter-lavf
diff --combined debian/control
index 5bc71e3,1a085ca..e658bf4
--- a/debian/control
+++ b/debian/control
@@@ -7,12 -7,13 +7,12 @@@ Uploaders: Sam Hocevar (Debian packages
             Reinhard Tartler <siretart at tauware.de>,
             Fabian Greffrath <fabian at debian-unofficial.org>
  Standards-Version: 3.8.0
- Vcs-Svn: https://code.launchpad.net/~siretart/ffmpeg/ffmpeg.jaunty
- Vcs-Browser: https://code.launchpad.net/~siretart/ffmpeg/ffmpeg.jaunty
+ Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
  Homepage: http://ffmpeg.mplayerhq.hu/
  Build-Depends-Indep: doxygen
  Build-Depends: debhelper (>= 5.0.0),
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 -               libfaad-dev | libfaad2-dev,
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,

-- 
FFmpeg packaging

