Package: libraw1394 Version: 2.0.7-1 Followup-For: Bug #651007 User: [email protected] Usertags: origin-ubuntu precise ubuntu-patch
Hi guys, Here's an updated patch that addresses Jakub's points. I've also marked libraw1394-tools Multi-Arch: foreign in the process, so that the libraw1394-dev Recommends can be satisfied without warnings in a cross-build environment. 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/ [email protected] [email protected]
=== modified file 'debian/control' --- debian/control 2011-02-12 22:43:46 +0000 +++ debian/control 2011-12-06 00:08:55 +0000 @@ -1,15 +1,17 @@ Source: libraw1394 Priority: optional Maintainer: Guus Sliepen <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, docbook-utils, docbook-xml +Build-Depends: debhelper (>= 8.1.3~), autotools-dev, docbook-utils, docbook-xml Standards-Version: 3.9.1 Section: libs Homepage: https://ieee1394.wiki.kernel.org/ Package: libraw1394-dev Section: libdevel +Multi-Arch: same Architecture: any Depends: libraw1394-11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: libraw1394-tools Suggests: libraw1394-doc Description: library for direct access to IEEE 1394 bus - development files libraw1394 is the only supported interface to the kernel side raw1394 @@ -19,7 +21,7 @@ requiring a kernel driver for the protocol in question. . This package contains the include files, static library and development - tools for libraw1394, as well as the testlibraw program. + tools for libraw1394. Package: libraw1394-doc Architecture: all @@ -38,6 +40,8 @@ Package: libraw1394-11 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libraw1394-doc Description: library for direct access to IEEE 1394 bus (aka FireWire) @@ -46,3 +50,21 @@ connected 1394 buses to user space. Through libraw1394/raw1394, applications can directly send to and receive from other nodes without requiring a kernel driver for the protocol in question. + +Package: libraw1394-tools +Section: utils +Architecture: any +Multi-Arch: foreign +Depends: libraw1394-11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libraw1394-doc +Breaks: libraw1394-dev (<= 2.0.7-1ubuntu1) +Replaces: libraw1394-dev (<= 2.0.7-1ubuntu1) +Description: library for direct access to IEEE 1394 bus (aka FireWire) + libraw1394 is the only supported interface to the kernel side raw1394 + of the Linux IEEE-1394 subsystem, which provides direct access to the + connected 1394 buses to user space. Through libraw1394/raw1394, + applications can directly send to and receive from other nodes without + requiring a kernel driver for the protocol in question. + . + This package contains various utilities for that use libraw1394, including + the testlibraw program. === modified file 'debian/libraw1394-11.install' --- debian/libraw1394-11.install 2009-02-17 13:29:12 +0000 +++ debian/libraw1394-11.install 2011-12-06 00:05:21 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* === removed file 'debian/libraw1394-8.debhelper.log' --- debian/libraw1394-8.debhelper.log 2009-02-17 13:29:12 +0000 +++ debian/libraw1394-8.debhelper.log 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_install -dh_installman -dh_link -dh_strip -dh_compress -dh_fixperms -dh_makeshlibs -dh_installdeb -dh_shlibdeps -dh_gencontrol -dh_md5sums -dh_builddeb === modified file 'debian/libraw1394-dev.dirs' --- debian/libraw1394-dev.dirs 2006-09-21 13:44:19 +0000 +++ debian/libraw1394-dev.dirs 2011-12-06 00:05:21 +0000 @@ -1,4 +1,3 @@ -usr/bin usr/lib usr/include usr/share/man/man1 === modified file 'debian/libraw1394-dev.install' --- debian/libraw1394-dev.install 2009-07-25 17:16:11 +0000 +++ debian/libraw1394-dev.install 2011-12-06 00:05:21 +0000 @@ -1,8 +1,5 @@ -usr/bin/* usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/lib/*.la -usr/share/man/man1/* -usr/share/man/man5/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* +usr/lib/*/*.la === removed file 'debian/libraw1394-dev.manpages' --- debian/libraw1394-dev.manpages 2006-09-21 13:44:19 +0000 +++ debian/libraw1394-dev.manpages 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -usr/share/man/man1/* -usr/share/man/man5/* === added file 'debian/libraw1394-tools.docs' --- debian/libraw1394-tools.docs 1970-01-01 00:00:00 +0000 +++ debian/libraw1394-tools.docs 2011-12-06 00:05:21 +0000 @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README === added file 'debian/libraw1394-tools.install' --- debian/libraw1394-tools.install 1970-01-01 00:00:00 +0000 +++ debian/libraw1394-tools.install 2011-12-06 00:05:21 +0000 @@ -0,0 +1,3 @@ +usr/bin/* +usr/share/man/man1/* +usr/share/man/man5/* === added file 'debian/libraw1394-tools.manpages' --- debian/libraw1394-tools.manpages 1970-01-01 00:00:00 +0000 +++ debian/libraw1394-tools.manpages 2011-12-06 00:05:21 +0000 @@ -0,0 +1,2 @@ +usr/share/man/man1/* +usr/share/man/man5/* === modified file 'debian/rules' --- debian/rules 2010-01-09 22:42:18 +0000 +++ debian/rules 2011-12-06 00:05:21 +0000 @@ -13,6 +13,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = -Wall -g @@ -37,7 +38,7 @@ cp -f /usr/share/misc/config.sub config.sub cp -f /usr/share/misc/config.guess config.guess # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" build: build-stamp
