-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Bienia
-
Date:
2010-01-13 14:48:39 UTC
-
mfrom:
(1.1.13 upstream)
(2.1.3 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100113144839-qvdpstjm2medx7fz
Tags: 2.8.1-1.1ubuntu1
* Merge with Debian testing (lp: #506958). Remaining changes:
- debian/control: Add Breaks to ensure right version of udev is used.
- Use udev rules instead of init script:
+ Add debian/45-fuse.rules: Put /dev/fuse into group fuse.
+ debian/fuse-utils.postinst: Try to load the fuse module only if it's
still a module, remove it from /etc/modules/ anyway.
+ debian/rules, debian/fuse-utils.install: Don't install the init
script; install the udev rule.
- initramfs support, for booting from ntfs-3g in wubi:
+ debian/fuse-utils.initramfs-hook: Copy /sbin/mount.fuse and the fuse
kernel module into the initramfs. Use manual_add_modules not
force_load; fuse will be loaded automatically if necessary (it's a
built-in in Ubuntu anyway)
+ debian/rules: Install above file into fuse-utils.
+ debian/fuse-utils.postinst: Call update-initramfs.
+ (Forwarded to Debian #505691)
- Create libfuse2-udeb and fuse-utils-udeb. (Forwarded to Debian #505697)
- debian/fuse-utils.install: Install ulockmgr_server.
- debian/{rules,libfuse2.install,fuse-utils.lintian}: Move fusermount and
ulockmgr_server to /bin and associated libraries to /lib. This allows
mounting ntfs filesystems in /etc/fstab. (Debian #452412)
- debian/{rules,fuse-utils.postinst}: Install fusermount with 4755
permissions (remaining change from "Dynamic foreground user access").
- debian/fuse-utils.postinst:
+ Don't fail if udev is running and /dev/fuse does not exist.
(Forwarded to Debian #505685)
- debian/fuse-utils.preinst:
+ Remove the module configuration file on upgrade if unmodified.
+ Remove old rules file if unchanged