Package: libraw1394
Version: 2.0.7-1
Severity: normal
Tags: patch
As part of the Multi-Arch release goal, and during today's Bug Squashing
Party in Portland, I've converted libraw1394 to build with Multi-Arch
support.
Please see attached...
Thanks!
-Kees
--
Kees Cook @debian.org
diff -Nru libraw1394-2.0.7/debian/changelog libraw1394-2.0.7/debian/changelog
--- libraw1394-2.0.7/debian/changelog 2011-03-09 01:29:21.000000000 -0800
+++ libraw1394-2.0.7/debian/changelog 2011-12-04 15:35:13.000000000 -0800
@@ -1,3 +1,10 @@
+libraw1394 (2.0.7-2) UNRELEASED; urgency=low
+
+ * debian/{control,*.install,rules}: convert to Multi-Arch, split
+ binaries from the -dev package into new "libraw1394-tools" package.
+
+ -- Kees Cook <[email protected]> Sun, 04 Dec 2011 14:57:49 -0800
+
libraw1394 (2.0.7-1) unstable; urgency=low
* New upstream release. Closes: #617436
diff -Nru libraw1394-2.0.7/debian/control libraw1394-2.0.7/debian/control
--- libraw1394-2.0.7/debian/control 2011-02-12 13:39:43.000000000 -0800
+++ libraw1394-2.0.7/debian/control 2011-12-04 15:11:31.000000000 -0800
@@ -1,15 +1,18 @@
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
+Pre-Depends: ${misc:Pre-Depends}
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 +22,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 +41,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 +51,18 @@
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
+Depends: libraw1394-11 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Suggests: libraw1394-doc
+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.
diff -Nru libraw1394-2.0.7/debian/libraw1394-11.install
libraw1394-2.0.7/debian/libraw1394-11.install
--- libraw1394-2.0.7/debian/libraw1394-11.install 2009-07-25
07:39:58.000000000 -0700
+++ libraw1394-2.0.7/debian/libraw1394-11.install 2011-12-04
14:56:04.000000000 -0800
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru libraw1394-2.0.7/debian/libraw1394-8.debhelper.log
libraw1394-2.0.7/debian/libraw1394-8.debhelper.log
--- libraw1394-2.0.7/debian/libraw1394-8.debhelper.log 2009-07-25
07:39:58.000000000 -0700
+++ libraw1394-2.0.7/debian/libraw1394-8.debhelper.log 1969-12-31
16:00:00.000000000 -0800
@@ -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
diff -Nru libraw1394-2.0.7/debian/libraw1394-dev.dirs
libraw1394-2.0.7/debian/libraw1394-dev.dirs
--- libraw1394-2.0.7/debian/libraw1394-dev.dirs 2009-07-25 07:39:58.000000000
-0700
+++ libraw1394-2.0.7/debian/libraw1394-dev.dirs 2011-12-04 15:13:27.000000000
-0800
@@ -1,4 +1,3 @@
-usr/bin
usr/lib
usr/include
usr/share/man/man1
diff -Nru libraw1394-2.0.7/debian/libraw1394-dev.install
libraw1394-2.0.7/debian/libraw1394-dev.install
--- libraw1394-2.0.7/debian/libraw1394-dev.install 2009-07-25
08:05:28.000000000 -0700
+++ libraw1394-2.0.7/debian/libraw1394-dev.install 2011-12-04
15:16:19.000000000 -0800
@@ -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
diff -Nru libraw1394-2.0.7/debian/libraw1394-dev.manpages
libraw1394-2.0.7/debian/libraw1394-dev.manpages
--- libraw1394-2.0.7/debian/libraw1394-dev.manpages 2009-07-25
07:39:58.000000000 -0700
+++ libraw1394-2.0.7/debian/libraw1394-dev.manpages 1969-12-31
16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-usr/share/man/man1/*
-usr/share/man/man5/*
diff -Nru libraw1394-2.0.7/debian/libraw1394-tools.docs
libraw1394-2.0.7/debian/libraw1394-tools.docs
--- libraw1394-2.0.7/debian/libraw1394-tools.docs 1969-12-31
16:00:00.000000000 -0800
+++ libraw1394-2.0.7/debian/libraw1394-tools.docs 2011-12-04
15:14:49.000000000 -0800
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff -Nru libraw1394-2.0.7/debian/libraw1394-tools.install
libraw1394-2.0.7/debian/libraw1394-tools.install
--- libraw1394-2.0.7/debian/libraw1394-tools.install 1969-12-31
16:00:00.000000000 -0800
+++ libraw1394-2.0.7/debian/libraw1394-tools.install 2011-12-04
15:20:59.000000000 -0800
@@ -0,0 +1,3 @@
+usr/bin/*
+usr/share/man/man1/*
+usr/share/man/man5/*
diff -Nru libraw1394-2.0.7/debian/libraw1394-tools.manpages
libraw1394-2.0.7/debian/libraw1394-tools.manpages
--- libraw1394-2.0.7/debian/libraw1394-tools.manpages 1969-12-31
16:00:00.000000000 -0800
+++ libraw1394-2.0.7/debian/libraw1394-tools.manpages 2011-12-04
15:14:30.000000000 -0800
@@ -0,0 +1,2 @@
+usr/share/man/man1/*
+usr/share/man/man5/*
diff -Nru libraw1394-2.0.7/debian/rules libraw1394-2.0.7/debian/rules
--- libraw1394-2.0.7/debian/rules 2010-01-09 06:04:23.000000000 -0800
+++ libraw1394-2.0.7/debian/rules 2011-12-04 14:55:44.000000000 -0800
@@ -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
