Source: libdv
Version: 1.0.0-3
Severity: normal
Dear Maintainer,
I am attaching a patch to enable multiarch for libdv. Please consider it
for inclusion in your next upload.
Thank you,
tony
-- System Information:
Debian Release: 6.0.3
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500,
'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
reverted:
--- libdv-1.0.0/debian/libdv4.install
+++ libdv-1.0.0.orig/debian/libdv4.install
@@ -1 +0,0 @@
-/usr/lib/*.so.*
reverted:
--- libdv-1.0.0/debian/libdv4-dev.install
+++ libdv-1.0.0.orig/debian/libdv4-dev.install
@@ -1,5 +0,0 @@
-/usr/lib/*.a
-/usr/lib/*.la
-/usr/lib/*.so
-/usr/lib/pkgconfig/*.pc
-/usr/include/*
diff -u libdv-1.0.0/debian/rules libdv-1.0.0/debian/rules
--- libdv-1.0.0/debian/rules
+++ libdv-1.0.0/debian/rules
@@ -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
@@ -61,6 +63,10 @@
touch build-stamp
clean: do-clean unpatch
+ # un-fix-up install files for multiarch
+ rm -f "$(CURDIR)/debian/libdv4.install"
+ rm -f "$(CURDIR)/debian/libdv4-dev.install"
+
do-clean:
dh_testdir
dh_testroot
@@ -92,7 +98,11 @@
$(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"
+
+ # fix-up install files for multiarch
+ cat "$(CURDIR)/debian/libdv4.install.in" | sed
's/@@@DEB_HOST_MULTIARCH@@@/$(DEB_HOST_MULTIARCH)/' >
"$(CURDIR)/debian/libdv4.install"
+ cat "$(CURDIR)/debian/libdv4-dev.install.in" | sed
's/@@@DEB_HOST_MULTIARCH@@@/$(DEB_HOST_MULTIARCH)/' >
"$(CURDIR)/debian/libdv4-dev.install"
# Build architecture-independent files here.
binary-indep: build install
diff -u libdv-1.0.0/debian/control libdv-1.0.0/debian/control
--- libdv-1.0.0/debian/control
+++ libdv-1.0.0/debian/control
@@ -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)
diff -u libdv-1.0.0/debian/changelog libdv-1.0.0/debian/changelog
--- libdv-1.0.0/debian/changelog
+++ libdv-1.0.0/debian/changelog
@@ -1,3 +1,9 @@
+libdv (1.0.0-4) unstable; urgency=low
+
+ * Enable multiarch.
+
+ -- tony mancill <tmanc...@debian.org> Sun, 04 Dec 2011 12:26:54 -0800
+
libdv (1.0.0-3) unstable; urgency=low
* Added patches:
only in patch2:
unchanged:
--- libdv-1.0.0.orig/debian/libdv4-dev.install.in
+++ libdv-1.0.0/debian/libdv4-dev.install.in
@@ -0,0 +1,5 @@
+/usr/lib/@@@DEB_HOST_MULTIARCH@@@/*.a
+/usr/lib/@@@DEB_HOST_MULTIARCH@@@/*.la
+/usr/lib/@@@DEB_HOST_MULTIARCH@@@/*.so
+/usr/lib/@@@DEB_HOST_MULTIARCH@@@/pkgconfig/*.pc
+/usr/include/*
only in patch2:
unchanged:
--- libdv-1.0.0.orig/debian/libdv4.install.in
+++ libdv-1.0.0/debian/libdv4.install.in
@@ -0,0 +1 @@
+/usr/lib/@@@DEB_HOST_MULTIARCH@@@/*.so.*
