diff -rupN original/debian/control changes/debian/control --- original/debian/control 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/control 2012-09-25 18:26:28.000000000 +0200 @@ -5,13 +5,12 @@ Maintainer: Daniel Baumann = 9), autotools-dev, chrpath, libfuse-dev (>= 2.6.8-2~), libgcrypt11-dev, libgnutls-dev, pkg-config -Standards-Version: 3.9.3 +Standards-Version: 3.9.2 Homepage: http://www.tuxera.com/community/ntfs-3g-advanced/ Package: ntfs-3g Section: otherosfs Architecture: linux-any kfreebsd-any -Pre-Depends: ${multiarch:Pre-Depends}, fuse [linux-any], fuse4bsd [kfreebsd-any] Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libntfs-3g75, ntfsprogs (<< 1:2011.10.9AR.1-3~) Replaces: libntfs-3g75, ntfsprogs diff -rupN original/debian/ntfs-3g-dev.install changes/debian/ntfs-3g-dev.install --- original/debian/ntfs-3g-dev.install 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g-dev.install 2012-09-25 18:30:17.000000000 +0200 @@ -1,4 +1,4 @@ usr/include -usr/lib/i386-linux-gnu/pkgconfig -usr/lib/i386-linux-gnu/*.a -usr/lib/i386-linux-gnu/*.so +lib/pkgconfig usr/lib +lib/*.a usr/lib +lib/*.so usr/lib diff -rupN original/debian/ntfs-3g-dev.install.in changes/debian/ntfs-3g-dev.install.in --- original/debian/ntfs-3g-dev.install.in 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g-dev.install.in 2012-09-25 18:28:53.000000000 +0200 @@ -1,4 +0,0 @@ -usr/include -usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig -usr/lib/@DEB_HOST_MULTIARCH@/*.a -usr/lib/@DEB_HOST_MULTIARCH@/*.so diff -rupN original/debian/ntfs-3g.install changes/debian/ntfs-3g.install --- original/debian/ntfs-3g.install 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g.install 2012-09-25 18:31:11.000000000 +0200 @@ -1,7 +1,7 @@ bin sbin usr/bin -usr/lib/i386-linux-gnu/*.so.* /lib/i386-linux-gnu +lib/lib*.so.* usr/share -debian/local/*.fdi /usr/share/hal/fdi/policy/10osvendor +debian/local/*.fdi /usr/share/hal/fdi/policy/10osvendor diff -rupN original/debian/ntfs-3g.install.in changes/debian/ntfs-3g.install.in --- original/debian/ntfs-3g.install.in 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g.install.in 2012-09-25 18:29:03.000000000 +0200 @@ -1,7 +0,0 @@ -bin -sbin -usr/bin -usr/lib/@DEB_HOST_MULTIARCH@/*.so.* /lib/@DEB_HOST_MULTIARCH@ -usr/share - -debian/local/*.fdi /usr/share/hal/fdi/policy/10osvendor diff -rupN original/debian/ntfs-3g-udeb.install changes/debian/ntfs-3g-udeb.install --- original/debian/ntfs-3g-udeb.install 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g-udeb.install 2012-09-25 18:31:40.000000000 +0200 @@ -1,4 +1,4 @@ bin/ntfs-3g sbin/mount.* sbin/ntfsresize -usr/lib/i386-linux-gnu/*.so.* /lib/i386-linux-gnu +lib/lib*.so.* diff -rupN original/debian/ntfs-3g-udeb.install.in changes/debian/ntfs-3g-udeb.install.in --- original/debian/ntfs-3g-udeb.install.in 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/ntfs-3g-udeb.install.in 2012-09-25 18:29:13.000000000 +0200 @@ -1,4 +0,0 @@ -bin/ntfs-3g -sbin/mount.* -sbin/ntfsresize -usr/lib/@DEB_HOST_MULTIARCH@/*.so.* /lib/@DEB_HOST_MULTIARCH@ diff -rupN original/debian/rules changes/debian/rules --- original/debian/rules 2012-09-25 18:37:45.000000000 +0200 +++ changes/debian/rules 2012-09-25 18:26:08.000000000 +0200 @@ -3,9 +3,6 @@ SHELL := sh -e DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -export DEB_BUILD_MAINT_OPTIONS = hardening=+all ifeq ($(DEB_HOST_ARCH_OS), linux) CONFIGURE_FLAGS = --enable-posix-acls @@ -17,16 +14,6 @@ upstream: %: dh ${@} --with autotools_dev -override_dh_auto_clean: - dh_auto_clean - - for _FILE in debian/*.in; \ - do \ - rm -f debian/$$(basename $${_FILE} .in); \ - sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ - $${_FILE} > debian/$$(basename $${_FILE} .in); \ - done - override_dh_auto_configure: dh_auto_configure -- --exec-prefix=/ --enable-crypto --enable-extras --enable-xattr-mappings --disable-ldconfig --with-fuse=external $(CONFIGURE_FLAGS) @@ -43,7 +30,7 @@ override_dh_auto_install: install -D -m 0755 debian/local/ntfs-3g.local-bottom debian/ntfs-3g/usr/share/initramfs-tools/scripts/local-bottom/ntfs_3g # removing unused files - rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la + rm -f debian/tmp/lib/*.la # removing rpath for _PROGRAM in \ @@ -79,13 +66,6 @@ override_dh_builddeb: dh_builddeb -pntfs-3g-udeb -- -Zxz -z9 dh_builddeb --remaining-packages -- -Zgzip -z9 -override_dh_gencontrol: -ifeq ($(DEB_HOST_ARCH_OS),) - dh_gencontrol -else - dh_gencontrol -- -Vmultiarch:Pre-Depends="multiarch-support" -endif - override_dh_installchangelogs: dh_installchangelogs debian/local/changelog @@ -96,7 +76,7 @@ override_dh_link: rm -rf debian/ntfs-3g-dev/usr/share/doc # correcting symlink target - dh_link -pntfs-3g-dev lib/$(DEB_HOST_MULTIARCH)/$$(basename $$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libntfs-3g.so)) usr/lib/$(DEB_HOST_MULTIARCH)/libntfs-3g.so + dh_link -pntfs-3g-dev lib/$$(basename $$(readlink debian/tmp/lib/libntfs-3g.so)) usr/lib/libntfs-3g.so dh_link --remaining-packages