diff -u ntfs-3g-2009.4.4/debian/libntfs-3g54.install ntfs-3g-2009.4.4/debian/libntfs-3g54.install --- ntfs-3g-2009.4.4/debian/libntfs-3g54.install +++ ntfs-3g-2009.4.4/debian/libntfs-3g54.install @@ -1 +1 @@ -usr/lib/lib*.so.* +lib/lib*.so.* diff -u ntfs-3g-2009.4.4/debian/ntfs-3g.install ntfs-3g-2009.4.4/debian/ntfs-3g.install --- ntfs-3g-2009.4.4/debian/ntfs-3g.install +++ ntfs-3g-2009.4.4/debian/ntfs-3g.install @@ -1,3 +1,3 @@ sbin/ -usr/bin/ +bin/ usr/share/ diff -u ntfs-3g-2009.4.4/debian/control ntfs-3g-2009.4.4/debian/control --- ntfs-3g-2009.4.4/debian/control +++ ntfs-3g-2009.4.4/debian/control @@ -1,14 +1,16 @@ Source: ntfs-3g Section: otherosfs Priority: optional -Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, chrpath +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Adam Cécile (Le_Vert) +Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, chrpath, libfuse-dev (>= 2.7.0-1ubuntu5) Homepage: http://www.ntfs-3g.org/ Standards-Version: 3.8.1 Package: ntfs-3g Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: fuse-utils +Depends: ${shlibs:Depends}, ${misc:Depends}, initramfs-tools Description: read-write NTFS driver for FUSE The ntfs-3g driver is an open source, GPL licensed, third generation Linux NTFS driver which was implemented by the Linux-NTFS project. It provides @@ -71,0 +74,14 @@ + +Package: ntfs-3g-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: fuse-utils-udeb, ${shlibs:Depends} +Description: read-write NTFS driver for FUSE + +Package: libntfs-3g54-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: ${shlibs:Depends} +Description: ntfs-3g filesystem in userspace (FUSE) library diff -u ntfs-3g-2009.4.4/debian/libntfs-3g-dev.install ntfs-3g-2009.4.4/debian/libntfs-3g-dev.install --- ntfs-3g-2009.4.4/debian/libntfs-3g-dev.install +++ ntfs-3g-2009.4.4/debian/libntfs-3g-dev.install @@ -2,2 +2,2 @@ -usr/lib/pkgconfig -usr/lib/lib*.so +lib/pkgconfig usr/lib +lib/lib*.so usr/lib diff -u ntfs-3g-2009.4.4/debian/ntfs-3g.links ntfs-3g-2009.4.4/debian/ntfs-3g.links --- ntfs-3g-2009.4.4/debian/ntfs-3g.links +++ ntfs-3g-2009.4.4/debian/ntfs-3g.links @@ -1,0 +2,2 @@ +/bin/ntfs-3g /sbin/mount.ntfs +/usr/share/man/man8/ntfs-3g.8.gz /usr/share/man/man8/mount.ntfs.8.gz diff -u ntfs-3g-2009.4.4/debian/changelog ntfs-3g-2009.4.4/debian/changelog --- ntfs-3g-2009.4.4/debian/changelog +++ ntfs-3g-2009.4.4/debian/changelog @@ -1,3 +1,25 @@ +ntfs-3g (1:2009.4.4-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #349569), remaining changes: + - Install to /bin and /lib rather than /usr/bin and /usr/lib. + - Create libntfs3g54-udeb and ntfs-3g-udeb packages. + - Build with external FUSE and pre-depend on fuse-utils. + - debian/control: ntfs-3g depends on initramfs-tools. It calls + update-initramfs from the postinst, which can potentially lead to an + unbootable system. ("udevadm trigger is not premitted while udev + is unconfigured".) + - Copy ntfs-3g into the initramfs. If ntfs-3g is used to mount the root + filesystem (either directly or via a loopback mount), load the fuse + module beforehand, and save ntfs-3g's PID (indirectly) in + /var/run/sendsigs.omit. + - debian/rules: + + Don't install HAL fdi file. Mounting is done via devkit-disks now. + - debian/ntfs-3g.links: + + Create /sbin/mount.ntfs symlink. + + Add a symlink for the mount.ntfs manpage. + + -- Chris Coulson Sat, 06 Jun 2009 20:07:20 +0100 + ntfs-3g (1:2009.4.4-1) unstable; urgency=low * New upstream release (Closes: #523987). @@ -16,6 +38,66 @@ -- Adam Cécile (Le_Vert) Fri, 13 Mar 2009 21:57:11 +0100 +ntfs-3g (1:2009.2.1-0ubuntu2) jaunty; urgency=low + + * debian/control: add initramfs-tools to Depends for ntfs-3g. It + calls update-initramfs from the postinst, which can potentially + lead to an unbootable system. ("udevadm trigger is not premitted + while udev is unconfigured".) + + -- Kees Cook Thu, 09 Apr 2009 11:39:08 -0700 + +ntfs-3g (1:2009.2.1-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - The 'recover' and 'norecover' mount options were introduced. + The former option will casue the driver to recover and repair a + corrupted or inconsistent NTFS volume if it's possible. The + default behaviour is 'recover' (fixes LP: #175503). + - The user extended attribute namespace is supported by default. + - A volume having unclean journal file is recovered and mounted by + default. The 'norecover' mount option can disable this. + * Updated due to SO version bump: + - debian/control, debian/rules, libntfs-3g49.docs, + libntfs-3g49.install, libntfs-3g49-udeb.install, + libntfs-3g-dev.links, ntfs-3g.links + * debian/changes/Changelog: + - Updated to document new upstream changes. + * debian/25-ntfs-3g-policy.fdi: + - Updated to expose new 'recover' and 'norecover' options via HAL. + + -- Chris Coulson Sun, 15 Feb 2009 20:15:24 +0000 + +ntfs-3g (1:2009.1.1-0ubuntu1) jaunty; urgency=low + + * New upstream version (LP: #320031): + - Built-in, transparent UTF-8 conversion support. + - The 'locale=' mount option is not used anymore for filename + characterset conversion. Filenames are always converted to UTF-8. + - Support for unlimited file ane directory creation. + * Updated files due to SO version bump: + - debian/control, debian/rules, libntfs-3g48.docs, + libntfs-3g48.install, libntfs-3g48-udeb.install, + libntfs-3g-dev.links, ntfs-3g.links + * debian/25-ntfs-3g-policy.fdi: + - Renamed, as policies now have to be applied after + 20-storage-methods.fdi. + - Updated for objects where "volume.fstype=ntfs": + - Make ntfs-3g the default driver and make the old ntfs + driver an alternative. + - This is because HAL will no longer mount a volume with a + filesystem driver that is different to what is specified in + "volume.fstype", unless it is explicitly defined in + "volume.fstype.alternatives". By default, gnome-mount + attempts to mount ntfs volumes with the ntfs-3g driver. + This change makes this work properly again, and makes + it possible for users to choose the old ntfs driver too. + (fixes LP: #300443) + * debian/changes/Changelog: + - Updated to document new upstream changes. + + -- Chris Coulson Thu, 22 Jan 2009 20:31:21 +0000 + ntfs-3g (1:1.2918-1) experimental; urgency=low * New upstream release. @@ -31,6 +113,50 @@ -- Adam Cécile (Le_Vert) Wed, 13 Aug 2008 23:49:43 +0200 +ntfs-3g (1:1.2531-1.1ubuntu2) jaunty; urgency=low + + * Fix a couple of stray mentions of libntfs-3g28 in debian/rules to read + libntfs-3g31 instead. + + -- Colin Watson Sat, 22 Nov 2008 23:01:39 +0000 + +ntfs-3g (1:1.2531-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #298141): + - Add udeb shlibs entries for libntfs-3g31-udeb. + - Create libntfs3g31-udeb and ntfs-3g-udeb. + - Copy ntfs-3g into the initramfs. If ntfs-3g is used to mount the root + filesystem (either directly or via a loopback mount), load the fuse + module beforehand, and save ntfs-3g's PID (indirectly) in + /var/run/sendsigs.omit. + - Move ntfs-3g to /bin. + - Move libntfs-3g.so.* to /lib. Adjust libntfs-3g.so symlink to match. + - Add /sbin/mount.ntfs symlink to /bin/ntfs-3g. + - Add a symlink for the mount.ntfs manual page too. + - Pass basenames rather than full paths to pidof; create + /dev/.initramfs/varrun if necessary. + - Always add ntfs and ntfs-3g to sendsigs.omit. + - Build against the external fuse libraries and add dependency on + fuse-utils. + - Ensure ntfs-3g flushed dirty write data back to device + added ntfs-3f mount option "syncio" which opens the underlying + filesystem used by fuse with O_SYNC to ensure dirty write data is + written back to ntfs immediately. This allows us to remove the + vm.dirty sysctl hacks from wubi. + + -- Chris Coulson Fri, 14 Nov 2008 18:18:03 +0000 + +ntfs-3g (1:1.2531-1.1) unstable; urgency=low + + * Non-maintainer upload. + * The hal standard configuration no longer allows the 'locale=' mount option + for NTFS, as the Linux kernel NTFS driver does not support this option. + As a workaround we install our own fdi file 20-ntfs-3g-policy.fdi to + /usr/share/hal/fdi/policy/10osvendor which will add this mount option back + and make hal use ntfs-3g as default fs driver. + + -- Michael Biebl Sat, 25 Oct 2008 14:28:01 +0200 + ntfs-3g (1:1.2531-1) unstable; urgency=low * New upstream release. @@ -39,6 +165,39 @@ -- Adam Cécile (Le_Vert) Mon, 23 Jun 2008 22:18:49 +0200 +ntfs-3g (1:1.2506-1ubuntu2) intrepid; urgency=low + + * Ensure ntfs-3g flushed dirty write data back to device + added ntfs-3f mount option "syncio" which opens the underlying + filesystem used by fuse with O_SYNC to ensure dirty write data is + written back to ntfs immediately. This allows us to remove the + vm.dirty sysctl hacks from wubi. (LP: #204133) + + -- Colin King Wed, 09 Jul 2008 14:34:56 +0100 + +ntfs-3g (1:1.2506-1ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add udeb shlibs entries for libntfs-3g28-udeb. + - Bump debhelper build-dependency to 5.0.22 for dh_makeshlibs + --add-udeb. + - Create libntfs3g28-udeb and ntfs-3g-udeb. + - Copy ntfs-3g into the initramfs. If ntfs-3g is used to mount the root + filesystem (either directly or via a loopback mount), load the fuse + module beforehand, and save ntfs-3g's PID (indirectly) in + /var/run/sendsigs.omit. + - Move ntfs-3g to /bin. + - Move libntfs-3g.so.* to /lib. Adjust libntfs-3g.so symlink to match. + - Add /sbin/mount.ntfs symlink to /bin/ntfs-3g. + - Add a symlink for the mount.ntfs manual page too. + - Pass basenames rather than full paths to pidof; create + /dev/.initramfs/varrun if necessary (LP #150831). + - Always add ntfs and ntfs-3g to sendsigs.omit (LP #181669). + - Build against the external fuse libraries and add dependency on + fuse-utils. + + -- Martin Pitt Mon, 02 Jun 2008 15:55:57 +0200 + ntfs-3g (1:1.2506-1) unstable; urgency=HIGH * Urgency set to HIGH because it fixes a critical issue. @@ -283,0 +443 @@ + diff -u ntfs-3g-2009.4.4/debian/rules ntfs-3g-2009.4.4/debian/rules --- ntfs-3g-2009.4.4/debian/rules +++ ntfs-3g-2009.4.4/debian/rules @@ -25,9 +25,10 @@ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ - --exec-prefix=/usr \ + --exec-prefix=/ \ --mandir=\$${prefix}/share/man \ --disable-ldconfig \ + --with-fuse=external \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,-z,defs" @@ -51,12 +52,21 @@ dh_installdirs mkdir -p $(CURDIR)/debian/tmp/sbin $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - # Install hal fdi file - install -D -m 644 debian/25-ntfs-3g-policy.fdi \ - debian/tmp/usr/share/hal/fdi/policy/10osvendor/25-ntfs-3g-policy.fdi + $(RM) $(CURDIR)/debian/tmp/lib/lib*.so + for i in $(CURDIR)/debian/tmp/lib/lib*.so.*.*.*; do \ + base=$${i##*/}; \ + ln -s /lib/$${base} $(CURDIR)/debian/tmp/lib/$${base%.*.*.*}; \ + done + # Install initramfs hooks and scripts + install -D -m0755 debian/ntfs-3g.initramfs-hook \ + debian/tmp/usr/share/initramfs-tools/hooks/ntfs_3g + install -D -m0755 debian/ntfs-3g.initramfs-premount \ + debian/tmp/usr/share/initramfs-tools/scripts/local-premount/ntfs_3g + install -D -m0755 debian/ntfs-3g.initramfs-bottom \ + debian/tmp/usr/share/initramfs-tools/scripts/local-bottom/ntfs_3g # Remove RPATH from binary - chrpath --delete debian/tmp/usr/bin/ntfs-3g - chrpath --delete debian/tmp/usr/bin/ntfs-3g.probe + chrpath --delete debian/tmp/bin/ntfs-3g + chrpath --delete debian/tmp/bin/ntfs-3g.probe binary-indep: build install binary-arch: build install @@ -74,9 +84,9 @@ dh_strip dh_compress dh_fixperms - dh_makeshlibs + dh_makeshlibs --add-udeb=libntfs-3g54-udeb dh_installdeb - dh_shlibdeps + dh_shlibdeps -Llibntfs-3g54 -ldebian/libntfs-3g54/lib dh_gencontrol dh_md5sums dh_builddeb only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g-udeb.install +++ ntfs-3g-2009.4.4/debian/ntfs-3g-udeb.install @@ -0,0 +1,2 @@ +bin/ntfs-3g +sbin/ only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g.initramfs-premount +++ ntfs-3g-2009.4.4/debian/ntfs-3g.initramfs-premount @@ -0,0 +1,14 @@ +#! /bin/sh + +case $1 in +prereqs) + exit 0 + ;; +esac + +if [ "$ROOTFSTYPE" = ntfs ] || [ "$ROOTFSTYPE" = ntfs-3g ] || \ + [ "$LOOPFSTYPE" = ntfs ] || [ "$LOOPFSTYPE" = ntfs-3g ]; then + modprobe fuse +fi + +exit 0 only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g-udeb.links +++ ntfs-3g-2009.4.4/debian/ntfs-3g-udeb.links @@ -0,0 +1 @@ +/bin/ntfs-3g /sbin/mount.ntfs only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g.initramfs-hook +++ ntfs-3g-2009.4.4/debian/ntfs-3g.initramfs-hook @@ -0,0 +1,22 @@ +#! /bin/sh -e + +PREREQ="fuse_utils" + +prereqs () { + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +copy_exec /bin/ntfs-3g /bin +ln -s /bin/ntfs-3g "$DESTDIR/sbin/mount.ntfs-3g" +ln -s /bin/ntfs-3g "$DESTDIR/sbin/mount.ntfs" + +exit 0 only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g.postinst +++ ntfs-3g-2009.4.4/debian/ntfs-3g.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +if type update-initramfs >/dev/null 2>&1; then + update-initramfs -u +fi + +#DEBHELPER# only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/ntfs-3g.initramfs-bottom +++ ntfs-3g-2009.4.4/debian/ntfs-3g.initramfs-bottom @@ -0,0 +1,13 @@ +#! /bin/sh + +case $1 in +prereqs) + exit 0 + ;; +esac + +mkdir -p /dev/.initramfs/varrun +pidof mount.ntfs >> /dev/.initramfs/varrun/sendsigs.omit +pidof mount.ntfs-3g >> /dev/.initramfs/varrun/sendsigs.omit + +exit 0 only in patch2: unchanged: --- ntfs-3g-2009.4.4.orig/debian/libntfs-3g54-udeb.install +++ ntfs-3g-2009.4.4/debian/libntfs-3g54-udeb.install @@ -0,0 +1 @@ +lib/lib*.so.*