diff -Nru hal-trinity-0.5.14/debian/changelog hal-trinity-0.5.14/debian/changelog --- hal-trinity-0.5.14/debian/changelog 2012-05-13 08:57:49.000000000 -0500 +++ hal-trinity-0.5.14/debian/changelog 2013-03-29 22:37:45.000000000 -0500 @@ -1,4 +1,12 @@ -hal-trinity (0.5.14-8) precise; urgency=low +hal-trinity (0.5.14-8a) precise; urgency=low + + * 70-addon-storage-size_t.patch: fix ftbfs with eglibc-2.17 (Closes: #701432) + * Switch source format from native to quilt + * Update build-deps + + -- Slávek Banko <slavek.banko@axis.cz> Sat, 30 Mar 2013 03:31:30 +0100 + +hal-trinity (0.5.14-8a) precise; urgency=low * Update patches from Precise diff -Nru hal-trinity-0.5.14/debian/control hal-trinity-0.5.14/debian/control --- hal-trinity-0.5.14/debian/control 2011-07-01 13:35:45.000000000 -0500 +++ hal-trinity-0.5.14/debian/control 2013-03-29 22:01:16.000000000 -0500 @@ -15,7 +15,8 @@ pciutils, doxygen, intltool (>= 0.22), - libusb-dev [!hurd-i386], + libusb-dev [!hurd-i386] | + libusb2-dev [kfreebsd-amd64 kfreebsd-i386], libusbhid-dev [kfreebsd-amd64 kfreebsd-i386], libcam-dev [kfreebsd-amd64 kfreebsd-i386], libblkid-dev (>= 2.15), diff -Nru hal-trinity-0.5.14/debian/patches/70-addon-storage-size_t.patch hal-trinity-0.5.14/debian/patches/70-addon-storage-size_t.patch --- hal-trinity-0.5.14/debian/patches/70-addon-storage-size_t.patch 1969-12-31 18:00:00.000000000 -0600 +++ hal-trinity-0.5.14/debian/patches/70-addon-storage-size_t.patch 2013-03-29 21:52:04.000000000 -0500 @@ -0,0 +1,12 @@ +Index: b/hald/linux/addons/addon-storage.c +=================================================================== +--- a/hald/linux/addons/addon-storage.c 2013-03-30 03:51:29.000000000 +0100 ++++ b/hald/linux/addons/addon-storage.c 2013-03-30 03:51:56.000000000 +0100 +@@ -32,6 +32,7 @@ + #include <linux/cdrom.h> + #include <linux/fs.h> + #include <mntent.h> ++#include <sys/types.h> + #include <scsi/sg.h> + #include <stdint.h> + #include <stdio.h> diff -Nru hal-trinity-0.5.14/debian/patches/series hal-trinity-0.5.14/debian/patches/series --- hal-trinity-0.5.14/debian/patches/series 2012-05-13 08:55:57.000000000 -0500 +++ hal-trinity-0.5.14/debian/patches/series 2013-03-29 22:31:59.000000000 -0500 @@ -17,3 +17,4 @@ 55-kfreebsd-format-security.patch 60-create-run-hald-directory.patch 65-glib-single-include.patch +70-addon-storage-size_t.patch diff -Nru hal-trinity-0.5.14/debian/rules hal-trinity-0.5.14/debian/rules --- hal-trinity-0.5.14/debian/rules 2011-07-01 13:35:45.000000000 -0500 +++ hal-trinity-0.5.14/debian/rules 2013-03-29 21:32:07.000000000 -0500 @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk # List any files which are not installed diff -Nru hal-trinity-0.5.14/debian/source/format hal-trinity-0.5.14/debian/source/format --- hal-trinity-0.5.14/debian/source/format 1969-12-31 18:00:00.000000000 -0600 +++ hal-trinity-0.5.14/debian/source/format 2010-07-16 19:55:23.000000000 -0500 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru hal-trinity-0.5.14/debian/source/options hal-trinity-0.5.14/debian/source/options --- hal-trinity-0.5.14/debian/source/options 1969-12-31 18:00:00.000000000 -0600 +++ hal-trinity-0.5.14/debian/source/options 2012-12-12 18:03:19.000000000 -0600 @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .*