[SCM] libav-extra/master: Convert package to be support multiarch.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Sep 26 16:11:17 UTC 2011 

The following commit has been merged in the master branch:
commit 875c95dde411eeb214a55f2f08a06b32c9a8cd3a
Author: Andres Mejia <amejia at debian.org>
Date:   Mon Sep 26 18:08:27 2011 +0200

    Convert package to be support multiarch.
    
    * Convert package to be support multiarch.
    * Fix deprecated dh_install option 'warn-missing' to 'list-missing'.
    * Update build depends to have libav-source (>= 4:0.7.1-6).
    * Update libav-extra source lintian overrides for libav-extra package.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c71cd9e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,48 +0,0 @@
-/.pc
-.config
-.version
-*.o
-*.d
-*.exe
-*.ho
-*-example
-*-test
-config.*
-doc/*.1
-doc/*.html
-doc/*.pod
-doxy
-ffmpeg
-ffplay
-ffprobe
-ffserver
-libavcodec/*_tablegen
-libavcodec/*_tables.c
-libavcodec/*_tables.h
-libavcodec/libavcodec*
-libavdevice/libavdevice*
-libavfilter/libavfilter*
-libavformat/libavformat*
-libavutil/avconfig.h
-libavutil/libavutil*
-libpostproc/libpostproc*
-libswscale/libswscale*
-tests/audiogen
-tests/base64
-tests/data
-tests/rotozoom
-tests/seek_test
-tests/tiny_psnr
-tests/videogen
-tests/vsynth1
-tests/vsynth2
-tools/cws2fws
-tools/graph2dot
-tools/lavfi-showfiltfmts
-tools/pktdumper
-tools/probetest
-tools/qt-faststart
-tools/trasher
-tools/trasher*.d
-version.h
-/.pc
diff --git a/debian/changelog b/debian/changelog
index d68e5cb..284b1ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libav-extra (4:0.7.1.3) unstable; urgency=low
+
+  * Convert package to be support multiarch.
+  * Fix deprecated dh_install option 'warn-missing' to 'list-missing'.
+  * Update build depends to have libav-source (>= 4:0.7.1-6).
+  * Update libav-extra source lintian overrides for libav-extra package.
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 24 Sep 2011 23:29:38 -0400
+
 libav-extra (4:0.7.1.2) unstable; urgency=low
 
   * Tighten dependency on libav-source
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/confflags b/debian/confflags
index c11411d..3a6981e 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -7,6 +7,7 @@ FLAVORS := static
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS += shared
 
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -95,6 +96,7 @@ gpl_confflags += --enable-x11grab
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --prefix=/usr
+confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --enable-vdpau
 confflags += --enable-bzlib
 confflags += --enable-libgsm
@@ -164,7 +166,7 @@ endif
 static_build_confflags += $(confflags)
 
 # Configuration flags for the non-optimized shared libraries
-shared_build_confflags += $(confflags)
+shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 # amd64 has no problems with optimized shared libs. i386 and arm do.
 ifneq      ($(DEB_HOST_ARCH),amd64)
 shared_build_confflags += $(nooptflags)
@@ -175,7 +177,7 @@ shared_build_confflags += --disable-static
 ## specific to arm architectures
 # Configuration flags for the optimised shared libraries
 vfp_build_confflags += $(confflags)
-vfp_build_confflags += --shlibdir=/usr/lib/vfp
+vfp_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/vfp
 vfp_build_confflags += --enable-shared
 vfp_build_confflags += --disable-static
 vfp_build_confflags += --extra-cflags="-mfpu=vfp $(float_abi)"
@@ -183,7 +185,7 @@ vfp_build_confflags += --disable-ffmpeg
 vfp_build_confflags += --disable-ffplay
 # NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
 neon_build_confflags += $(confflags)
-neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
+neon_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 # the NEON pass now requires ubfx which was introduced in armv6t2; we need to
 # enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a
 # so pass armv7-a if it's not already enabled
@@ -200,7 +202,7 @@ neon_build_confflags += --disable-ffplay
 # Configuration flags for the optimized shared libraries
 cmov_build_confflags += $(confflags)
 cmov_build_confflags += $(nooptflags)
-cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
+cmov_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov
 cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
@@ -210,7 +212,7 @@ cmov_build_confflags += --disable-ffplay
 ## powerpc architecture specific
 # Configuration flags for the optimized shared libraries
 altivec_build_confflags += $(confflags)
-altivec_build_confflags += --shlibdir=/usr/lib/altivec
+altivec_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 altivec_build_confflags += --cpu='g4'
 altivec_build_confflags += --enable-shared
 altivec_build_confflags += --disable-static
@@ -221,7 +223,7 @@ altivec_build_confflags += --disable-ffplay
 ## sparc architecture specific
 # Configuration flags for the optimized shared libraries
 vis_build_confflags += $(confflags)
-vis_build_confflags += --shlibdir=/usr/lib/v9
+vis_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/v9
 vis_build_confflags += --cpu='sparc64'
 vis_build_confflags += --enable-shared
 vis_build_confflags += --disable-static
diff --git a/debian/control b/debian/control
index aefbb23..c7d3f22 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav-extra.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav-extra.git;a=summary
 Homepage: http://libav.org/
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8.1.3~),
  libasound2-dev [linux-any],
- libav-source (>= 4:0.7.1-4),
+ libav-source (>= 4:0.7.1-6),
  libbz2-dev,
  libdc1394-22-dev [linux-any],
  libdirac-dev,
@@ -50,6 +50,8 @@ Build-Depends: debhelper (>= 7),
 
 Package: libavutil-extra-51
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavutil51
@@ -63,6 +65,8 @@ Description: Libav utility library
 
 Package: libavcodec-extra-53
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Suggests: libfaad0
@@ -79,6 +83,8 @@ Description: Libav codec library
 
 Package: libavdevice-extra-53
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavdevice53
@@ -91,6 +97,8 @@ Description: Libav device handling library
 
 Package: libavfilter-extra-2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavfilter2
@@ -103,6 +111,8 @@ Description: Libav filter library
 
 Package: libpostproc-extra-52
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libpostproc52
@@ -115,6 +125,8 @@ Description: Libav video postprocessing library
 
 Package: libavformat-extra-53
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libavformat53
@@ -128,6 +140,8 @@ Description: Libav file format library
 
 Package: libswscale-extra-2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
diff --git a/debian/libavcodec-dev.install b/debian/libavcodec-dev.install
index 6fa94c8..57ecd96 100644
--- a/debian/libavcodec-dev.install
+++ b/debian/libavcodec-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavcodec
-usr/lib/libavcodec.a
-usr/lib/{,*/,*/*/}libavcodec.so
-usr/lib/pkgconfig/libavcodec.pc
+usr/lib/*/libavcodec.a
+usr/lib/*/{,*/,*/*/}libavcodec.so
+usr/lib/*/pkgconfig/libavcodec.pc
diff --git a/debian/libavcodec-extra-53.install b/debian/libavcodec-extra-53.install
index db9ed34..27da00e 100644
--- a/debian/libavcodec-extra-53.install
+++ b/debian/libavcodec-extra-53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavcodec.so.*
+usr/lib/*/{,*/,*/*/}libavcodec.so.*
diff --git a/debian/libavcodec53.install b/debian/libavcodec53.install
index db9ed34..27da00e 100644
--- a/debian/libavcodec53.install
+++ b/debian/libavcodec53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavcodec.so.*
+usr/lib/*/{,*/,*/*/}libavcodec.so.*
diff --git a/debian/libavdevice-dev.install b/debian/libavdevice-dev.install
index bc65cd0..b38e4f0 100644
--- a/debian/libavdevice-dev.install
+++ b/debian/libavdevice-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavdevice
-usr/lib/libavdevice.a
-usr/lib/{,*/,*/*/}libavdevice.so
-usr/lib/pkgconfig/libavdevice.pc
+usr/lib/*/libavdevice.a
+usr/lib/*/{,*/,*/*/}libavdevice.so
+usr/lib/*/pkgconfig/libavdevice.pc
diff --git a/debian/libavdevice-extra-53.install b/debian/libavdevice-extra-53.install
index acdb58b..30b41e5 100644
--- a/debian/libavdevice-extra-53.install
+++ b/debian/libavdevice-extra-53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavdevice.so.*
+usr/lib/*/{,*/,*/*/}libavdevice.so.*
diff --git a/debian/libavdevice53.install b/debian/libavdevice53.install
index acdb58b..30b41e5 100644
--- a/debian/libavdevice53.install
+++ b/debian/libavdevice53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavdevice.so.*
+usr/lib/*/{,*/,*/*/}libavdevice.so.*
diff --git a/debian/libavfilter-dev.install b/debian/libavfilter-dev.install
index 6d196e2..f278a96 100644
--- a/debian/libavfilter-dev.install
+++ b/debian/libavfilter-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavfilter
-usr/lib/libavfilter.a
-usr/lib/{,*/,*/*/}libavfilter.so
-usr/lib/pkgconfig/libavfilter.pc
+usr/lib/*/libavfilter.a
+usr/lib/*/{,*/,*/*/}libavfilter.so
+usr/lib/*/pkgconfig/libavfilter.pc
diff --git a/debian/libavfilter-extra-2.install b/debian/libavfilter-extra-2.install
index 43fec8a..1efdd0b 100644
--- a/debian/libavfilter-extra-2.install
+++ b/debian/libavfilter-extra-2.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavfilter.so.*
+usr/lib/*/{,*/,*/*/}libavfilter.so.*
diff --git a/debian/libavfilter2.install b/debian/libavfilter2.install
index 43fec8a..1efdd0b 100644
--- a/debian/libavfilter2.install
+++ b/debian/libavfilter2.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavfilter.so.*
+usr/lib/*/{,*/,*/*/}libavfilter.so.*
diff --git a/debian/libavformat-dev.install b/debian/libavformat-dev.install
index c154e6a..93c742e 100644
--- a/debian/libavformat-dev.install
+++ b/debian/libavformat-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavformat
-usr/lib/libavformat.a
-usr/lib/{,*/,*/*/}libavformat.so
-usr/lib/pkgconfig/libavformat.pc
+usr/lib/*/libavformat.a
+usr/lib/*/{,*/,*/*/}libavformat.so
+usr/lib/*/pkgconfig/libavformat.pc
diff --git a/debian/libavformat-extra-53.install b/debian/libavformat-extra-53.install
index 37a67ad..0a3dc1a 100644
--- a/debian/libavformat-extra-53.install
+++ b/debian/libavformat-extra-53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavformat.so.*
+usr/lib/*/{,*/,*/*/}libavformat.so.*
diff --git a/debian/libavformat53.install b/debian/libavformat53.install
index 37a67ad..0a3dc1a 100644
--- a/debian/libavformat53.install
+++ b/debian/libavformat53.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavformat.so.*
+usr/lib/*/{,*/,*/*/}libavformat.so.*
diff --git a/debian/libavutil-dev.install b/debian/libavutil-dev.install
index ce267d1..2a410c7 100644
--- a/debian/libavutil-dev.install
+++ b/debian/libavutil-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavutil
-usr/lib/libavutil.a
-usr/lib/{,*/,*/*/}libavutil.so
-usr/lib/pkgconfig/libavutil.pc
+usr/lib/*/libavutil.a
+usr/lib/*/{,*/,*/*/}libavutil.so
+usr/lib/*/pkgconfig/libavutil.pc
diff --git a/debian/libavutil-extra-51.install b/debian/libavutil-extra-51.install
index f9f5687..f89ecbe 100644
--- a/debian/libavutil-extra-51.install
+++ b/debian/libavutil-extra-51.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavutil.so.*
+usr/lib/*/{,*/,*/*/}libavutil.so.*
diff --git a/debian/libavutil51.install b/debian/libavutil51.install
index f9f5687..f89ecbe 100644
--- a/debian/libavutil51.install
+++ b/debian/libavutil51.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libavutil.so.*
+usr/lib/*/{,*/,*/*/}libavutil.so.*
diff --git a/debian/libpostproc-dev.install b/debian/libpostproc-dev.install
index da9df8f..de5d0f9 100644
--- a/debian/libpostproc-dev.install
+++ b/debian/libpostproc-dev.install
@@ -1,4 +1,4 @@
 usr/include/libpostproc
-usr/lib/libpostproc.a
-usr/lib/{,*/,*/*/}libpostproc.so
-usr/lib/pkgconfig/libpostproc.pc
+usr/lib/*/libpostproc.a
+usr/lib/*/{,*/,*/*/}libpostproc.so
+usr/lib/*/pkgconfig/libpostproc.pc
diff --git a/debian/libpostproc-extra-52.install b/debian/libpostproc-extra-52.install
index 5506233..78d31a1 100644
--- a/debian/libpostproc-extra-52.install
+++ b/debian/libpostproc-extra-52.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libpostproc.so.*
+usr/lib/*/{,*/,*/*/}libpostproc.so.*
diff --git a/debian/libpostproc52.install b/debian/libpostproc52.install
index 5506233..78d31a1 100644
--- a/debian/libpostproc52.install
+++ b/debian/libpostproc52.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libpostproc.so.*
+usr/lib/*/{,*/,*/*/}libpostproc.so.*
diff --git a/debian/libswscale-dev.install b/debian/libswscale-dev.install
index 9c2395c..b4d9715 100644
--- a/debian/libswscale-dev.install
+++ b/debian/libswscale-dev.install
@@ -1,4 +1,4 @@
 usr/include/libswscale
-usr/lib/libswscale.a
-usr/lib/{,*/,*/*/}libswscale.so
-usr/lib/pkgconfig/libswscale.pc
+usr/lib/*/libswscale.a
+usr/lib/*/{,*/,*/*/}libswscale.so
+usr/lib/*/pkgconfig/libswscale.pc
diff --git a/debian/libswscale-extra-2.install b/debian/libswscale-extra-2.install
index 8965d77..b403da1 100644
--- a/debian/libswscale-extra-2.install
+++ b/debian/libswscale-extra-2.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libswscale.so.*
+usr/lib/*/{,*/,*/*/}libswscale.so.*
diff --git a/debian/libswscale2.install b/debian/libswscale2.install
index 8965d77..b403da1 100644
--- a/debian/libswscale2.install
+++ b/debian/libswscale2.install
@@ -1 +1 @@
-usr/lib/{,*/,*/*/}libswscale.so.*
+usr/lib/*/{,*/,*/*/}libswscale.so.*
diff --git a/debian/rules b/debian/rules
index 8813772..6242642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,14 +82,14 @@ install: build
 	dh_prep
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 	dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
-		--warn-missing --sourcedir=debian/tmp
+		--list-missing --sourcedir=debian/tmp
 
 formats.txt: install
-	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)" \
 	debian/tmp/usr/bin/ffmpeg -formats | tee $@
 
 codecs.txt: install
-	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)" \
 	debian/tmp/usr/bin/ffmpeg -codecs | tee $@
 
 binary-indep: install
@@ -113,7 +113,7 @@ binary-arch: build install codecs.txt formats.txt
 	for pkg in $(LIB_PKGS); do \
 	    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 \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index ba6ab02..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# The dependencies for packages within ffmpeg are different than the
-# dependencies for packages that depend on the ffmpeg libraries.
-libav source: debian-rules-calls-debhelper-in-odd-order
-# ffmpeg-dbg is an empty, transitional package
-libav source: dbg-package-missing-depends ffmpeg-dbg
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..4d11619
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+# Ignore this, since currently only debhelper (>= 8.1.3~) is needed.
+libav-extra source: package-needs-versioned-debhelper-build-depends 9
+# We're well aware of this, and we're ignoring the watchfile warning too
+libav-extra source: debian-watch-file-in-native-package
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
libav-extra packaging

More information about the pkg-multimedia-commits mailing list