[SCM] libav/experimental: Merge remote-tracking branch 'origin/master' into experimental
ricotz-guest at users.alioth.debian.org
ricotz-guest at users.alioth.debian.org
Tue May 15 08:16:21 UTC 2012
cleanup generated formats*.txt and codec*.txt
Simplify internal dependencies
add comments about the various PKGS variables
Revert "temporarily disable opencv to work around dependency troubles"
prepare new upload
break long line
bump urgency
update debian/changelog
Revert "Revert "temporarily disable opencv to work around dependency troubles""
drop 02-fix-avpreset-extension.patch, applied upstream
Merge tag 'upstream/0.8.2'
Imported Upstream version 0.8.2
Don't ignore errors in maintainer scripts.
Update changelog.
Revert "temporarily disable opencv to work around dependency troubles"
Update changelog.
Add #DEBHELPER# line to maintainer scripts.
Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
Add closes bug for other issue related to hurd build.
Update changelog.
Fix build for hurd. Thanks to Samuel Thibault for patch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: c42be7453b998e1a82ed474481bbed2ae64a8600
X-Git-Newrev: f98a4d5ddaabe546c2501619c9b1c28cb374ce39
The following commit has been merged in the experimental branch:
commit f98a4d5ddaabe546c2501619c9b1c28cb374ce39
Merge: c42be7453b998e1a82ed474481bbed2ae64a8600 47ef7472a2661cf030a855a7864859a430382d6f
Author: Rico Tzschichholz <ricotz at t-online.de>
Date: Tue May 15 10:15:52 2012 +0200
Merge remote-tracking branch 'origin/master' into experimental
Conflicts:
Changelog
RELEASE
VERSION
debian/changelog
debian/rules
libavcodec/bytestream.h
libavcodec/h264.c
libavcodec/lzw.c
libavcodec/mpegvideo.c
libavcodec/tta.c
libavcodec/utvideo.c
libavcodec/vqavideo.c
diff --combined debian/changelog
index 8a53a74,84a2e8a..fb38bf4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,37 +1,62 @@@
+libav (6:0.8.99-1537-gacb2c79-2) experimental; urgency=low
+
+ [ Rico Tzschichholz ]
+ * Fix lintian-overrides after soname bump
+ * Fix some conflicts/replaces
+ * Bump shlibs version
+
+ [ Reinhard Tartler ]
+ * Update changelog
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 15 May 2012 09:21:24 +0200
+
+libav (6:0.8.99-1537-gacb2c79-1) experimental; urgency=low
+
+ * New upstream snapshot
+ - Drop patches applied upstream
+ - Longer build libpostproc, dropped upstream
+ - follow soname bump of libavcodec and libavformat 53->54
+ - New library: libswresample
+ * no longer build and use dirac, removed upstream in favor of libschroedinger
+ * remove deprecated ffmpeg package
+ * bump shlibs version
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 12 May 2012 22:02:03 +0200
+
+ libav (6:0.8.2-2) unstable; urgency=low
+
+ *
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 14 May 2012 21:37:59 +0200
+
+ libav (6:0.8.2-1) unstable; urgency=medium
+
+ * New upstream release:
+ - 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
+ * drop 02-fix-avpreset-extension.patch, applied upstream
+ * Revert "Revert "temporarily disable opencv to work around dependency
+ troubles"" (Closes: #671302)
+ * Bumped urgency because of security issue.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 05 May 2012 11:08:44 +0200
+
+ libav (6:0.8.1-7) unstable; urgency=low
+
+ * Fix build for hurd. Thanks to Samuel Thibault for patch. (Closes: #613034)
+ (Closes: #671038)
+ * Properly migrate /etc/ffserver.conf to /etc/avserver.conf.
+ (Closes: #660786)
+ * Renable opencv support.
+
+ -- Andres Mejia <amejia at debian.org> Tue, 01 May 2012 21:33:13 -0400
+
libav (6:0.8.1-6) unstable; urgency=low
* Fix epoch in strict internal dependencies. Closes: #670861
diff --combined debian/confflags
index 9d4705d,6c78316..071ec99
--- a/debian/confflags
+++ b/debian/confflags
@@@ -88,6 -88,7 +88,6 @@@ 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
@@@ -96,7 -97,6 +96,6 @@@ confflags += --extra-version='$(DEB_VER
confflags += --arch='$(DEB_HOST_ARCH_CPU)'
confflags += --prefix=/usr
confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
- confflags += --enable-vaapi
confflags += --enable-vdpau
confflags += --enable-bzlib
confflags += --enable-frei0r
@@@ -113,6 -113,7 +112,7 @@@ confflags += --enable-zli
confflags += --enable-libvpx
confflags += --enable-runtime-cpudetect
confflags += --enable-libfreetype
+ confflags += --enable-libpulse
ifeq ($(DEB_HOST_ARCH),armel)
# this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
# plenty of incompatible assembly; not sure how to detect that properly
@@@ -125,10 -126,11 +125,10 @@@ endi
confflags += $(extra_common_confflags)
- # pulse is not available on the hurd
- confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
+ # libva is not available on the hurd
+ confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
# this part below is intended for the 'Libav' 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/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)
diff --combined debian/control
index df15e6e,7157b9e..760df6b
--- a/debian/control
+++ b/debian/control
@@@ -26,6 -26,7 +26,6 @@@ Build-Depends
libcdio-paranoia-dev,
libcv-dev,
libdc1394-22-dev [linux-any],
- libdirac-dev,
libfreetype6-dev,
libgnutls-dev,
libgsm1-dev,
@@@ -36,7 -37,7 +36,7 @@@
libopencore-amrwb-dev,
libopencv-dev,
libopenjpeg-dev,
- libpulse-dev [!hurd-any],
+ libpulse-dev,
libraw1394-dev [linux-any],
librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
@@@ -44,7 -45,7 +44,7 @@@
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libtiff4-dev | libtiff-dev,
- libva-dev,
+ libva-dev [!hurd-any],
libvdpau-dev,
libvo-aacenc-dev,
libvo-amrwbenc-dev,
@@@ -63,12 -64,17 +63,12 @@@
Package: libav-tools
Section: video
Architecture: any
-Provides:
- ffmpeg
Replaces:
- ffmpeg (<< 4:0.8~),
libavcodec-extra-53 (<< 4:0.6~),
libavcodec53 (<< ${source:Version})
Depends:
${misc:Depends},
${shlibs:Depends}
-Breaks:
- ffmpeg (<< 4:0.8~)
Conflicts:
ffprobe
Description: Multimedia player, server, encoder and transcoder
@@@ -81,6 -87,41 +81,6 @@@
OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
DV...).
-Package: ffmpeg
-Section: oldlibs
-Priority: extra
-Architecture: any
-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
@@@ -94,8 -135,9 +94,8 @@@ Breaks
Depends:
libav-tools (= ${binary:Version}),
libavdevice53 (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
+ libavformat54 (= ${binary:Version}),
libavutil51 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
@@@ -112,7 -154,7 +112,7 @@@ Section: debu
Priority: extra
Architecture: any
Depends:
- libavcodec53 (= ${binary:Version}),
+ libavcodec54 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -128,7 -170,7 +128,7 @@@ Section: debu
Priority: extra
Architecture: any
Depends:
- libavcodec-extra-53 (= ${binary:Version}),
+ libavcodec-extra-54 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -139,6 -181,24 +139,6 @@@
Most people will not need this package. Please install it to produce useful
stacktraces to help debugging the Libav library.
-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
@@@ -176,7 -236,7 +176,7 @@@ Description: Libav utility librar
This is the common utility library from Libav. It contains shared code
used by all other Libav libraries.
-Package: libavcodec53
+Package: libavcodec54
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@@ -184,9 -244,9 +184,9 @@@ Depends
${misc:Depends},
${shlibs:Depends}
Conflicts:
- libavcodec-extra-53
-Breaks:
- libavcodec-extra-53 (<< 4:0.8.0.2)
+ libavcodec-extra-54
+Replaces:
+ libavcodec-extra-54
Description: Libav codec library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -214,7 -274,7 +214,7 @@@ Description: Libav device handling libr
.
This is the device handling library from Libav.
-Package: libavformat53
+Package: libavformat54
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@@ -222,11 -282,11 +222,11 @@@ Depends
${misc:Depends},
${shlibs:Depends}
Provides:
- libavformat-extra-53
+ libavformat-extra-54
Replaces:
- libavformat-extra-53
+ libavformat-extra-54
Breaks:
- libavformat-extra-53 (<< 5:0.8.1-2)
+ libavformat-extra-54 (<< 5:0.8.1-2)
Description: Libav file format library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -255,6 -315,25 +255,6 @@@ Description: Libav video filtering libr
.
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}
-Provides:
- libpostproc-extra-52
-Replaces:
- libpostproc-extra-52
-Breaks:
- libpostproc-extra-52 (<< 5:0.8.1-2)
-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
@@@ -293,8 -372,8 +293,8 @@@ Package: libavcodec-de
Section: libdevel
Architecture: any
Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
+ libavcodec54 (<= ${source:Upstream-Version}-99) | libavcodec-extra-54 (<= ${source:Upstream-Version}-99),
+ libavcodec54 (>= ${binary:Version}) | libavcodec-extra-54 (>= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests:
@@@ -339,7 -418,7 +339,7 @@@ Section: libdeve
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
+ libavformat54 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@@ -368,50 -447,37 +368,50 @@@ Description: Development files for liba
This package contains the header files and static libraries needed to
compile applications or shared objects that use libavfilter.
-Package: libpostproc-dev
+Package: libswscale-dev
Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
+ libswscale2 (= ${binary:Version}),
${misc:Depends}
-Description: Development files for libpostproc
+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 postprocessing library from Libav.
+ This is the video scaling library from Libav.
.
This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
+ compile applications or shared objects that use libswscale.
-Package: libswscale-dev
+Package: libavresample-dev
Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
+ libavresample0 (= ${binary:Version}),
${misc:Depends}
-Description: Development files for libswscale
+Description: Development files for libavresample
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.
.
This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
+ compile applications or shared objects that use libswrescale.
+
+Package: libavresample0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Libav audo resampling library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This is the audio software resampling library from Libav.
Package: libavutil-extra-51
Section: oldlibs
@@@ -428,7 -494,7 +428,7 @@@ Description: Libav utility library (tra
This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
-Package: libavcodec-extra-53
+Package: libavcodec-extra-54
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@@ -436,13 -502,13 +436,13 @@@ Depends
${misc:Depends},
${shlibs:Depends}
Conflicts:
- libavcodec53
+ libavcodec54
Replaces:
- libavcodec53
+ libavcodec54
Breaks:
mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
Enhances:
- libavcodec53
+ libavcodec54
Description: Libav codec library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -491,13 -557,28 +491,13 @@@ Description: Libav filter library (tran
This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
-Package: libpostproc-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Multi-Arch: foreign
-Depends:
- libpostproc52,
- ${misc:Depends},
-Description: Libav video postprocessing library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavformat-extra-53
+Package: libavformat-extra-54
Section: oldlibs
Priority: extra
Architecture: all
Multi-Arch: foreign
Depends:
- libavformat53,
+ libavformat54,
${misc:Depends},
Description: Libav video postprocessing library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
diff --combined debian/rules
index 17dd2e9,a54494b..51e7e8f
--- a/debian/rules
+++ b/debian/rules
@@@ -4,11 -4,15 +4,15 @@@ EPOCH=6
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 := 5:0.8-2~
+SHLIBS_VERSION := 6:0.8.99-1537
+ # these package do not build -extra variants
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|avresample|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these packages do build -extra variants
LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these packages are the -extra- variants
LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+ # these are the -dev packages
DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
# Support multiple makes at once
@@@ -125,17 -129,19 +129,17 @@@ install-common: build $(DH_INSTALL_FILE
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 $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
- -Xffmpeg.1 -Xusr/share/doc/libav-doc \
+ dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
+ -Xusr/share/doc/libav-doc \
-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
- dh_install -pffmpeg --sourcedir=debian/tmp
- dh_strip $(addprefix -N,$(LIB_PKGS2)) -Nffmpeg --dbg-package=libav-dbg
+ dh_strip $(addprefix -N,$(LIB_PKGS2)) --dbg-package=libav-dbg
dh_strip $(addprefix -p,$(LIB_PKGS2)) --dbg-package=libav-regular-dbg
- dh_strip -pffmpeg --dbg-package=ffmpeg-dbg
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
- dh_installdocs -plibavformat53 formats-$(DEB_HOST_ARCH).txt
- dh_installdocs -plibavcodec53 codecs.txt
+ dh_installdocs -plibavformat54 formats-$(DEB_HOST_ARCH).txt
+ dh_installdocs -plibavcodec54 codecs.txt
install-extra: build $(DH_INSTALL_FILES)
dh_testdir
dh_testroot
@@@ -146,7 -152,7 +150,7 @@@
dh_strip $(addprefix -p,$(LIB_EXTRA_PKGS)) --dbg-package=libav-extra-dbg
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
- dh_installdocs -plibavcodec-extra-53 codecs.txt
+ dh_installdocs -plibavcodec-extra-54 codecs.txt
binary-indep: build-doxy install
@@@ -157,7 -163,7 +161,7 @@@ binary-arch: build instal
dh_installdocs doc/optimization.txt
dh_installdocs -A debian/README.Debian
dh_installdocs -p libavcodec-dev -plibavdevice-dev \
- -plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
+ -plibavformat-dev -plibavfilter-dev -plibavresample-dev \
-plibswscale-dev -plibavutil-dev -plibav-doc \
doc/APIchanges
dh_installexamples -p libav-tools doc/avserver.conf debian/recordshow.sh
@@@ -169,29 -175,14 +173,14 @@@
dh_fixperms
dh_strip
- # strict internal dependencies
for pkg in $(LIB_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \
done
for pkg in $(LIB_PKGS2); do \
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
- done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
- dh_shlibdeps $(addprefix -N,$(LIB_EXTRA_PKGS)) $(addprefix -L,$(LIB_PKGS))
- for pkg in $(LIB_EXTRA_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
- done
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
- dh_shlibdeps $(addprefix -p,$(LIB_EXTRA_PKGS)) $(addprefix -L,$(LIB_EXTRA_PKGS))
- # target dependencies for external packages
- for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
- done
- for pkg in $(LIB_PKGS2); 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 (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION))"; \
done
+ dh_shlibdeps
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list