Package: fuse Version: 2.8.6-2 Please multiarch it.
-- YunQiang Su
diff -ruP debian/changelog fuse-2.8.6/debian/changelog --- debian/changelog 2011-10-23 17:08:00.000000000 +0800 +++ fuse-2.8.6/debian/changelog 2011-11-07 15:29:19.132987116 +0800 @@ -1,4 +1,4 @@ -fuse (2.8.6-2) unstable; urgency=low +fuse (2.8.6-2~deepin) oneiric; urgency=low * Using compression level 9 also for binary packages. * Moving initramfs hook installatin in rules after dh_install call for @@ -20,7 +20,7 @@ * Updating todo file. * Removing double entries in 2.8.5-4 section of debian changelog. - -- Daniel Baumann <daniel.baum...@progress-technologies.net> Sun, 23 Oct 2011 11:07:53 +0200 + -- YunQiang Su <wzss...@gmail.com> Sun, 23 Oct 2011 11:07:53 +0200 fuse (2.8.6-1) unstable; urgency=low diff -ruP debian/compat fuse-2.8.6/debian/compat --- debian/compat 2011-10-23 15:54:00.000000000 +0800 +++ fuse-2.8.6/debian/compat 2011-11-07 15:32:13.173850136 +0800 @@ -1 +1 @@ -8 +9 diff -ruP debian/control fuse-2.8.6/debian/control --- debian/control 2011-10-23 16:36:06.000000000 +0800 +++ fuse-2.8.6/debian/control 2011-11-07 15:33:57.158365769 +0800 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Daniel Baumann <daniel.baum...@progress-technologies.net> -Build-Depends: debhelper (>= 8), autotools-dev, libselinux-dev [linux-any] +Build-Depends: debhelper (>= 8.1.3~), autotools-dev, libselinux-dev [linux-any] Standards-Version: 3.9.2 Homepage: http://fuse.sourceforge.net/ @@ -46,6 +46,8 @@ Package: libfuse2 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: fuse (<< ${binary:Version}) Suggests: fuse diff -ruP debian/libfuse2.install fuse-2.8.6/debian/libfuse2.install --- debian/libfuse2.install 2011-10-23 16:36:06.000000000 +0800 +++ fuse-2.8.6/debian/libfuse2.install 2011-11-07 15:31:02.909501720 +0800 @@ -1 +1 @@ -usr/lib/lib*.so.* lib +usr/lib/*/lib*.so.* diff -ruP debian/libfuse2-udeb.install fuse-2.8.6/debian/libfuse2-udeb.install --- debian/libfuse2-udeb.install 2011-10-23 16:36:06.000000000 +0800 +++ fuse-2.8.6/debian/libfuse2-udeb.install 2011-11-07 15:31:09.753535654 +0800 @@ -1 +1 @@ -usr/lib/lib*.so.* lib +usr/lib/*/lib*.so.* lib diff -ruP debian/libfuse-dev.install fuse-2.8.6/debian/libfuse-dev.install --- debian/libfuse-dev.install 2011-10-23 15:48:50.000000000 +0800 +++ fuse-2.8.6/debian/libfuse-dev.install 2011-11-07 15:31:35.037661035 +0800 @@ -1,4 +1,4 @@ usr/include/* -usr/lib/pkgconfig/* -usr/lib/lib*.a -usr/lib/lib*.so +usr/lib/*/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so diff -ruP debian/patches/fprintf_format-security.diff fuse-2.8.6/debian/patches/fprintf_format-security.diff --- debian/patches/fprintf_format-security.diff 1970-01-01 08:00:00.000000000 +0800 +++ fuse-2.8.6/debian/patches/fprintf_format-security.diff 2011-11-07 15:41:59.892759517 +0800 @@ -0,0 +1,25 @@ +Index: fuse-2.8.6/example/fioclient.c +=================================================================== +--- fuse-2.8.6.orig/example/fioclient.c 2011-09-13 15:23:14.000000000 +0800 ++++ fuse-2.8.6/example/fioclient.c 2011-11-07 15:39:35.096041522 +0800 +@@ -117,6 +117,6 @@ + } + + usage: +- fprintf(stderr, usage); ++ fprintf(stderr, "%s", usage); + return 1; + } +Index: fuse-2.8.6/example/cusexmp.c +=================================================================== +--- fuse-2.8.6.orig/example/cusexmp.c 2011-09-13 15:23:14.000000000 +0800 ++++ fuse-2.8.6/example/cusexmp.c 2011-11-07 15:41:53.976730184 +0800 +@@ -247,7 +247,7 @@ + switch (key) { + case 0: + param->is_help = 1; +- fprintf(stderr, usage); ++ fprintf(stderr, "%s", usage); + return fuse_opt_add_arg(outargs, "-ho"); + default: + return 1; diff -ruP debian/patches/series fuse-2.8.6/debian/patches/series --- debian/patches/series 2011-10-23 15:48:50.000000000 +0800 +++ fuse-2.8.6/debian/patches/series 2011-11-07 15:39:11.595924979 +0800 @@ -2,3 +2,4 @@ 02-kfreebsd.patch 03-examples.patch 04-cve-2011-0542.patch +fprintf_format-security.diff diff -ruP debian/rules fuse-2.8.6/debian/rules --- debian/rules 2011-10-23 16:36:42.000000000 +0800 +++ fuse-2.8.6/debian/rules 2011-11-07 15:34:44.814602087 +0800 @@ -1,12 +1,13 @@ #!/usr/bin/make -f SHELL := sh -e +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh ${@} --with autotools_dev override_dh_auto_configure: - dh_auto_configure -- --bindir=/bin + dh_auto_configure -- --bindir=/bin --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) override_dh_builddeb: dh_builddeb -- -Zgzip -z9 @@ -26,7 +27,7 @@ # remove unused files rm -f debian/tmp/etc/init.d/fuse rm -f debian/tmp/etc/udev/rules.d/99-fuse.rules - rm -f debian/tmp/usr/lib/*.la + rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la dh_install --fail-missing @@ -38,9 +39,9 @@ override_dh_link: # correcting symlink targets - for LIB in debian/tmp/usr/lib/*.so; \ + for LIB in debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so; \ do \ - dh_link -plibfuse-dev lib/$$(basename $$(readlink $${LIB})) usr/lib/$$(basename $${LIB}); \ + dh_link -plibfuse-dev lib/$$(basename $$(readlink $${LIB})) usr/lib/$(DEB_HOST_MULTIARCH)/$$(basename $${LIB}); \ done dh_link --remaining-packages
