[SCM] libav/libav-extra: Change packaging to build libav*-extra* packages through libav source package.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Mon Mar 19 12:52:07 UTC 2012


The following commit has been merged in the libav-extra branch:
commit d1645a43e1490241713a2168739fe17d03151a2b
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 22:45:12 2012 -0400

    Change packaging to build libav*-extra* packages through libav source package.

diff --git a/debian/confflags b/debian/confflags
index aa41bfb..614599c 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -149,7 +149,6 @@ confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
 
 # comment out following line for LGPL versions of the libraries
 confflags += $(gpl_confflags)
-confflags += $(v3_confflags)
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
diff --git a/debian/control b/debian/control
index 6409541..6d8d4f5 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Build-Depends:
  libimlib2-dev,
  libjack-dev,
  libmp3lame-dev,
+ libopencore-amrnb-dev,
+ libopencore-amrwb-dev,
  libopencv-dev,
  libopenjpeg-dev,
  libpulse-dev [!hurd-any],
@@ -45,6 +47,8 @@ Build-Depends:
  libtiff4-dev | libtiff-dev,
  libva-dev,
  libvdpau-dev,
+ libvo-aacenc-dev,
+ libvo-amrwbenc-dev,
  libvorbis-dev,
  libvpx-dev,
  libx11-dev,
@@ -290,8 +294,8 @@ 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}),
+ libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}-99),
+ libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavutil
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -306,8 +310,8 @@ Package: libavcodec-dev
 Section: libdevel
 Architecture: any
 Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Suggests:
@@ -336,8 +340,8 @@ Package: libavdevice-dev
 Section: libdevel
 Architecture: any
 Depends:
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
- libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+ libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}-99),
+ libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${binary:Version}),
  libavformat-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavdevice
@@ -354,8 +358,8 @@ Section: libdevel
 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}),
+ libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}-99),
+ libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavformat
@@ -373,8 +377,8 @@ Section: libdevel
 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}),
+ libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}-99),
+ libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavfilter
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -390,8 +394,8 @@ 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}),
+ libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}-99),
+ libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libpostproc
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -407,8 +411,8 @@ 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}),
+ libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}-99),
+ libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libswscale
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -418,3 +422,130 @@ Description: Development files for libswscale
  .
  This package contains the header files and static libraries needed to
  compile applications or shared objects that use libswscale.
+
+Package: libavutil-extra-51
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs: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 Libav. It contains shared code
+ used by all other Libav libraries.
+
+Package: libavcodec-extra-53
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests:
+ libfaad0
+Conflicts:
+ libavcodec53
+Replaces:
+ libavcodec53
+Breaks:
+ mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
+Description: Libav codec library
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This is the codec library from Libav (both encoding and decoding).
+
+Package: libavdevice-extra-53
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavdevice53
+Replaces:
+ libavdevice53
+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: libavfilter-extra-2
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavfilter2
+Replaces:
+ libavfilter2
+Description: Libav filter 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: libpostproc-extra-52
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libpostproc52
+Replaces:
+ libpostproc52
+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: libavformat-extra-53
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libavformat53
+Replaces:
+ libavformat53
+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 demuxer library from Libav. It supports most existing file
+ formats (AVI, MPEG, OGG, Matroska, ASF...).
+
+Package: libswscale-extra-2
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libswscale-extra-1 (>> 4:0.7~),
+ libswscale2
+Replaces:
+ libswscale-extra-1 (>> 4:0.7~),
+ libswscale2
+Description: Libav video software 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.
diff --git a/debian/copyright b/debian/libavcodec-extra-53.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libavcodec-extra-53.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libavcodec-extra-53.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libavcodec53.install.in b/debian/libavcodec-extra-53.install.in
similarity index 100%
copy from debian/libavcodec53.install.in
copy to debian/libavcodec-extra-53.install.in
diff --git a/debian/copyright b/debian/libavdevice-extra-53.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libavdevice-extra-53.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libavdevice-extra-53.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libavdevice53.install.in b/debian/libavdevice-extra-53.install.in
similarity index 100%
copy from debian/libavdevice53.install.in
copy to debian/libavdevice-extra-53.install.in
diff --git a/debian/copyright b/debian/libavfilter-extra-2.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libavfilter-extra-2.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libavfilter-extra-2.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libavfilter2.install.in b/debian/libavfilter-extra-2.install.in
similarity index 100%
copy from debian/libavfilter2.install.in
copy to debian/libavfilter-extra-2.install.in
diff --git a/debian/copyright b/debian/libavformat-extra-53.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libavformat-extra-53.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libavformat-extra-53.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libavformat53.install.in b/debian/libavformat-extra-53.install.in
similarity index 100%
copy from debian/libavformat53.install.in
copy to debian/libavformat-extra-53.install.in
diff --git a/debian/copyright b/debian/libavutil-extra-51.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libavutil-extra-51.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libavutil-extra-51.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libavutil51.install.in b/debian/libavutil-extra-51.install.in
similarity index 100%
copy from debian/libavutil51.install.in
copy to debian/libavutil-extra-51.install.in
diff --git a/debian/copyright b/debian/libpostproc-extra-52.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libpostproc-extra-52.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libpostproc-extra-52.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libpostproc52.install.in b/debian/libpostproc-extra-52.install.in
similarity index 100%
copy from debian/libpostproc52.install.in
copy to debian/libpostproc-extra-52.install.in
diff --git a/debian/copyright b/debian/libswscale-extra-2.copyright
similarity index 95%
copy from debian/copyright
copy to debian/libswscale-extra-2.copyright
index 6e01e3f..ddda12a 100644
--- a/debian/copyright
+++ b/debian/libswscale-extra-2.copyright
@@ -92,3 +92,7 @@ The rest of the code is licensed under the GNU LGPL:
 On Debian GNU/Linux systems, the complete text of the GNU General Public
 License can be found in `/usr/share/common-licenses/GPL' and the text of the
 GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because this package links against libraries that are licensed
+under Apache License 2.0, the resulting binaries are distributed under the
+GPL version 3.
diff --git a/debian/libswscale2.install.in b/debian/libswscale-extra-2.install.in
similarity index 100%
copy from debian/libswscale2.install.in
copy to debian/libswscale-extra-2.install.in
diff --git a/debian/rules b/debian/rules
index 0680e09..b59ac25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SHLIBS_VERSION := 4:0.8-2~
 
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_EXTRA_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
@@ -36,7 +37,7 @@ define dh_install_file_opt_flavor
 
 endef
 
-DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(LIB_EXTRA_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)))
@@ -48,12 +49,22 @@ configure-stamp-%:
 	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
+configure-extra-stamp-%:
+	dh_testdir
+	mkdir -p debian-extra-$*
+	cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+		$($*_build_confflags) $(v3_confflags) $(extra_$*_build_confflags)
+	touch $@
 
 build-%: build-stamp-%
 build-stamp-%: configure-stamp-%
 	dh_testdir
 	$(MAKE) -C debian-$* $(NUMJOBS) V=1
 	touch $@
+build-extra-stamp-%: configure-extra-stamp-%
+	dh_testdir
+	$(MAKE) -C debian-extra-$* $(NUMJOBS) V=1
+	touch $@
 
 debian-shared/tools/qt-faststart: build-stamp-shared
 	$(MAKE) -C debian-shared tools/qt-faststart V=1
@@ -64,16 +75,21 @@ build-doxy-stamp:
 	doxygen
 	touch $@
 
-build: build-stamp
+build: build-stamp build-extra
 build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart
 	touch $@
+build-extra: $(addprefix build-extra-stamp-, $(FLAVORS))
+	touch $@
 
 clean:
 	dh_testdir
-	rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
+	rm -f build-stamp build-extra $(addprefix build-stamp-, $(FLAVORS)) \
+	    $(addprefix build-extra-stamp-, $(FLAVORS)) \
 	    $(addprefix configure-stamp-, $(FLAVORS)) \
+	    $(addprefix configure-extra-stamp-, $(FLAVORS)) \
 	    build-doxy-stamp
-	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
+	rm -rf $(addprefix debian-, $(FLAVORS)) \
+		$(addprefix debian-extra-, $(FLAVORS)) doxy
 	dh_clean $(DH_INSTALL_FILES)
 
 get-orig-source:
@@ -87,7 +103,15 @@ define install_flavor
 
 endef
 
-install: build $(DH_INSTALL_FILES)
+# The trailing newline is important!
+define install_flavor_extra
+	$(MAKE) -C debian-extra-$(1) install DESTDIR=$(CURDIR)/debian/tmp/extra \
+	    mandir=$(CURDIR)/debian/tmp/usr/share/man
+
+endef
+
+install: install-common install-extra
+install-common: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -103,27 +127,37 @@ install: build $(DH_INSTALL_FILES)
 	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 \
-		--fail-missing --sourcedir=debian/tmp
-
-formats.txt: install
+	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Xusr/share/doc/libav-doc \
+		-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
+	dh_strip --dbg-package=libav-dbg
 	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
+	debian/tmp/usr/bin/avconv -formats | tee formats.txt
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
-	debian/tmp/usr/bin/avconv -codecs | tee $@
+	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
+	dh_installdocs -plibavformat53 formats.txt
+	dh_installdocs -plibavcodec53 codecs.txt
+install-extra: build $(DH_INSTALL_FILES)
+	dh_testdir
+	dh_testroot
+	$(foreach flavor,$(FLAVORS),$(call install_flavor_extra,$(flavor)))
+	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) -Xusr/share/doc/libav-doc \
+		-Xusr/share/doc/libav --fail-missing \
+		--sourcedir=debian/tmp/extra
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
+	debian/tmp/usr/bin/avconv -formats | tee formats.txt
+	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 -plibavformat-extra-53 formats.txt
+	dh_installdocs -plibavcodec-extra-53 codecs.txt
 
 binary-indep: build-doxy install
 
-binary-arch: build install codecs.txt formats.txt
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installman -plibav-tools debian/qt-faststart.1
 	dh_installdocs doc/optimization.txt
 	dh_installdocs -A debian/README.Debian
-	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 \
@@ -135,20 +169,28 @@ binary-arch: build install codecs.txt formats.txt
 	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 (>= $(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
+	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); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
 	done
+	for pkg in $(LIB_EXTRA_PKGS); do \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
+	done
 	dh_installdeb
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list