Package: fuse
Version: 2.7.1-1
Severity: wishlist
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
We wanted to ship ntfs-3g by default in Ubuntu. In the process we
observed that one might have a separate /usr but still want to mount an
NTFS filesystem on boot. This is made a lot easier if FUSE is available
on the root filesystem.
The attached patch implements this, and deals with things like moving
any old statoverrides over; would you consider applying it? Note that it
assumes that the version in which it will be applied is 2.7.1-2, and
will need to be updated if that is not true.
This change was originally made by Phillip Lougher.
Thanks,
--
Colin Watson [EMAIL PROTECTED]
diff -u fuse-2.7.1/debian/libfuse2.install fuse-2.7.1/debian/libfuse2.install
--- fuse-2.7.1/debian/libfuse2.install
+++ fuse-2.7.1/debian/libfuse2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/lib*.so.* lib
diff -u fuse-2.7.1/debian/fuse-utils.postinst fuse-2.7.1/debian/fuse-utils.postinst
--- fuse-2.7.1/debian/fuse-utils.postinst
+++ fuse-2.7.1/debian/fuse-utils.postinst
@@ -17,12 +17,17 @@
else
chgrp fuse /dev/fuse
fi
- if ! dpkg-statoverride --list /usr/bin/fusermount >/dev/null; then
- chown root:fuse /usr/bin/fusermount
- chmod 4754 /usr/bin/fusermount
+
+ if ! dpkg-statoverride --list /bin/fusermount >/dev/null; then
+ chown root:fuse /bin/fusermount
+ chmod 4754 /bin/fusermount
fi
chown root:fuse /etc/fuse.conf
chmod 0640 /etc/fuse.conf
+
+ if dpkg --compare-versions "$2" lt 2.7.1-2; then
+ dpkg-statoverride --remove /usr/bin/fusermount || true
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u fuse-2.7.1/debian/fuse-utils.preinst fuse-2.7.1/debian/fuse-utils.preinst
--- fuse-2.7.1/debian/fuse-utils.preinst
+++ fuse-2.7.1/debian/fuse-utils.preinst
@@ -18,6 +18,12 @@
if dpkg --compare-versions $2 lt 2.7.0-3; then
test -d /usr/share/doc/fuse-utils && rm -rf /usr/share/doc/fuse-utils
fi
+ if dpkg --compare-versions $2 lt 2.7.1-2; then
+ stat=`dpkg-statoverride --list /usr/bin/fusermount | sed 's,/usr/bin,/bin,'`
+ if [ "$stat" ]; then
+ dpkg-statoverride --add $stat || true
+ fi
+ fi
fi
#DEBHELPER#
diff -u fuse-2.7.1/debian/fuse-utils.install fuse-2.7.1/debian/fuse-utils.install
--- fuse-2.7.1/debian/fuse-utils.install
+++ fuse-2.7.1/debian/fuse-utils.install
@@ -1,2 +1,2 @@
-usr/bin/fusermount
+bin/fusermount
sbin/mount.fuse
diff -u fuse-2.7.1/debian/fuse-utils.lintian fuse-2.7.1/debian/fuse-utils.lintian
--- fuse-2.7.1/debian/fuse-utils.lintian
+++ fuse-2.7.1/debian/fuse-utils.lintian
@@ -1 +1 @@
-fuse-utils: setuid-binary usr/bin/fusermount 4755 root/root
+fuse-utils: setuid-binary bin/fusermount 4755 root/root
diff -u fuse-2.7.1/debian/rules fuse-2.7.1/debian/rules
--- fuse-2.7.1/debian/rules
+++ fuse-2.7.1/debian/rules
@@ -41,6 +41,7 @@
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --bindir=/bin \
--disable-kernel-module \
--disable-example
@@ -91,6 +92,12 @@
dh_installdirs -pfuse-utils usr/share/lintian/overrides
cp $(CURDIR)/debian/fuse-utils.lintian \
$(CURDIR)/debian/fuse-utils/usr/share/lintian/overrides/fuse-utils
+ $(RM) $(CURDIR)/debian/tmp/usr/lib/libfuse.so
+ $(RM) $(CURDIR)/debian/tmp/usr/lib/libulockmgr.so
+ for i in $(CURDIR)/debian/tmp/usr/lib/lib*.so.*.*.*; do \
+ base=$${i##*/}; \
+ ln -s /lib/$${base} $(CURDIR)/debian/tmp/usr/lib/$${base%.*.*.*}; \
+ done
dh_install -s --source=debian/tmp
install -D -m0640 $(CURDIR)/debian/fuse.conf \
$(CURDIR)/debian/fuse-utils/etc/fuse.conf
@@ -134,7 +141,7 @@
dh_shlibdeps -s
dh_gencontrol -s
dh_md5sums -s
- chmod 4755 debian/fuse-utils/usr/bin/fusermount
+ chmod 4755 debian/fuse-utils/bin/fusermount
dh_builddeb -s
binary-indep: install-indep
