[SCM] FFmpeg packaging branch, master.extra, updated. debian/0.5+svn20090609-2debimedia1-15-gbc96ef2

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.extra branch:
commit 4f073d5901e4f3e78d3d4a5f2e896b116f2c476c
Merge: cf4cebbb985a979866469b174987d4745b36ea9f cd842cb7cb542c03a071fbd69b4d7cc190a387b2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 14 19:20:14 2009 +0200

    Merge branch 'master' into master.extra

diff --combined debian/changelog
index 7650424,c515e34..a72d27b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,23 +1,39 @@@
+ ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
+ 
+   * preparing new upstream version, 0.5 release branch, rev 19352
+     - this version is capable of compiling swscale in LGPL mode
+   * rename source package back
+     - The replacement package with the 'missing bits' will be called
+       'ffmpeg-extra'
+     - simplify README.upstream-upgrade
+     - rename the source package from 'ffmpeg-debian' -> 'ffmpeg'
+   * fix aac playback regression, thanks to Matthew Wakeling for reporting
+      (Closes: #540729)
+   * fix seeking in DIF (DV) movies
+      Thanks to Dan Dennedy for identifying the patch! (Closes: #540424)
+   * debian/rules:
+     - merge cond_enable_nf macro from master.extra branch
+     - don't disable ffserver in various optimized variants
+     - don't disable building of statically linked helper binaries
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 13 Aug 2009 12:48:27 +0200
+ 
 +ffmpeg-extra (4:0.5+svn20090609-2debimedia1) unstable; urgency=low
 +
 +  * Prepare new release.
 +  * This package is the replacment package that is built against the
 +    following extra packages:
 +     - x264
 +     - mp3lame
 +     - xvidcore  
 +  * We've used the suffix -unstripped- formerly for this set of
 +    package. In order to keep existing packages installable with this set
 +    of packages, we are also building transitional -unstripped- dummy
 +    packages that depend on the right ones. They will be dropped after
 +    squeeze release.
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 10 Jul 2009 22:41:20 +0200
 +
  ffmpeg-debian (4:0.5+svn20090609-2) unstable; urgency=low
  
    [ Fabian Greffrath ]
@@@ -50,7 -54,7 +70,7 @@@
    * remove section numbering from README.Debian
    * add note about the lintian override
  
 - -- Reinhard Tartler <siretart at tauware.de>  Thu, 13 Aug 2009 12:46:46 +0200
 + -- Andres Mejia <mcitadel at gmail.com>  Mon, 06 Jul 2009 13:04:17 -0400
  
  ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
  
diff --combined debian/rules
index 3edbcf0,f79e589..e0d8d42
--- a/debian/rules
+++ b/debian/rules
@@@ -13,7 -13,7 +13,7 @@@ ifeq ($(SVN_VERSION),
  $(error UPSTREAM_VERSION: $(UPSTREAM_VERSION) - but SVN_VERSION is empty! - check debian/rules)
  endif
  
 -LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 +LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
  
  # we don't need to strip if we are not building the package ffmpeg-debian
  ifneq ($(DEB_SOURCE),ffmpeg-debian)
@@@ -79,8 -79,6 +79,6 @@@ clean-real
  
  get-orig-source:
  	dh_testdir
- 	# strip patented code
- 	chmod +x debian/strip.sh
  	sh debian/get-orig-source.sh -d $(SVN_VERSION)
  
  # The trailing newline is important!
@@@ -129,7 -127,7 +127,7 @@@ binary-arch: build install formats.tx
  	dh_installdocs -A debian/README.Debian
  	dh_installdocs RELEASE
  ifeq ($(DEB_SOURCE),ffmpeg)
 -	dh_installdocs -p libavcodec-unstripped-52 formats.txt
 +	dh_installdocs -p libavcodec-extra-52 formats.txt
  else
  	dh_installdocs -p libavcodec52 formats.txt
  endif
@@@ -148,7 -146,7 +146,7 @@@ endi
  # strict internal dependencies
  ifeq ($(DEB_SOURCE),ffmpeg-debian)
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 +	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
  	done
  else
@@@ -161,7 -159,7 +159,7 @@@ endi
  # target dependencies for external packages
  ifeq ($(DEB_SOURCE),ffmpeg-debian)
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 +	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
  	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
  	done
  else

-- 
FFmpeg packaging