[SCM] ffmpeg/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Mar 20 10:15:04 UTC 2011


fixup broken changelog entry for version 4:0.6.1-5ubuntu2
prepare new upload
Merge commit 'debian/4%0.6.2-1' into ubuntu
Imported Debian patch 0.6.1-5ubuntu2
update debian/changelog
Introduce 'libav-source', which contains the patched sources of libav
make buildlogs verbose
Switch to libav packages
update version numbering
Merge branch 'upstream' (libav 0.6.2)
Imported Upstream version 0.6.2
rename source package to libav
prepare new upload
Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
copy in changelog entries from the 0.5 packaging branch (Closes: #616190)
update debian/changelog
Merge remote branch 'origin/master' into ubuntu
update debian/changelog
don't libva usage on hurd only
Force upgrade of mplayer pre-rc4 for upgrades of libswscale, Closes: #612292
minor updates to libswscale0's package description
don't enable vaapi support on s390 and the hurd
start new upload
start new upload
update debian/changelog
also for upgrades of the 'mplayer-gui' package (Closes: #611579)
revised package descriptions
sanitize LDFLAGS variable
call gpl_confflags macro properly
simplify lintian-overrides
track 'master' branch
remove README.upstream-upgrade
Merge branch 'master' into master.snapshot
remove note about packages being "Debian-specific"
enable dirac conditionally (not in ubuntu/main)
enable libopenjpeg conditionally (not in ubuntu/main)
sort gpl_confflags
sort build-dependencies alphabetically
add libxfixes-dev to build depends
start new upload
Add myself as uploader.
Single-space indent continuated lines in control file.
bump urgency
update debian/changelog
Fix several security issues in flicvideo.c
finalize debian/changelog
fix x11grab example in e.g. the manpage so that they actually work
add libxfixes-dev to build-depends to unbreak x11grab input, Closes: #596342, LP: #631103
start new upload
finalize changelog
Fix typo: use -march=armv7-a instead of -marmv7-a
merged the last two changelog entries, -3 hasn't been uploaded
Update changelog for last fix
Pass -marmv7-a for the NEON flavor if needed
Initial 4:0.5.2-4 changelog to fix a bug id
confflags: detect armv6t2 support; closes: #594093
Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881
prepare new upload
update debian/changelog
bump standards version
more elaborate debian/changelog
update debian/changelog
Enable all encoders, Closes: #418231, #433287, #440216
fix debian/control file
add proper replaces for ffpresets move
fix upload target
Update debian/changelog.
Remove fix-ftbfs-altivec.patch, applied upstream.
Remove ffmpeg-debian_hurd.patch, applied upstream.
Merge commit 'upstream/0.5.2'
Imported Upstream version 0.5.2
update debian/changelog
move presets back to 'ffmpeg' package. Closes #581748
Update overrides for new libavcodec52 libraries.
Bumpt to Standards-Version 3.8.4
Fix dependency problem for ffmpeg binary package when using extra ffmpeg libs. This will still leave problem with ffmpeg-dbg, but the debug package will be useless anyway when using extra ffmpeg libs.
new upload
fix ftbfs on powerpc
finalize debian/changelog
Fix compilation on powerpc with --disable-altivec
reintroduce gnu/hurd patch
prepare new upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu.extra
X-Git-Reftype: branch
X-Git-Oldrev: 89b0b08109a323e2d6802dc1540741d182a5680c
X-Git-Newrev: 49741c10727827978b409fedf9a61202684538a6

The following commit has been merged in the ubuntu.extra branch:
commit 49741c10727827978b409fedf9a61202684538a6
Merge: 72e85c143b8513ec9532ca2dd6e2b6446d8891e5 14560da9356a36d89951007b81be8bd21514b98f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:52:23 2011 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

diff --combined debian/changelog
index 4f8eceb,29cbd7c..769f227
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,77 +1,91 @@@
 +libav-extra (4:0.6.2-0ubuntu1) natty; urgency=low
 +
 +  * rename to libav-extra
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 20 Mar 2011 10:48:16 +0100
 +
+ libav (4:0.6.2-1ubuntu1) unstable; urgency=low
+ 
+   * Merge from debian. Remaining changes:
+     - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+     - explicitly --enable-pic on powerpc, cf. LP #654666
+     - different arm configure bits that should probably better be merged into debian
+   
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 20 Mar 2011 10:26:02 +0100
+ 
 +ffmpeg-extra (4:0.6.1-2ubuntu1) natty; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
 +  * force upgrade of the mplayer package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 19 Nov 2010 12:15:19 +0100
 +
+ libav (4:0.6.2-1) unstable; urgency=medium
+ 
+   [ Reinhard Tartler ]
+   * Imported Upstream version 0.6.2
+     - include security fixes (Closes: #611495)
+   * rename source package to libav
+   * Switch to libav packages
+   * copy in changelog entries from the 0.5 packaging branch (Closes: #616190)
+   * update version numbering
+   * make buildlogs verbose
+   * Introduce 'libav-source', which contains the patched sources of libav
+   * rename source package to libav
+ 
+   [ Fabian Greffrath ]
+   * Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 19 Mar 2011 08:13:46 +0100
+ 
+ ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low
+ 
+   * Replace cp with tar to avoid an error of
+       "/bin/cp: Argument list too long" on the ARM platform
+       (running under a QEMU chroot environment) (LP: #734331)
+     - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86
+     - Restore a "Doxygen" file that excidentaly got into the changeset of the bug
+ 
+  -- Gal Shalif <gal at shalif.com>  Mon, 14 Mar 2011 13:47:24 +0200
+ 
+ ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
+ 
+   * Merge from debian. Remaining changes:
+     - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+     - explicitly --enable-pic on powerpc, cf. LP #654666
+     - different arm configure bits that should probably better be merged into debian
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Feb 2011 20:04:06 +0100
+ 
+ ffmpeg (4:0.6.1-5) unstable; urgency=low
+ 
+   * don't enable vaapi support on the hurd, Closes: #613034
+   * minor updates to libswscale0's package description
+   * Force upgrade of mplayer pre-rc4 for upgrades of libswscale,
+     Closes: #612292
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Feb 2011 09:25:42 +0100
+ 
+ ffmpeg (4:0.6.1-4) unstable; urgency=low
+ 
+   * no change rebuild to fix broken last upload.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 06 Feb 2011 09:20:39 +0100
+ 
+ ffmpeg (4:0.6.1-3) unstable; urgency=low
+ 
+   * add libxfixes-dev to build depends
+   * minor packaging cleanups
+   * revised package description
+   * detect libopenjpeg and dirac at build-time
+   * remove note about packages being "Debian-specific"
+   * simplify lintian-overrides
+   * Sanitize LDFLAGS variable; it seems that dpkg-buildflags injects
+     -Wl,-Bsymbolic-functions to LDFLAGS, which breaks the build on amd64
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 30 Jan 2011 09:22:11 +0100
+ 
  ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low
  
    * Merge from debian. Remaining changes:
@@@ -32,13 -92,6 +106,13 @@@ ffmpeg (4:0.6.1-2) experimental; urgenc
  
   -- Reinhard Tartler <siretart at tauware.de>  Fri, 19 Nov 2010 10:50:51 +0100
  
 +ffmpeg-extra (4:0.6.1-1ubuntu1) natty; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 21:03:40 +0100
 +
  ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
  
    * Merge from debian. Remaining changes:
@@@ -57,26 -110,6 +131,26 @@@ ffmpeg (4:0.6.1-1) experimental; urgenc
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 01 Nov 2010 09:18:08 +0100
  
 +ffmpeg-extra (4:0.6-2ubuntu5) natty; urgency=low
 +
 +  * Remove dummy packages with 'unstripped' notation
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 11:35:26 +0100
 +
 +ffmpeg-extra (4:0.6-2ubuntu4) natty; urgency=low
 +
 +  * sort build-deps alphabetically
 +  * build against librtmp-dev, closes LP: #673850
 +  * Bump Standards Version
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 12 Nov 2010 17:50:19 +0100
 +
 +ffmpeg-extra (4:0.6-2ubuntu3) maverick; urgency=low
 +
 +  * merge changes from 'ffmpeg' package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:40:28 +0200
 +
  ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
  
    * fix dependency on libswscale-extra-0, LP: #637895
@@@ -107,20 -140,6 +181,20 @@@ ffmpeg (4:0.6-2ubuntu2) maverick; urgen
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 20:38:27 -0400
  
 +ffmpeg-extra (4:0.6-2ubuntu2) maverick; urgency=low
 +
 +  * Add libxfixes-dev to build-depends, LP: #631103. Thanks to
 +    Dominic Evans for the initial patch against ffmpeg.
 +
 + -- Stefan Potyra <sistpoty at ubuntu.com>  Sun, 19 Sep 2010 13:55:05 +0200
 +
 +ffmpeg-extra (4:0.6-2ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 13:04:08 +0200
 +
  ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -154,13 -173,6 +228,13 @@@ ffmpeg (4:0.6-2) experimental; urgency=
  
   -- Reinhard Tartler <siretart at tauware.de>  Tue, 29 Jun 2010 09:07:56 +0200
  
 +ffmpeg-extra (4:0.6-1ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes:
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 13:04:08 +0200
 +
  ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -189,40 -201,6 +263,40 @@@ ffmpeg (4:0.6~svn20100505-1ubuntu2) mav
  
   -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:33:32 +0200
  
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu5) maverick; urgency=low
 +
 +  * install files into libavfilter-extra-1.install. LP: #587424
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 22:07:30 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu4) maverick; urgency=low
 +
 +  * bump soname for package libavutil49->libavutil50
 +  * fix installation rule, LP: #587424
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:42:48 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu3) maverick; urgency=low
 +
 +  * remove all install rules that are related to non-library packages
 +    Fixes FTBFS
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 28 May 2010 15:09:06 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
 +
 +  * don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra
 +    Fixes FTBFS
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 28 May 2010 13:34:02 +0200
 +
 +ffmpeg-extra (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 +
 +  * merge from 'main' package. Changes
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 07:49:18 +0200
 +
  ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
  
    * merge from debian/experimental. remaining changes:
@@@ -248,26 -226,83 +322,103 @@@ ffmpeg (4:0.6~svn20100505-1) experiment
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
  
+ ffmpeg (4:0.5.2-6) unstable; urgency=high
+ 
+   * Fix several security issues in flicvideo.c.
+     Fixes: CVE-2010-3429, Closes: #598590
+   * Raising severity to high because of security issue.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 03 Oct 2010 16:59:39 +0200
+ 
+ ffmpeg (4:0.5.2-5) unstable; urgency=low
+ 
+   [ Dominic Evans ]
+   * add libxfixes-dev to build-depends to unbreak x11grab input,
+     Closes: #596342, LP: #631103
+   
+   [ Reinhard Tartler ]
+   * fix x11grab example in e.g. the manpage so that they actually work
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 13 Sep 2010 15:29:49 +0200
+ 
+ ffmpeg (4:0.5.2-4) unstable; urgency=low
+ 
+   [ Loïc Minier ]
+   * Fix typo: use -march=armv7-a instead of -marmv7-a
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 31 Aug 2010 15:31:05 +0200
+ 
+ ffmpeg (4:0.5.2-3) unstable; urgency=low
+ 
+   [ Reinhard Tartler ]
+   * Move breaks declaration from libavformat to libavcodec to help the
+     apt solver, Closes: #591881
+ 
+   [ Loïc Minier ]
+     debian/confflags: detect whether the toolchain supports ARMv7 ("dmb")
+     by default as the NEON pass needs at least ARMv6t2; if it's not enabled by
+     default, pass -marmv7-a in extra-cflags for the NEON pass since NEON
+     implies ARMv7; closes: #594417.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Fri, 27 Aug 2010 01:24:10 +0200
+ 
+ ffmpeg (4:0.5.2-2) unstable; urgency=low
+ 
+   * Enable some encoders:
+     - h263, h263p, mpeg2video, mpeg4, msmpeg4v1, msmpeg4v2, msmpeg4v3
+     Closes: #418231, #433287, #440216, #587898, #525349
+   * Bump Standards Version, no changes needed
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Aug 2010 11:59:26 -0400
+ 
+ ffmpeg (4:0.5.2-1) unstable; urgency=low
+ 
+   [ Andres Mejia ]
+   * Fix dependency problem for ffmpeg so it can use extra ffmpeg libs.
+ 
+   [ Reinhard Tartler ]
+   * move presets back to 'ffmpeg' package. Closes: #581748
+ 
+   [ Fabian Greffrath ]
+   * Imported Upstream version 0.5.2
+   * Remove ffmpeg-debian_hurd.patch, applied upstream.
+   * Remove fix-ftbfs-altivec.patch, applied upstream.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 May 2010 23:01:08 +0200
+ 
+ ffmpeg (4:0.5.1-3) unstable; urgency=low
+ 
+   * fix ftbfs on powerpc
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Fri, 12 Mar 2010 21:43:55 +0100
+ 
+ ffmpeg (4:0.5.1-2) unstable; urgency=low
+ 
+   * reintroduce gnu/hurd patch
+   * Fix compilation on powerpc with --disable-altivec
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Wed, 10 Mar 2010 21:19:40 +0100
+ 
 +ffmpeg-extra (4:0.5.1-2) unstable; urgency=low
 +
 +  [ Andres Mejia ]
 +  * Prepare new upload for Debian.
 +  * Update gbp.conf for master.extra branch.
 +  * Bump Standards-Version to 3.8.4.
 +  * Don't include build-depends-indep when only building arch-dependent
 +    packages.
 +  * Include ${misc:Depends} for all packages.
 +  * Set the team as maintainers.
 +
 + -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 02:46:46 -0400
 +
 +ffmpeg-extra (4:0.5.1-1ubuntu1) lucid; urgency=low
 +
 +  * merge from 'main' package. Changes
 +    - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 04 Mar 2010 13:08:25 +0100
 +
  ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
  
    * merge from debian. remaining changes:
@@@ -306,33 -341,15 +457,33 @@@ ffmpeg (4:0.5+svn20090706-6) unstable; 
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 31 Jan 2010 16:53:47 +0100
  
 -ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu4) lucid; urgency=low
  
    * tighten build dependency on new x264 package
 -  * add x264 backport for ffmpeg 0.5
 +  * add libx264 wrapper backport for ffmpeg 0.5
    * install presets in 'libavcodec package' instead of 'ffmpeg' binary,
      see git history for rationale of this change
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 17 Feb 2010 08:37:17 +0100
  
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu3) lucid; urgency=low
 +
 +  * rebuild for ffmpeg versioned symbols
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 19 Jan 2010 20:55:30 +0100
 +
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +
 +  * No-change rebuild against new dirac package synced from Debian 
 +
 + -- Iain Lane <laney at ubuntu.com>  Sun, 17 Jan 2010 17:41:48 +0000
 +
 +ffmpeg-extra (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
 +
 +  * merge from 'ubuntu' branch
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 17 Jan 2010 09:34:54 +0100
 +
  ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
  
    * merge from debian, remaining changes:
@@@ -436,12 -453,6 +587,12 @@@ ffmpeg (4:0.5+svn20090706-2ubuntu4) luc
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 21 Dec 2009 23:57:34 +0100
  
 +ffmpeg-extra (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
 +
 +  * merge from 'ffmpeg' package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 10 Nov 2009 13:18:24 +0100
 +
  ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
  
    * security backports from ffmpeg trunk (Closes: #550442)
@@@ -456,27 -467,14 +607,27 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Nov 2009 20:31:29 +0100
  
 -ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
 +ffmpeg-extra (4:0.5+svn20090706-2ubuntu3) karmic; urgency=low
 +
 +  * make the conflicts/replaces on the former -unstripped- variants
 +    versioned so the -unstripped- and -extra- variants can actually be
 +    coinstalled.
 +  * remove references to obsolete 'cvs' packages. these have never existed
 +    in ubuntu after all.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 16 Oct 2009 10:29:16 +0200
 +
 +ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
  
    [ Reinhard Tartler ]
 +  * merge from the 'ffmpeg' package
    * Make arguments of av_set_pts_info() unsigned.
    * update debian/changelog
    * use patch for issue1245 from git.ffmpeg.org
    * Support constant-quant encoding for libtheora, LP: #356322
    * increase swscale compile time width (VOF/VOFW), LP: #443264
 +  * Add missing Conflicts/Replaces to ensure a working upgrade patch from
 +    intrepid/jaunty. LP: #418785
  
    [ Loïc Minier ]
    * Update config for karmic's armel toolchain.
@@@ -486,19 -484,7 +637,19 @@@
    * Pass proper --cpu and --extra-flags on armel.
    * Pass -fPIC -DPIC to neon pass.
  
 - -- Loïc Minier <loic.minier at ubuntu.com>  Tue, 13 Oct 2009 23:56:04 +0200
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 14 Oct 2009 09:15:50 +0200
 +
 +ffmpeg-extra (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
 +
 +  * merge from the 'ffmpeg' package
 +  * enable dirac, libopenjpeg
 +  * reintroduce the formats.txt file
 +  * reintroduce "missing" codecs: LP: #419103
 +  * is co-installable with the -dev packages LP: #416436, #418168
 +  * should now have the proper replaces lines: LP: #418789, #418799, #418807, #323789
 +  * don't build doxygen documentation, it is not installed anyway
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Aug 2009 11:50:32 +0200
  
  ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
  
@@@ -627,15 -613,6 +778,15 @@@ ffmpeg-debian (4:0.5+svn20090609-1ubunt
  
   -- Reinhard Tartler <siretart at tauware.de>  Fri, 24 Jul 2009 21:53:47 +0200
  
 +ffmpeg (4:0.5+svn20090609-1ubuntu1+unstripped1) karmic; urgency=low
 +
 +  * prepare new upload
 +  * update gbp.conf
 +  * move gbp.conf to debian/
 +  * regroup build dependencies to minimize the diff
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 24 Jul 2009 19:45:26 +0200
 +
  ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
  
    * merge from debian. Remaining changes:
@@@ -841,24 -818,6 +992,24 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 22 Feb 2009 09:32:49 +0100
  
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
 +
 +  * add conflicts replaces for libavfilter0, LP: #322570
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 09 Mar 2009 18:24:56 +0100
 +
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
 +
 +  * add correct epoch in the "internal" shlibs generation
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Feb 2009 15:24:58 +0100
 +
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * rebuild using a clean, uncrippled ffmpeg tarball
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Feb 2009 21:45:05 +0100
 +
  ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
  
    * merge from debian. Remaining changes:
@@@ -916,21 -875,6 +1067,21 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 19:54:27 +0100
  
 +ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
 +
 +  * add conflicts/replaces on libavfilter0. LP: #323789
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 18:45:46 +0100
 +
 +ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * merge with the ubuntu.jaunty branch
 +  * reenable x264 LP: #303537
 +  * build against vdpau
 +  * enable xvmc support
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 20 Jan 2009 17:51:19 +0100
 +
  ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
  
    * merge from debian. LP: #318501
@@@ -968,16 -912,6 +1119,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
  
 +ffmpeg (3:0.svn20081115-1ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * build unstripped version for multiverse.
 +  * enable additional external libraries:
 +      - libmp3lame-dev
 +      - libfaac-dev
 +      - libxvidcore-dev
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:50:42 +0100
 +
  ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
  
    * merge from debian.
diff --combined debian/confflags
index b68a983,d597414..5fd58b5
--- a/debian/confflags
+++ b/debian/confflags
@@@ -7,10 -7,10 +7,10 @@@ FLAVORS := stati
  # shared is generic, i.e. without arch specific opcodes
  FLAVORS += shared
  
- export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
  export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ 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")
  
@@@ -88,6 -88,7 +88,7 @@@ ende
  # Configuration flags causing the libs to be GPL tainted
  gpl_confflags += --enable-gpl
  gpl_confflags += --enable-postproc
+ gpl_confflags += --enable-swscale
  gpl_confflags += --enable-x11grab
  
  # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
@@@ -100,24 -101,20 +101,22 @@@ confflags += --enable-avfilte
  confflags += --enable-avfilter-lavf
  confflags += --enable-vdpau
  confflags += --enable-bzlib
 +confflags += --enable-libdirac
  confflags += --enable-libgsm
 +confflags += --enable-libopenjpeg
  confflags += --enable-libschroedinger
  confflags += --enable-libspeex
  confflags += --enable-libtheora
  confflags += --enable-libvorbis
- confflags += --enable-vaapi
  confflags += --enable-pthreads
  confflags += --enable-zlib
  confflags += --enable-libvpx
  confflags += --disable-stripping
  confflags += --enable-runtime-cpudetect
- 
- # for mysterical reasons, the aac decoder seem to cause the bss segment
- # to grow to big on ia64, disable it until the toolchain gets fixed
- ifeq      ($(DEB_HOST_ARCH),ia64)
- confflags += --disable-decoder=aac --disable-encoder=aac
+ ifeq      ($(DEB_HOST_ARCH),armel)
+ # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
+ # plenty of incompatible assembly; not sure how to detect that properly
+ confflags += --extra-cflags="-marm -fPIC -DPIC"
  endif
  
  ifeq      ($(DEB_HOST_ARCH),powerpc)
@@@ -126,16 -123,18 +125,18 @@@ endi
  
  confflags += $(extra_common_confflags)
  
+ # vaapi is not available on s390 and on the hurd
+ confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
+ 
  # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+ gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
  gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
- 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)
  gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+ gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+ gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
+ gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
  
- # Opencore-amr requires GPL v3
- v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
- v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
+ confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
  
  # AAC is considered non-free upstream
  confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
@@@ -150,8 -149,9 +151,9 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
    lib1394-dev += libraw1394-dev, libdc1394-22-dev
  endif
  
- # XXX this probably needs fixing
+ # Sanitize injected compiler in linker flags
  CFLAGS :=
+ LDFLAGS :=
  
  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
  # Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
diff --combined debian/control
index 45d2576,cdc2e60..e837eb9
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
 -Source: libav
 +Source: libav-extra
  Section: libs
  Priority: optional
  Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@@ -11,129 -11,273 +11,129 @@@ Uploaders: Sam Hocevar (Debian packages
   Jonas Smedegaard <dr at jones.dk>
  DM-Upload-Allowed: yes
  Standards-Version: 3.9.1
 -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.org/
 -Build-Depends-Indep: doxygen
 +Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
 +Homepage: http://libav.org/
  Build-Depends: debhelper (>= 7),
   libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libbz2-dev,
   libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 + libdirac-dev,
 + libfaad-dev | libfaad2-dev,
   libfreetype6-dev,
   libgsm1-dev,
   libimlib2-dev,
 + libmp3lame-dev,
 + libopenjpeg-dev,
   libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 + librtmp-dev (>= 2.2e-4),
 + librtmp-dev,
   libschroedinger-dev,
   libsdl1.2-dev,
   libspeex-dev,
   libtheora-dev (>> 0.0.0.alpha4),
-  libva-dev,
+  libva-dev [!hurd-i386],
   libvdpau-dev,
   libvorbis-dev,
   libvpx-dev,
   libx11-dev,
 + libx264-dev (>> 1:0.svn20100213+gitfcf70c),
   libxext-dev,
   libxfixes-dev,
 + libxvidcore-dev | libxvidcore4-dev,
   libxvmc-dev,
   quilt,
   texi2html,
   yasm [i386 amd64],
   zlib1g-dev
  
 -Package: ffmpeg
 -Section: video
 +Package: libavutil-extra-50
  Architecture: any
 -Replaces: libavcodec52 (<< ${source:Version}),
 - libavcodec-extra-52 (<< 4:0.6~)
  Depends: ${shlibs:Depends},
 - ${misc:Depends}
 -Conflicts: ffprobe
 -Description: Multimedia player, server, encoder and transcoder
 - This package contains the ffplay multimedia player, the ffserver streaming
 - server and the ffmpeg audio and video encoder. They support most existing
 - file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
 - DivX, MPEG4, AC3, DV...).
 -
 -Package: ffmpeg-dbg
 -Section: debug
 -Priority: extra
 -Architecture: any
 -Depends: libav-dbg
 -Breaks: libav-dbg (<< ${binary:Version})
 -Replaces: libav-dbg (<< ${binary:Version})
 -Description: Debug symbols for Libav related packages
 - This package contains debug data of the Libav related shared libraries.
 - .
 - Most people will not need this package. Please install it to produce useful
 - stacktraces to help debugging the Libav libraries.
 - .
 - This package is only used for transitional purposes and can be safely
 - removed.
 -
 -Package: libav-dbg
 -Section: debug
 -Priority: extra
 -Architecture: any
 -Depends: libavutil50 (= ${binary:Version}),
 - libavcodec52 (= ${binary:Version}),
 - libavdevice52 (= ${binary:Version}),
 - libpostproc51 (= ${binary:Version}),
 - libavformat52 (= ${binary:Version}),
 - libswscale0 (= ${binary:Version}),
 - ffmpeg (= ${binary:Version}),
 - ${misc:Depends}
 -Description: Debug symbols for Libav related packages
 - This package contains debug data of the Libav related shared libraries.
 - .
 - Most people will not need this package. Please install it to produce useful
 - stacktraces to help debugging the Libav library.
 -
 -Package: libav-source
 -Architecture: all
 -Section: devel
 -Description: Patched Libav sources
 - This package contains a tarball the source file that were used to produce
 - this package, containing all modifications that have been applied inline.
 - .
 - This package is used as build-dependency for 'libav-extra', which provides
 - the "extra" variants of libav.
 -
 -Package: ffmpeg-doc
 -Section: doc
 -Architecture: all
 -Depends: libav-doc
 -Description: Documentation of the Libav API (transitional package)
 - This package contains the html doxygen documentation of the Libav API.
 - .
 - Only application developers will find this package useful.
 - .
 - This package is only used for transitional purposes and can be safely
 - removed.
 -
 -Package: libav-doc
 -Section: doc
 -Architecture: all
 -Depends: ${misc:Depends}
 -Breaks: ffmpeg-doc (<< ${binary:Version})
 -Replaces: ffmpeg-doc (<< ${binary:Version})
 -Description: Documentation of the Libav API
 - This package contains the html doxygen documentation of the Libav API.
 - .
 - Only application developers will find this package useful.
 -
 -Package: libavutil50
 -Architecture: any
 -Depends: ${shlibs:Depends},
 - ${misc:Depends}
 +         ${misc:Depends}
 +Conflicts: libavutil50
 +Replaces: libavutil50
  Description: Libav utility library
 - This is the common utility library from Libav. It contains shared code
 - used by all other ffmpeg libraries.
 + This is the common utility library from the Libav project. It is required
 + by all other Libav libraries.
 + .
 + This package contains a unrestricted version of the libavutil shared
 + object that should only be used by Debian packages.
  
 -Package: libavcodec52
 +Package: libavcodec-extra-52
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
 -Breaks: libavcodec51 (<< 3:0.svn20090303-1)
 +Suggests: libfaad0
 +Conflicts: libavcodec52
 +Replaces: libavcodec52, ffmpeg (<< 4:0.5.1-1)
  Description: Libav codec library
 - This is the codec library from Libav (both encoding and decoding).
 + This package contains the ffplay multimedia player, the ffserver streaming
 + server and the Libav audio and video encoder. They support most existing
 + file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
 + DivX, MPEG4, AC3, DV...).
   .
 - It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
 + This package contains a unrestricted version of the libavcodec shared
 + object that should only be used by Debian packages.
  
 -Package: libavdevice52
 +Package: libavdevice-extra-52
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
 +Conflicts: libavdevice52
 +Replaces: libavdevice52
  Description: Libav device handling library
 - This is the device handling library from Libav.
 -
 -Package: libavformat52
 -Architecture: any
 -Depends: ${shlibs:Depends},
 - ${misc:Depends}
 -Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
 -Description: Libav file format library
 - This is the library for handling file formats from Libav.
 + This is the device handling library from the Libav project.
   .
 - It supports most existing file formats (AVI, MPEG, OGG, Matroska,
 - ASF...).
 -
 -Package: libavfilter1
 -Architecture: any
 -Depends: ${shlibs:Depends},
 - ${misc:Depends}
 -Description: Libav video filtering library
 - This is the video filtering library from Libav.
 + This package contains a unrestricted version of the libavdevice shared
 + object that should only be used by Debian packages.
  
 -Package: libpostproc51
 +Package: libavfilter-extra-1
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
 +Conflicts: libavfilter1
 +Replaces: libavfilter1
  Description: Libav video postprocessing library
   This is the video postprocessing library from Libav.
 -
 -Package: libswscale0
 -Architecture: any
 -Depends: ${shlibs:Depends},
 - ${misc:Depends}
 -Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
 -Description: Libav video scaling library
 - This is the video software scaling library from Libav.
 -
 -Package: libavutil-dev
 -Section: libdevel
 -Architecture: any
 -Depends: libavutil50 (>= ${binary:Version}) | libavutil-extra-50 (>= ${source:Upstream-Version}),
 - libavutil50 (<= ${source:Upstream-Version}-99) | libavutil-extra-50 (<= ${source:Upstream-Version}-99),
 - ${misc:Depends}
 -Description: Development files for libavutil
 - This is the common utility library from Libav.
   .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavutil.
 + This package contains a unrestricted version of the libavfilter shared
 + object that should only be used by Debian packages.
  
 -Package: libavcodec-dev
 -Section: libdevel
 +Package: libpostproc-extra-51
  Architecture: any
 -Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-extra-52 (>= ${source:Upstream-Version}),
 - libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
 - libavutil-dev (= ${binary:Version}),
 - ${misc:Depends}
 -Suggests: libfaad-dev,
 - libgsm1-dev,
 - libogg-dev,
 - libschroedinger-dev,
 - libspeex-dev,
 - libtheora-dev (>> 0.0.0.alpha4),
 - libvorbis-dev,
 - libx11-dev,
 - libxext-dev,
 - zlib1g-dev,
 - ${lib1394-dev}
 -Description: Development files for libavcodec
 - This is the codec library from Libav. 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
 -Section: libdevel
 -Architecture: any
 -Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-extra-52 (>= ${source:Upstream-Version}),
 - libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
 - libavformat-dev (= ${binary:Version}),
 +Depends: ${shlibs:Depends},
   ${misc:Depends}
 -Description: Development files for libavdevice
 - This is the device handling library from Libav.
 +Conflicts: libpostproc51
 +Replaces: libpostproc51
 +Description: Libav video postprocessing library
 + This is the video postprocessing library from the Libav project.
   .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavdevice.
 + This package contains a unrestricted version of the libpostproc shared
 + object that should only be used by Debian packages.
  
 -Package: libavformat-dev
 -Section: libdevel
 +Package: libavformat-extra-52
  Architecture: any
 -Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}),
 - libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
 - libavcodec-dev (= ${binary:Version}),
 +Depends: ${shlibs:Depends},
   ${misc:Depends}
 -Description: Development files for libavformat
 - This is the demuxer library from Libav. It supports most
 +Conflicts: libavformat52
 +Replaces: libavformat52
 +Breaks: libavcodec51, mplayer (<< 2:1.0~rc4~)
 +Description: Libav file format library
 + This is the demuxer library from the Libav 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.
 + This package contains a unrestricted version of the libavformat shared
 + object that should only be used by Debian packages.
  
 -Package: libavfilter-dev
 -Section: libdevel
 +Package: libswscale-extra-0
  Architecture: any
 -Depends: libavfilter1 (>= ${binary:Version}) | libavfilter-extra-1 (>= ${source:Upstream-Version}),
 - libavfilter1 (<= ${source:Upstream-Version}-99) | libavfilter-extra-1 (<= ${source:Upstream-Version}-99),
 - libavcodec-dev (= ${binary:Version}),
 - ${misc:Depends}
 -Description: Development files for libavfilter
 - This is the video filtering library from Libav.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libavfilter.
 -
 -Package: libpostproc-dev
 -Section: libdevel
 -Architecture: any
 -Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}),
 - libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
 - libavutil-dev (= ${binary:Version}),
 - ${misc:Depends}
 -Description: Development files for libpostproc
 - This is the video postprocessing library from Libav.
 - .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libpostproc.
 -
 -Package: libswscale-dev
 -Section: libdevel
 -Architecture: any
 -Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-0 (>= ${source:Upstream-Version}),
 - libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
 - libavutil-dev (= ${binary:Version}),
 +Depends: ${shlibs:Depends},
   ${misc:Depends}
 -Description: Development files for libswscale
 - This is the video scaling library from Libav.
 +Conflicts: libswscale0
 +Replaces: libswscale0
 +Description: Libav video scaling library
 + This is the video scaling library from the Libav project.
   .
 - This package contains the header files and static libraries needed to
 - compile applications or shared objects that use libswscale.
 + This package contains a unrestricted version of the libswscale shared
 + object that should only be used by Debian packages.
diff --combined debian/rules
index d1844c1,515e52b..3128ec1
--- a/debian/rules
+++ b/debian/rules
@@@ -27,6 -27,7 +27,7 @@@ include debian/confflag
  $(info FLAVORS = $(FLAVORS))
  $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
  $(info CFLAGS = $(CFLAGS))
+ $(info LDFLAGS = $(LDFLAGS))
  
  snapshot_version:
  	[ ! -r .svnrevision ] || \
@@@ -37,18 -38,18 +38,18 @@@ configure-%: configure-stamp-
  configure-stamp-%: $(QUILT_STAMPFN) snapshot_version
  	dh_testdir
  	mkdir -p debian-$*
- 	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
+ 	cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
  		$($*_build_confflags) $(extra_$*_build_confflags)
  	touch $@
  
  build-%: build-stamp-%
  build-stamp-%: configure-stamp-%
  	dh_testdir
- 	$(MAKE) -C debian-$* $(NUMJOBS)
+ 	$(MAKE) -C debian-$* $(NUMJOBS) V=1
  	touch $@
  
  debian-shared/tools/qt-faststart: build-stamp-shared
- 	$(MAKE) -C debian-shared tools/qt-faststart
+ 	$(MAKE) -C debian-shared tools/qt-faststart V=1
  
  build-doxy: build-doxy-stamp
  build-doxy-stamp: $(QUILT_STAMPFN)
@@@ -85,9 -86,19 +86,9 @@@ install: buil
  	dh_testdir
  	dh_testroot
  	dh_prep
 -	dh_installdirs -ptmp usr/src
 -	tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
 -		 --exclude 'debian*' --exclude .git --transform 's,^./,libav/,'
 -	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
 -	dh_installdirs -ptmp usr/share/doc/libav-doc/html
  	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 -	# don't fail on binary-indep only builds.
 -	[ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
 -	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 -	install -m 644 -D doc/ffserver.conf debian/tmp/etc/
 -	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 -	dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/ffmpeg \
 -		--fail-missing --sourcedir=debian/tmp
 +	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
 +		--warn-missing --sourcedir=debian/tmp
  
  formats.txt: install
  	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
@@@ -97,32 -108,37 +98,32 @@@ codecs.txt: instal
  	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
  	debian/tmp/usr/bin/ffmpeg -codecs | tee $@
  
 -binary-indep: build-doxy install
 +binary-indep: install
  
  binary-arch: build install codecs.txt formats.txt
  	dh_testdir
  	dh_testroot
  	dh_installdocs $(extradoc) doc/optimization.txt
  	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
  	dh_installdocs -A debian/README.Debian
 -	dh_installdocs -p libavcodec52 codecs.txt
 -	dh_installdocs -p libavformat52 formats.txt
 -	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 -	dh_installexamples -plibavcodec-dev libavcodec/api-example.c
 +	dh_installdocs -p libavcodec-extra-52 codecs.txt
 +	dh_installdocs -p libavformat-extra-52 formats.txt
  	dh_installchangelogs Changelog
  	dh_lintian
  	dh_link
  	dh_compress
  	dh_fixperms
 -	dh_strip --dbg-package=libav-dbg
 +	dh_strip
  
  # strict internal dependencies
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 -	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
 +	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
  	done
  	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
  	dh_shlibdeps
  # target dependencies for external packages
  	for pkg in $(LIB_PKGS); do \
 -	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 -	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
 +	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
  	done
  	dh_installdeb
  	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list