[SCM] libav/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 10 19:20:20 UTC 2012
update debian/changelog
libav-tools: add pre-depends on dpkg
update debian/changelog
Merge tag 'upstream/0.8.3' into ubuntu
Add #DEBHELPER# line to maintainer scripts.
debian/changelog: fix spelling error
update debian/changelog
Fix build for hurd. Thanks to Samuel Thibault for patch.
Don't ignore errors in maintainer scripts.
Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
add conflicts/replaces for ffmpeg transitional package
Add NEWS entry for ffmpeg deprecation.
Seperate the ffmpeg program into the transitional package.
confflags: use --enable-pic instead of manually messing with cflags
Don't override -g or -O3 flags set by libav's build system.
Set CPPFLAGS separately.
Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
Enable hardened build flags through dpkg-buildflags (Closes: #658929).
Enable jack support for all architectures.
Make clear that is FAAC that's considered non-free, not AAC.
Update comment about GPLv3 features.
Include conditional enablers for vo-aacenc and vo-amrwbenc.
Enable pulse support.
drop build-dep on libcv-dev and libopencv-dev
Enable opencv support.
Enable libcdio support.
Enable tls support through gnutls.
drop build-dep on frei0r-plugins-dev
Enable frei0r support.
Remove dependencies and suggests of FAAD, no longer needed.
bump standards version, no changes needed
Install manpage for qt-faststart in the correct package.
Imported Debian patch 4:0.8.1-0ubuntu2
Imported Debian patch 4:0.8.1-0ubuntu1
Imported Debian patch 4:0.8-1ubuntu2
Imported Debian patch 4:0.8-1ubuntu1
Imported Upstream version 0.8.3
Imported Upstream version 0.8.2
Imported Upstream version 0.8.1
.gitignore: minimize diff with debian
update debian/changelog
Merge branch 'master' into ubuntu
update debian/changelog
Bump shlibs for addition of GSM parser
provide compatibility links for ffserver, ffplay and ffprobe
Drop post-0.8b2 patches
prepare new upload
Merge commit 'upstream/0.8'
Imported Upstream version 0.8
debian/watch: fix mangling of '_' characters.
normalize fields with wrap-and-sort -as
update debian/changelog
Merge commit 'debian/4%0.8_beta2-3' into ubuntu
Remove the last remainders of explicit quilt usage in pre-3.0 source formats.
update debian/changelog
add additional post-0.8b2 patches
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libav
Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184).
update debian/changelog
drop unused lintian override in debian/control
place transitional packages in oldlibs/extra section to assist package managers
extend package description to include a note what libav actuall is
Bump shlibs for addition of new audio encoding API
Sync post v0.8b2 commits
Fix upgrade path from earlier versions of the 'ffmpeg' package
normalize fields with wrap-and-sort -s
start new upload
Properly set the library paths for multiarch and shared libs in debian/*.install instead of using brace expansion and asterisks.
update debian/changelog
Merge branch 'master' into ubuntu
update debian/changelog
Fix dependencies in libav-dbg package
Refresh patches
Drop patch from upstream to fix a segfault in libswscale, merged upstream
Merge commit 'upstream/0.8_beta2'
Imported Upstream version 0.8~beta2
Rename package libav to libav-tools
Disable configuration mismatch warnings
Apply a patch from upstream to fix a segfault in libswscale
update debian/changelog
debian/confflags: replace references to ffmpeg to libav
fix build failures by dropping unnecessary configure flags
rename the package 'ffmpeg' -> 'libav'
bump shlibs version
update debian/changelog
drop merged upstream patches
Merge commit 'upstream/0.8_beta1'
Imported Upstream version 0.8~beta1
update debian/changelog
Revert "Revert "Convert package to include multiarch support.""
Merge branch 'master' into ubuntu
update debian/changelog
forcefully disable v4l on kfreebsd
finalize upload
Bump shlibs for backported avcodec_open2() API
update version number
Merge commit 'upstream/0.7.3'
Imported Upstream version 0.7.3
Enable drawtext filter (Closes: #647132)
Prepare new upload
update debian/changelog
Merge 'origin/master' into ubuntu
update debian/changelog
Drop all post 0.7.1 patches
Merge commit 'upstream/0.7.2'
Imported Upstream version 0.7.2
update debian/changelog
Revert "Convert package to include multiarch support."
update debian/changelog
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080
Merge commit 'debian/4%0.7.1-7' into ubuntu
update debian/changelog
prefer libtiff4 over libtiff5 for now
drop debian/patches/03-fix-movrel.patch, better patch upstream
add additional 0.7 patches
Convert package to include multiarch support.
update debian/changelog
Fix segmentation fault on ppc32, Closes: #639948
sync patches with upstream release branch
upload to unstable
update debian/changelog
remove unnecessary conflicts in package libswscale2
Merge branch 'master' into ubuntu
update debian/changelog
libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
relax dependencies in the shlibs file to accomodate the new versioning scheme in libav-extra. Fixes LP: #818619
libpostproc: filter name needs to be double 0 terminated
make MAP_ANONYMOUS available on Linux and the Hurd
add post 0.7.1 patches
update debian/changelog
libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
finalize debian/changelog
Build against libmp3lame
use yasm on every architecture where possible
prepare new upload
update debian/changelog
relax dependencies in the shlibs file to accomodate the new versioning scheme in libav-extra. Fixes LP: #818619
update debian/changelog
Build against xvidcore to enable xvid encoding
Build against libx264. Closes: #418228, #440681
start new upload
update debian/changelog
minimize changes to debian
Merge branch 'master' into ubuntu
update debian/changelog
Fix installation of codecs.txt and formats.txt
update debian/changelog
Merge commit 'upstream/0.7.1'
Imported Upstream version 0.7.1
Revert "Add backported patches for 0.7.1"
Use proper architecture wildcards for Linux-only dependencies, Closes: #634460
disable jackd output support on the hurd
no longer generate 'snapshot_version'
Pass --arch to configure
Update to my @debian.org email.
update debian/changelog
Add backported patches for 0.7.1
libavformat-dev depends on libavutil-dev
update debian/changelog
Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452
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: 9a9ea9015b354ceaba2df8fd34a86df5384b932e
X-Git-Newrev: c20039dd45386b0cffa7241f87eb26d1e280ec4c
The following commit has been merged in the ubuntu.extra branch:
commit 0fd8fed33fb638ae8b6d0991e19e99f755c1abde
Merge: 9a9ea9015b354ceaba2df8fd34a86df5384b932e 39aa491ebdb09940a8d2076ba051da870ba6023e
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jun 10 20:58:53 2012 +0200
Merge branch 'ubuntu' into ubuntu.extra
Conflicts:
[too many to list]
diff --combined debian/changelog
index 84ba6aa,b022dec..da38ca3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,400 +1,428 @@@
+ libav (4:0.8.3-0ubuntu1) quantal; urgency=low
+
+ * New Upstream releases:
+ + version 0.8.3:
+ - Several bugs and crashes have been fixed in the following codecs: PNG,
+ Electronic Arts TQI, H.264 (CVE-2012-0851) and H.263 (CVE-2011-3937)
+ + version 0.8.2:
+ - Several bugs and crashes have been fixed in the following codecs: AAC,
+ APE, H.263, H.264, Indeo 4, Mimic, MJPEG, Motion Pixels Video, RAW,
+ TTA, VC1, VQA, WMA Voice, vqavideo (CVE-2012-0947).
+ - Several bugs and crashes have been fixed in the following formats:
+ ASF, ID3v2, MOV, xWMA
+ - This release additionally updates the following codecs to the
+ bytestream2 API, and therefore benefit from additional overflow
+ checks: truemotion2, utvideo, vqavideo
+ * libav-tools: add pre-depends on dpkg
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 20:24:59 +0200
+
+ libav (4:0.8.1-0ubuntu3) quantal; urgency=low
+
+ [ Andres Mejia ]
+ * Install manpage for qt-faststart in the correct package.
+
+ [ Reinhard Tartler ]
+ * bump standards version, no changes needed
+
+ [ Andres Mejia ]
+ * Remove dependencies and suggests of FAAD, no longer needed.
+ * Enable frei0r support.
+
+ [ Reinhard Tartler ]
+ * drop build-dep on frei0r-plugins-dev
+
+ [ Andres Mejia ]
+ * Enable tls support through gnutls.
+ * Enable libcdio support.
+ * Enable opencv support.
+
+ [ Reinhard Tartler ]
+ * drop build-dep on libcv-dev and libopencv-dev
+
+ [ Andres Mejia ]
+ * Enable pulse support.
+ * Include conditional enablers for vo-aacenc and vo-amrwbenc.
+ * Update comment about GPLv3 features.
+ * Make clear that is FAAC that's considered non-free, not AAC.
+ * Enable jack support for all architectures.
+
+ [ Fabian Greffrath ]
+ * Enable hardened build flags through dpkg-buildflags (Closes: #658929).
+ * Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
+ * Set CPPFLAGS separately.
+
+ [ Andres Mejia ]
+ * Don't override -g or -O3 flags set by libav's build system.
+
+ [ Reinhard Tartler ]
+ * confflags: use --enable-pic instead of manually messing with cflags
+
+ [ Andres Mejia ]
+ * Separate the ffmpeg program into the transitional package.
+ * Add NEWS entry for ffmpeg deprecation.
+
+ [ Reinhard Tartler ]
+ * add conflicts/replaces for ffmpeg transitional package
+
+ [ Andres Mejia ]
+ * Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
+ * Don't ignore errors in maintainer scripts.
+ * Fix build for hurd. Thanks to Samuel Thibault for patch.
+
+ [ Reinhard Tartler ]
+ * Cherry pick the mentioned changes above to the ubuntu branch
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 10 Jun 2012 11:59:00 +0200
+
+ libav (4:0.8.1-0ubuntu2) quantal; urgency=low
+
+ * Update warning to make clearer the deprecation of ffmpeg binary.
+ (LP: #939863)
+
+ -- Andres Mejia <amejia at debian.org> Sun, 13 May 2012 13:07:30 -0400
+
+ libav (4:0.8.1-0ubuntu1) precise; urgency=low
+
+ * New upstream bug and security fix release (FFe: LP: #960949)
+ - fixes the following CVEs:
+ CVE-2012-0848, CVE-2012-0853, CVE-2012-0858, CVE-2011-3929,
+ CVE-2011-3936, CVE-2011-3937, CVE-2011-3940, CVE-2011-3945,
+ CVE-2011-3947, CVE-2011-3951, CVE-2011-3952
+
+ * Pull fix from Debian git to fix installation of avserver.conf and
+ recordshow.sh into libav-tools; Thanks to Julien Cristau for spotting this!
+ - update debian/rules
+
+ -- Micah Gersten <micahg at ubuntu.com> Wed, 21 Mar 2012 21:18:24 -0500
+
+ libav (4:0.8-1ubuntu2) precise; urgency=low
+
+ * No-change rebuild to pick libvpx's new shlibs. (LP: #926580)
+
+ -- Alessio Treglia <quadrispro at ubuntu.com> Thu, 09 Feb 2012 08:50:07 +0100
+
+ libav (4:0.8-1ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 24 Jan 2012 07:41:33 +0100
+
+ libav (4:0.8-1) unstable; urgency=medium
+
+ [ Fabian Greffrath ]
+ * Remove the last remainders of explicit quilt usage in
+ pre-3.0 source formats.
+ * Urgency bumped to medium because of RC bugs and unfixed security
+ issues in testing.
+ * Imported Upstream version 0.8
+ - Bug fix: "Segfaults when using vaapi", thanks to Andrey Rahmatullin
+ (Closes: #656572). That crash is most likely caused by auto-enabling
+ multi-threading. This behavior got reverted just before this release.
+ * Drop post-0.8b2 patches
+ * Bump shlibs for addition of new audio encoding API
+ * Extend package descriptions to include a note what libav actually is
+ * debian/watch: fix mangling of '_' characters.
+ * drop unused lintian override in debian/control
+ * provide compatibility links for ffserver, ffplay and ffprobe
+ (Closes: #655683)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 22 Jan 2012 21:24:22 +0100
+
+ libav (4:0.8~beta2-3ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Jan 2012 09:34:37 +0100
+
+ libav (4:0.8~beta2-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Fix debian/*.install file generation on archs (e.g. armel) that build
+ more than only one optimized shared library (Closes: #656184).
+
+ [ Reinhard Tartler ]
+ * add additional post-0.8b2 patches
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 17 Jan 2012 22:31:32 +0100
+
+ libav (4:0.8~beta2-2) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Properly set the library paths for multiarch and shared libs in
+ debian/*.install instead of using brace expansion and asterisks.
+
+ [ Reinhard Tartler ]
+ * Fix upgrade path from earlier versions of the 'ffmpeg' package
+ (Closes: #655917)
+ * Sync post v0.8b2 commits
+ * extend package description to include a note what libav actuall is
+ * place transitional packages in oldlibs/extra section to assist package
+ managers
+ * drop unused lintian override in debian/control
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 15 Jan 2012 16:19:41 +0100
+
+ libav (4:0.8~beta2-1ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 12 Jan 2012 22:30:00 +0100
+
+ libav (4:0.8~beta2-1) unstable; urgency=low
+
+ * New Upstream version 0.8~beta2:
+ - Confirm that this release does not inhibit the following security issues:
+ - DoS in MKV demuxer,
+ - CVE-2011-3893, Closes: #654572
+ - Double free vuln in the Theora decoder,
+ - CVE-2011-3892, Closes: #654571
+ - heap-based buffer overflow in vorbis decoder:
+ - CVE-2011-3895, Closes: #654573
+ - Closes: #654534
+ - Bug fix: "libswscale crashes when upscaling pictures using
+ hyscale_fast2, MMX variant on amd64 with gcc-4.6 and later",
+ thanks to Harald Dunkel (Closes: #647824).
+ - Clarify that libavutil/avutil.h doesn't include mathematics.h any more in
+ APIchanges documentation. Thanks: Jonathan Nieder <jrnieder at gmail.com>,
+ Closes: #654303
+ * Disable configuration mismatch warnings (Closes: #619530)
+ * Rename package libav to libav-tools (Closes: #654984)
+ * Refresh patches
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 11 Jan 2012 16:45:28 +0100
+
+ libav (4:0.8~beta1-2) experimental; urgency=low
+
+ * fix build failures by dropping unnecessary configure flags
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Jan 2012 08:48:06 +0100
+
+ libav (4:0.8~beta1-1) experimental; urgency=low
+
+ * New upstream release.
+ - too many changes to list, please refer to upstream's Changelog file
+ for details
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 30 Dec 2011 23:45:34 +0100
+
+ libav (4:0.7.3-2ubuntu1) precise; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libdirac, lame, libopenjpeg, librtmp,
+ x264, and xvid (all in universe)
+ * Install libraries in multi-arch directories.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Dec 2011 11:58:50 +0100
+
+ libav (4:0.7.3-2) unstable; urgency=low
+
+ * forcefully disable v4l on kfreebsd, fixes an FTBFS on kFreeBSD
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Dec 2011 10:50:36 +0100
+
+ libav (4:0.7.3-1) unstable; urgency=high
+
+ * New upstream version. Includes fixes for:
+ - VP3 decoder (CVE-2011-4352)
+ - svq1 decoder (CVE-2011-4579)
+ - DoS in the VP5/VP6 decoders (CVE-2011-4353)
+ - QDM2 decoder (CVE-2011-4351)
+ - Sierra VMD decoder (CVE-2011-4364)
+ * Bumped urgency.
+ * Enable drawtext filter (Closes: #647132)
+ * Imported Upstream version 0.7.3
+ * Bump shlibs for backported avcodec_open2() API
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 25 Dec 2011 22:04:54 +0100
+
+ libav (4:0.7.2-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian, remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ - not installing into multiarch directories
+ * This new upstream release has basically merged in all 70 patches that
+ are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
+ focused ones.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 01 Oct 2011 00:22:07 +0200
+
+ libav (4:0.7.2-1) unstable; urgency=low
+
+ * New upstream release: 0.7.2
+ - Security focused release
+ - Includes Matroska reallocation checks, Closes: #643859
+ * Drop all post 0.7.1 patches, included upstream.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 30 Sep 2011 21:01:25 +0200
+
+ libav (4:0.7.1-7ubuntu2) oneiric; urgency=low
+
+ * Revert "Convert package to include multiarch support."
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 28 Sep 2011 09:18:34 +0200
+
+ libav (4:0.7.1-7ubuntu1) oneiric; urgency=medium
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ - Introduces Security fix for CVE-2011-3362
+ - Fixes LP: #835903
+ * post-0.7.1/0070-Fix-memory-re-allocation-in-matroskadec.c-related-to.patch:
+ - fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 27 Sep 2011 22:05:55 +0200
+
+ libav (4:0.7.1-7) unstable; urgency=medium
+
+ * Add 63 (!) additional post 0.7.1 patches
+ - all scheduled for next upstream point release
+ - Fix missing CAVS boundary checks, Closes: #641478, Fixes: CVE-2011-3362
+ * Medium urgency for fixing a security issue
+ * Drop debian/patches/03-fix-movrel.patch, better patch upstream
+ * prefer libtiff4 over libtiff5 for now
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 26 Sep 2011 22:24:47 +0200
+
+ libav (4:0.7.1-6) unstable; urgency=low
+
+ * Convert package to include multiarch support.
+
+ -- Andres Mejia <amejia at debian.org> Fri, 23 Sep 2011 22:03:39 -0400
+
+ libav (4:0.7.1-5) unstable; urgency=low
+
+ * sync patches with upstream release branch
+ * Fix segmentation fault on ppc32, Closes: #639948
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 05 Sep 2011 07:25:06 +0200
+
+ libav (4:0.7.1-4) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 01 Sep 2011 22:45:43 +0200
+
+ libav (4:0.7.1-3ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ * Drop extra conflicts on libswscale-extra-1
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 26 Aug 2011 11:12:43 +0200
+
+ libav (4:0.7.1-3) experimental; urgency=low
+
+ * add post 0.7.1 patches
+ * make MAP_ANONYMOUS available on Linux and the Hurd, Closes: #637516
+ * libpostproc: filter name needs to be double 0 terminated
+ * relax dependencies in the shlibs file to accomodate
+ the new versioning scheme in libav-extra. Fixes LP: #818619
+ * libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 25 Aug 2011 22:45:47 +0200
+
+ libav (4:0.7.1-2) experimental; urgency=low
+
+ * Build against libx264. Closes: #418228, #440681
+ * Build against libmp3lame, Closes: #587904
+ * Build against xvidcore to enable xvid encoding
+ * use yasm on every architecture. Should allow building on the Hurd
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 26 Jul 2011 21:58:18 +0200
+
+ libav (4:0.7.1-1ubuntu3) oneiric; urgency=low
+
+ * libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 20 Aug 2011 19:29:21 +0200
+
+ libav (4:0.7.1-1ubuntu2) oneiric; urgency=low
+
+ * relax dependencies in the shlibs file to accomodate the new versioning
+ scheme in libav-extra. Fixes LP: #818619
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 01 Aug 2011 13:16:59 +0200
+
+ libav (4:0.7.1-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 21 Jul 2011 21:12:27 +0200
+
+ libav (4:0.7.1-1) experimental; urgency=low
+
+ [ Andres Mejia ]
+ * Update to my @debian.org email.
+
+ [ Reinhard Tartler ]
+ * Pass --arch to configure
+ * no longer generate 'snapshot_version'
+ * disable jackd output support on the hurd
+ * Use proper architecture wildcards for Linux-only dependencies,
+ Closes: #634460
+ * Drop "backported patches"
+ * Imported Upstream version 0.7.1
+ * Fix installation of codecs.txt and formats.txt
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 21 Jul 2011 12:18:48 +0200
+
+ libav (4:0.7-2) experimental; urgency=low
+
+ [ Arnout Engelen ]
+ * libavformat-dev depends on libavutil-dev
+
+ [ Reinhard Tartler ]
+ * Add backported patches for 0.7.1
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jul 2011 14:38:21 +0200
+
+ libav (4:0.7-1ubuntu2) oneiric; urgency=low
+
+ * Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jul 2011 15:29:06 +0200
+
+libav-extra (4:0.7-1ubuntu5) oneiric; urgency=low
+
+ * Cleanup after LP #802116, fixes LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 01 Jul 2011 21:58:13 +0200
+
+libav-extra (4:0.7-1ubuntu4) oneiric; urgency=low
+
+ * complete renaming of libswscale-extra-1 to libswscale-extra-2 package,
+ fixes FTBFS.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 27 Jun 2011 09:19:07 +0200
+
+libav-extra (4:0.7-1ubuntu3) oneiric; urgency=low
+
+ * Rename libswscale-extra-1 to libswscale-extra-2 to follow
+ forgotten SONAME change. LP: #802116
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 27 Jun 2011 08:33:38 +0200
+
+libav-extra (4:0.7-1ubuntu2) oneiric; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+ * Tighten build dependency on libav-source
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 22 Jun 2011 10:51:30 +0200
+
libav (4:0.7-1ubuntu1) oneiric; urgency=low
* Merge from debian. Remaining changes:
@@@ -46,13 -415,6 +443,13 @@@ libav (4:0.7-1) experimental; urgency=l
-- Reinhard Tartler <siretart at tauware.de> Tue, 21 Jun 2011 07:49:59 +0200
+libav-extra (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jun 2011 17:10:08 +0200
+
libav (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
* Merge from debian. Remaining changes:
@@@ -137,19 -499,6 +534,19 @@@ libav (4:0.7~b1-1) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Tue, 19 Apr 2011 15:04:55 +0200
+libav-extra (4:0.6.2-1ubuntu2) natty; urgency=low
+
+ * fix path to powerpc extradoc
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 24 Mar 2011 15:42:35 +0100
+
+libav-extra (4:0.6.2-1ubuntu1) natty; urgency=low
+
+ * rename to libav-extra
+ * remove all sources from branch and rely on libav-source package instead
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 10:48:16 +0100
+
libav (4:0.6.2-1ubuntu1) natty; urgency=low
* Merge from debian. Remaining changes:
@@@ -161,14 -510,6 +558,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 12:09:31 +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 ]
@@@ -254,13 -595,6 +651,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:
@@@ -279,26 -613,6 +676,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
@@@ -329,20 -643,6 +726,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:
@@@ -376,13 -676,6 +773,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:
@@@ -411,40 -704,6 +808,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:
@@@ -547,26 -806,6 +944,26 @@@ ffmpeg (4:0.5.1-2) unstable; urgency=lo
-- 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:
@@@ -605,33 -844,15 +1002,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:
@@@ -735,12 -956,6 +1132,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)
@@@ -755,27 -970,14 +1152,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.
@@@ -785,19 -987,7 +1182,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
@@@ -926,15 -1116,6 +1323,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:
@@@ -1140,24 -1321,6 +1537,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:
@@@ -1215,21 -1378,6 +1612,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
@@@ -1267,16 -1415,6 +1664,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/control
index 869b5e8,df39571..df59ede
--- a/debian/control
+++ b/debian/control
@@@ -1,138 -1,424 +1,162 @@@
-Source: libav
+Source: libav-extra
Section: libs
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Loic Minier <lool at dooz.org>,
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian+debian at greffrath.com>,
- Andres Mejia <mcitadel at gmail.com>,
+ Andres Mejia <amejia at debian.org>,
Jonas Smedegaard <dr at jones.dk>
DM-Upload-Allowed: yes
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
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-Indep:
- doxygen
-Build-Depends:
- debhelper (>= 8.1.3~),
- libasound2-dev [linux-any],
+Build-Depends: debhelper (>= 7),
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libav-source (>= 4:0.7-1ubuntu1),
++ libav-source (>= 4:0.8.3-0ubuntu1),
libbz2-dev,
- libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libcdio-cdda-dev,
+ libcdio-dev,
+ libcdio-paranoia-dev,
++ libcv-dev,
+ libdc1394-22-dev [linux-any],
+ libdirac-dev,
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
+ libgnutls-dev,
libgsm1-dev,
libimlib2-dev,
+ libjack-dev,
+ libmp3lame-dev,
++ libopencore-amrnb-dev,
++ libopencore-amrwb-dev,
++ libopencv-dev,
+ libopenjpeg-dev,
- libjack-dev,
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libpulse-dev,
+ libraw1394-dev [linux-any],
+ librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
- libva-dev [!hurd-i386],
+ libtiff4-dev | libtiff-dev,
+ libva-dev [!hurd-any],
libvdpau-dev,
libvorbis-dev,
libvpx-dev,
libx11-dev,
- libx264-dev (>> 1:0.svn20100213+gitfcf70c),
++ libx264-dev,
libxext-dev,
libxfixes-dev,
+ libxvidcore-dev | libxvidcore4-dev,
libxvmc-dev,
texi2html,
- yasm [amd64 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 sparc powerpc],
+ yasm,
zlib1g-dev
-Package: libav-tools
-Section: video
+Package: libavutil-extra-51
Architecture: any
-Provides:
- ffmpeg
-Replaces:
- ffmpeg (<< 4:0.8~),
- libavcodec-extra-53 (<< 4:0.6~),
- libavcodec53 (<< ${source:Version})
-Pre-Depends:
- dpkg (>= 1.15.7.2~)
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- ffmpeg (<< 4:0.8~)
-Conflicts:
- ffprobe
-Description: Multimedia player, server, encoder and transcoder
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the avplay multimedia player, the avserver
- streaming server, the avconv audio and video encoder, and the avprobe
- stream analyzer. They support most existing file formats (AVI, MPEG,
- OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
- DV...).
-
-Package: ffmpeg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Conflicts:
- libav-tools (<< 4:0.8.1-0ubuntu3)
-Replaces:
- libav-tools (<< 4:0.8.1-0ubuntu3)
-Depends:
- libav-tools,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Multimedia player, server, encoder and transcoder (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the deprecated ffmpeg program. This package also serves
- as a transitional package to libav-tools. Users are advised to use avconv from
- the libav-tools package instead of ffmpeg.
-
-Package: ffmpeg-dbg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends:
- libav-dbg,
- ${misc:Depends}
-Description: Debug symbols for Libav related packages (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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 contains the debug symbols for the deprecated ffmpeg program.
- It also serves as a transitional package to libav-tools-dbg.
-
-Package: libav-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Provides:
- ffmpeg-dbg
-Replaces:
- ffmpeg-dbg (<< 5:0.8.1-3)
-Breaks:
- ffmpeg-dbg (<< 5:0.8.1-3)
-Depends:
- libav-tools (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}),
- libavdevice53 (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
- libavutil51 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debug symbols for Libav related packages
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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
-Depends:
- ${misc:Depends}
-Description: Patched Libav sources
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libav-doc,
- ${misc:Depends}
-Description: Documentation of the Libav API (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package contains the html doxygen documentation of the Libav API.
- .
- Only application developers will find this package useful.
-
-Package: libavutil51
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: libavutil51
+Replaces: libavutil51
Description: Libav utility library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ This is the common utility library from the Libav project. It is required
+ by all other Libav libraries.
.
- This is the common utility library from Libav. It contains shared code
- used 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: libavcodec53
+Package: libavcodec-extra-53
Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
- Suggests: libfaad0
+Conflicts: libavcodec53
+Replaces: libavcodec53
Description: Libav codec library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
+ 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...).
.
- This package contains a unrestricted version of the libavcodec shared
- object that should only be used by Debian packages.
+ This is the codec library from Libav (both encoding and decoding).
+ .
- It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
-
-Package: libavdevice53
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Libav device handling library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the device handling library from Libav.
-
-Package: libavformat53
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Libav file format library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
++ This package is an enhancement to the regular libavcodec library package.
++ This package contains the following additional codecs.
+ .
- This is the library for handling file formats from Libav.
++ * OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
++ * OpenCORE Adaptive Multi-Rate (AMR) Wide-Band (Decoder)
++ * Android VisualOn AAC (Encoder)
++ * Android VisualOn Adaptive Multi-Rate (AMR) Wide-Band (Encoder)
++ * OpenCV filtering
++ * Dirac decoding support via libdirac
++ * MP3 encoding with liblame
++ * H.264 encoding via libx264
++ * MPEG4 Part 2 encoding via libxvidcore
+ .
- It supports most existing file formats (AVI, MPEG, OGG, Matroska,
- ASF...).
++ Because this package links against libraries that are licensed
++ under Apache License 2.0, the resulting binaries are distributed under the
++ GPL version 3.
-Package: libavfilter2
+Package: libavdevice-extra-53
Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Libav video filtering library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video filtering library from Libav.
-
-Package: libpostproc52
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Libav video postprocessing library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video postprocessing library from Libav.
-
-Package: libswscale2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Libav video scaling library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video software scaling library from Libav.
-
-Package: libavutil-dev
-Section: libdevel
-Architecture: any
-Depends:
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
- libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavutil
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the common utility library from Libav.
+Conflicts: libavdevice53
+Replaces: libavdevice53
+Description: Libav device handling library
+ This is the device handling library from the Libav project.
.
- 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 libavdevice shared
+ object that should only be used by Debian packages.
-Package: libavcodec-dev
-Section: libdevel
+Package: libavfilter-extra-2
Architecture: any
-Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Suggests:
- 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
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the codec library from Libav. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+Conflicts: libavfilter2
+Replaces: libavfilter2
+Description: Libav video postprocessing library
+ 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 libavcodec.
+ This package contains a unrestricted version of the libavfilter shared
+ object that should only be used by Debian packages.
-Package: libavdevice-dev
-Section: libdevel
+Package: libpostproc-extra-52
Architecture: any
-Depends:
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
- libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
- libavformat-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavdevice
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the device handling library from Libav.
+Conflicts: libpostproc52
+Replaces: libpostproc52
+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-53
Architecture: any
-Depends:
- libavcodec-dev (= ${binary:Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
- libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavformat
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the demuxer library from Libav. It supports most
+Conflicts: libavformat53
+Replaces: libavformat53
+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-2
Architecture: any
-Depends:
- libavcodec-dev (= ${binary:Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
- libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavfilter
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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:
- libavutil-dev (= ${binary:Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
- libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
- ${misc:Depends}
-Description: Development files for libpostproc
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- 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:
- libavutil-dev (= ${binary:Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
- libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
- ${misc:Depends}
-Description: Development files for libswscale
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video scaling library from Libav.
+Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
+Replaces: libswscale-extra-1 (>> 4:0.7~), libswscale2
+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/libavcodec-extra-53.install.in
index 0000000,7c69bb0..7c69bb0
mode 000000,100644..100644
--- a/debian/libavcodec-extra-53.install.in
+++ b/debian/libavcodec-extra-53.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavcodec.so.*
diff --combined debian/libavdevice-extra-53.install.in
index 0000000,e942547..e942547
mode 000000,100644..100644
--- a/debian/libavdevice-extra-53.install.in
+++ b/debian/libavdevice-extra-53.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavdevice.so.*
diff --combined debian/libavfilter-extra-2.install.in
index 0000000,4e4157c..4e4157c
mode 000000,100644..100644
--- a/debian/libavfilter-extra-2.install.in
+++ b/debian/libavfilter-extra-2.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavfilter.so.*
diff --combined debian/libavformat-extra-53.install.in
index 0000000,660f3a5..660f3a5
mode 000000,100644..100644
--- a/debian/libavformat-extra-53.install.in
+++ b/debian/libavformat-extra-53.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavformat.so.*
diff --combined debian/libavutil-extra-51.install.in
index 0000000,3dc6cc2..3dc6cc2
mode 000000,100644..100644
--- a/debian/libavutil-extra-51.install.in
+++ b/debian/libavutil-extra-51.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavutil.so.*
diff --combined debian/libpostproc-extra-52.install.in
index 0000000,5c4aee3..5c4aee3
mode 000000,100644..100644
--- a/debian/libpostproc-extra-52.install.in
+++ b/debian/libpostproc-extra-52.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libpostproc.so.*
diff --combined debian/libswscale-extra-2.install.in
index 0000000,2ac5f14..2ac5f14
mode 000000,100644..100644
--- a/debian/libswscale-extra-2.install.in
+++ b/debian/libswscale-extra-2.install.in
@@@ -1,0 -1,1 +1,1 @@@
+ usr/lib/@DEB_HOST_MULTIARCH_OPT@/libswscale.so.*
diff --combined debian/rules
index 5b4c5bc,cbf607b..fc32f02
--- a/debian/rules
+++ b/debian/rules
@@@ -4,9 -4,10 +4,10 @@@ EPOCH=4
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
- SHLIBS_VERSION := 4:0.7-1
+ SHLIBS_VERSION := 4:0.8-1~
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ DEV_PKGS := $(shell echo $(LIB_PKGS) | sed 's/[0-9]\+\>/-dev/g')
# Support multiple makes at once
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@@ -21,25 -22,30 +22,33 @@@ endi
endif
include debian/confflags
+ OPT_FLAVORS := $(filter-out static shared, $(FLAVORS))
$(info FLAVORS = $(FLAVORS))
$(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
$(info CFLAGS = $(CFLAGS))
+ $(info CPPFLAGS = $(CPPFLAGS))
$(info LDFLAGS = $(LDFLAGS))
- snapshot_version:
- [ ! -r .svnrevision ] || \
- cp .svnrevision $@
- touch $@
+ define dh_install_file_opt_flavor
+ grep @DEB_HOST_MULTIARCH_OPT@ < $(1).in | \
+ sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(2)_shlibdir):g' >> $(1)
+
+ endef
+
+ DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+ $(DH_INSTALL_FILES):
+ sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
+ $(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
+libav/configure:
+ tar xvf /usr/src/libav-source.tar.gz
+
configure-%: configure-stamp-%
-configure-stamp-%:
+configure-stamp-%: snapshot_version libav/configure
dh_testdir
mkdir -p debian-$*
- cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
- cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
++ cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
$($*_build_confflags) $(extra_$*_build_confflags)
touch $@
@@@ -67,8 -73,8 +76,8 @@@ clean
rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
$(addprefix configure-stamp-, $(FLAVORS)) \
build-doxy-stamp
- rm -rf $(addprefix debian-, $(FLAVORS)) doxy
+ rm -rf $(addprefix debian-, $(FLAVORS)) doxy libav
- dh_clean
+ dh_clean $(DH_INSTALL_FILES)
get-orig-source:
dh_testdir
@@@ -81,48 -87,70 +90,48 @@@ define install_flavo
endef
- install: build
+ install: build $(DH_INSTALL_FILES)
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 --exclude .pc --exclude '*-stamp' \
- --transform 's,^./,libav/,'
- dh_installdirs -ptmp usr/share/doc/libav/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/libav/html/
- install -m 644 -D doc/avserver.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/libav \
- -Xusr/share/man/man1/ffmpeg.1 -Nffmpeg \
- --fail-missing --sourcedir=debian/tmp
- dh_install -pffmpeg --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" \
- debian/tmp/usr/bin/ffmpeg -formats | tee $@
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ debian/tmp/usr/bin/avconv -formats | tee $@
codecs.txt: install
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
- debian/tmp/usr/bin/ffmpeg -codecs | tee $@
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ debian/tmp/usr/bin/avconv -codecs | tee $@
-binary-indep: build-doxy install
+binary-indep: install
binary-arch: build install codecs.txt formats.txt
dh_testdir
dh_testroot
- dh_installman -plibav-tools debian/qt-faststart.1
- dh_installdocs doc/optimization.txt
+ dh_installdocs $(extradoc) libav/doc/optimization.txt
+ dh_installdocs -A libav/CREDITS libav/doc/TODO
dh_installdocs -A debian/README.Debian
- dh_installdocs -p libavcodec-extra-52 codecs.txt
- dh_installdocs -p libavformat-extra-52 formats.txt
- dh_installdocs -p libavcodec53 codecs.txt
- dh_installdocs -p libavformat53 formats.txt
- dh_installdocs -p libavcodec-dev -plibavdevice-dev \
- -plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
- -plibswscale-dev -plibavutil-dev -plibav-doc \
- doc/APIchanges
- dh_installexamples -p libav-tools doc/avserver.conf debian/recordshow.sh
- dh_installexamples -p libavcodec-dev libavcodec/api-example.c
- dh_installchangelogs Changelog
++ dh_installdocs -p libavcodec-extra-53 codecs.txt
++ dh_installdocs -p libavformat-extra-53 formats.txt
+ dh_installchangelogs libav/Changelog
dh_lintian
dh_link
dh_compress
dh_fixperms
- dh_strip -Nffmpeg --dbg-package=libav-dbg
- dh_strip -pffmpeg --dbg-package=ffmpeg-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" \
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
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