tags 650994 patch thanks Hi guys,
Attached is a slightly simpler version of the patch. We can just use a glob for the debian/*.install files instead of having to rewrite the files at build time, since we're not using dh_install to rearrange the directories, just for copying the files into the package. This version of the patch has been uploaded to Ubuntu for inclusion in the Ubuntu Precise release. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/control' --- old/debian/control 2011-04-17 20:36:14 +0000 +++ new/debian/control 2011-12-05 18:50:11 +0000 @@ -2,13 +2,15 @@ Section: video Priority: optional Maintainer: Daniel Kobras <kob...@debian.org> -Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, libpopt-dev, libglib2.0-dev, libgtk2.0-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, autotools-dev, pkg-config (>= 0.7), file, dpatch +Build-Depends: debhelper (>= 8.1.3~), libsdl1.2-dev, libpopt-dev, libglib2.0-dev, libgtk2.0-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, autotools-dev, pkg-config (>= 0.7), file, dpatch Standards-Version: 3.9.1 Homepage: http://libdv.sourceforge.net/ Package: libdv4 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libdv-bin, oss-compat Description: software library for DV format digital video (runtime lib) @@ -22,6 +24,7 @@ Section: libdevel Priority: extra Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev, libpopt-dev, libdv4 (= ${binary:Version}) Recommends: pkg-config Conflicts: libdv-dev @@ -39,6 +42,7 @@ Section: video Priority: extra Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: oss-compat Replaces: libdv-dev (<< 0.98-1) === modified file 'debian/libdv4-dev.install' --- old/debian/libdv4-dev.install 2004-05-13 17:51:59 +0000 +++ new/debian/libdv4-dev.install 2011-12-05 18:48:09 +0000 @@ -1,5 +1,5 @@ -/usr/lib/*.a -/usr/lib/*.la -/usr/lib/*.so -/usr/lib/pkgconfig/*.pc +/usr/lib/*/*.a +/usr/lib/*/*.la +/usr/lib/*/*.so +/usr/lib/*/pkgconfig/*.pc /usr/include/* === modified file 'debian/libdv4.install' --- old/debian/libdv4.install 2004-05-13 17:51:59 +0000 +++ new/debian/libdv4.install 2011-12-05 18:47:58 +0000 @@ -1,1 +1,1 @@ -/usr/lib/*.so.* +/usr/lib/*/*.so.* === modified file 'debian/rules' --- old/debian/rules 2011-04-17 20:36:14 +0000 +++ new/debian/rules 2011-12-05 18:49:51 +0000 @@ -18,6 +18,7 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) libdv_confflags += --build $(DEB_HOST_GNU_TYPE) else @@ -48,7 +49,8 @@ CFLAGS="$(CFLAGS)" ./configure $(libdv_confflags) \ --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --enable-sdl + --infodir=\$${prefix}/share/info --enable-sdl \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) touch configure-stamp @@ -92,7 +94,7 @@ $(MAKE) install DESTDIR="$(CURDIR)/debian/tmp/" # Empty dependency_libs line in .la file - sed -i 's/^dependency_libs=.*/dependency_libs=/' "$(CURDIR)/debian/tmp/usr/lib/libdv.la" + sed -i 's/^dependency_libs=.*/dependency_libs=/' "$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdv.la" # Build architecture-independent files here. binary-indep: build install
signature.asc
Description: Digital signature
