#include <hallo.h> * "Adam Cécile (Le_Vert)" [Mon, Mar 21 2011, 12:56:42AM]: > Hey, > > Please go ahead, thanks.
Done, after applying a minor typo fix from Ubuntu guys. Final interdiff attached. There was no response yet but that has been expected because of the FTPMaster meeting happening right now. G'day, Eduard.
diff -u ntfs-3g-2010.3.6/debian/25-ntfs-3g-policy.fdi ntfs-3g-2011.1.15/debian/25-ntfs-3g-policy.fdi --- ntfs-3g-2010.3.6/debian/25-ntfs-3g-policy.fdi +++ ntfs-3g-2011.1.15/debian/25-ntfs-3g-policy.fdi @@ -26,7 +26,7 @@ <append key="volume.mount.valid_options" type="strlist">locale=</append> <append key="volume.mount.valid_options" type="strlist">streams_interface=</append> <append key="volume.mount.valid_options" type="strlist">debug</append> - <append key="volume.mount.valid_options" type="strlist">no_detatch</append> + <append key="volume.mount.valid_options" type="strlist">no_detach</append> <append key="volume.mount.valid_options" type="strlist">sync</append> <append key="volume.mount.valid_options" type="strlist">dirsync</append> <append key="volume.mount.valid_options" type="strlist">nodiratime</append> diff -u ntfs-3g-2010.3.6/debian/rules ntfs-3g-2011.1.15/debian/rules --- ntfs-3g-2010.3.6/debian/rules +++ ntfs-3g-2011.1.15/debian/rules @@ -3,7 +3,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -# We'll symlink /usr/share/doc/<package> to the libntfs-3g75 one +# We'll symlink /usr/share/doc/<package> to the libntfs-3g80 one # So we need a list of available packages PKG_LIST = libntfs-3g-dev ntfs-3g @@ -13,6 +13,10 @@ else CFLAGS += -O2 endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif config.status: configure dh_testdir diff -u ntfs-3g-2010.3.6/debian/ntfs-3g.links ntfs-3g-2011.1.15/debian/ntfs-3g.links --- ntfs-3g-2010.3.6/debian/ntfs-3g.links +++ ntfs-3g-2011.1.15/debian/ntfs-3g.links @@ -1,2 +1,2 @@ -/usr/share/doc/libntfs-3g75 /usr/share/doc/ntfs-3g +/usr/share/doc/libntfs-3g80 /usr/share/doc/ntfs-3g /sbin/mount.ntfs-3g /sbin/mount.ntfs diff -u ntfs-3g-2010.3.6/debian/libntfs-3g-dev.links ntfs-3g-2011.1.15/debian/libntfs-3g-dev.links --- ntfs-3g-2010.3.6/debian/libntfs-3g-dev.links +++ ntfs-3g-2011.1.15/debian/libntfs-3g-dev.links @@ -1 +1 @@ -/usr/share/doc/libntfs-3g75 /usr/share/doc/libntfs-3g-dev +/usr/share/doc/libntfs-3g80 /usr/share/doc/libntfs-3g-dev diff -u ntfs-3g-2010.3.6/debian/changelog ntfs-3g-2011.1.15/debian/changelog --- ntfs-3g-2010.3.6/debian/changelog +++ ntfs-3g-2011.1.15/debian/changelog @@ -1,3 +1,23 @@ +ntfs-3g (1:2011.1.15-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream release (closes: #596361) + * Updated changes/ChangeLog + * Added support for parallel in DEB_BUILD_OPTIONS + * Fix "no_detatch" -> "no_detach" typo in HAL fdi file (from Ubuntu) + + -- Eduard Bloch <bl...@debian.org> Fri, 18 Mar 2011 00:04:24 +0100 + +ntfs-3g (1:2010.10.2-0.1) experimental; urgency=low + + * Non-maintainer upload. + * New upstream release (Closes: #596361). + * Update library package name from libntfs-3g75 to libntfs-3g80. + * Update changes/ChangeLog for latest upstream release. + * Bump Standards-Version to 3.9.1. + + -- Michael Biebl <bi...@debian.org> Wed, 27 Oct 2010 22:01:07 +0200 + ntfs-3g (1:2010.3.6-1) unstable; urgency=low * Ack previous NMU, thanks Michael. reverted: --- ntfs-3g-2010.3.6/debian/libntfs-3g75.install +++ ntfs-3g-2010.3.6.orig/debian/libntfs-3g75.install @@ -1 +0,0 @@ -usr/lib/lib*.so.* reverted: --- ntfs-3g-2010.3.6/debian/libntfs-3g75.docs +++ ntfs-3g-2010.3.6.orig/debian/libntfs-3g75.docs @@ -1,4 +0,0 @@ -NEWS -README -debian/README.Debian -debian/NEWS.Debian diff -u ntfs-3g-2010.3.6/debian/control ntfs-3g-2011.1.15/debian/control --- ntfs-3g-2010.3.6/debian/control +++ ntfs-3g-2011.1.15/debian/control @@ -4,7 +4,7 @@ Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net> Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, chrpath Homepage: http://www.ntfs-3g.org/ -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Package: ntfs-3g Architecture: any @@ -28,7 +28,7 @@ Package: libntfs-3g-dev Section: libdevel Architecture: any -Depends: libntfs-3g75 (= ${binary:Version}), ${misc:Depends} +Depends: libntfs-3g80 (= ${binary:Version}), ${misc:Depends} Description: ntfs-3g filesystem in userspace (FUSE) library headers 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 @@ -46,9 +46,9 @@ if you are already running Debian Etch kernel or newer. . This package contains the library headers for developing programs using - libntfs-3g75. + libntfs-3g80. -Package: libntfs-3g75 +Package: libntfs-3g80 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff -u ntfs-3g-2010.3.6/debian/changes/ChangeLog ntfs-3g-2011.1.15/debian/changes/ChangeLog --- ntfs-3g-2010.3.6/debian/changes/ChangeLog +++ ntfs-3g-2011.1.15/debian/changes/ChangeLog @@ -1,3 +1,104 @@ +STABLE Version 2011.1.15 (January 23, 2011) + + * New: implemented fsync() and fsyncdir(). + * New: implemented the ’sync’ mount option. + * New: sanity check upcase table. + * New: added a big-endian extended attribute name for attrib and times. + * New: added an extended attribute name for creation time. + * New: enable renaming of system extended attributes. + * Change: improved appending data to fragmented files. + * Change: improved rebuilding a runlist. + * Change: improved comparing filenames on big-endian CPUs. + * Fixed stat(2) for system files with no data. + * Fixed alignment on cached structures. + * Fixed Posix ACLs for big-endian CPUs. + * Fixed deleting files using ignore_case option. + * Fixed allocated size when an attribute update causes unnamed data to be expelled. + +STABLE Version 2010.10.2 (October 3, 2010) + + * Fixed filename encoding when standard functions are not available. + * Fixed checking mounted device status on some non-Linux platforms. + * Fixed mounting with SELinux context. + * Fixed -n and –no-mtab mount option handling, needed by automount. + * Improved consistency checks of POSIX ACLs. + * NTFS-3G manual update. + +STABLE Version 2010.8.8 (August 8, 2010) + + * New: Full, transparent, read-write compression support. + * New: Two new mount options: compression and nocompression (default). + * New: Introduced windows_names mount option to enforce only Windows names. + * Change: Re-enabled compression in root directory. + * Change: Reversed default for showing/hiding hidden files. + * Change: Redefined default user mapping. + * Change: Marked files whose name has a dot initial as “hidden” if option hide_dot_files is used. + * Change: Renamed option default_permissions to permissions. + * Fixed use of utimensat() with external fuse older than 2.8. + * Fixed a hang when reading a corrupt compressed file. + * Fixed a possible crash when creating a stream. + * Fixed all reported and found compressed write related bugs. + * Fixed partially overwriting sparse clusters on highly fragmented volumes. + * Fixed checking write errors in setxattr(). + * Fixed processing end of partial runlist for compressed files. + * Fixed updating file compressed sizes. + * Fixed checking the device mount state. + * Fixed processing of options silent and no_def_opts. + * Fixed excessive cluster allocation within big holes. + * Fixed creating empty encrypted extended attributes. + * Fixed too permissive sanity check before compressing. + * Fixed error returns when writing compressed data. + * Fixed sanity checked when closing a compressed file. + * Fixed zeroing the end of an ex-hole cluster of compressed files. + * Improved sanity checks on security descriptors. + +TEST Version 2010.7.23-RC (July 23, 2010) + + * Fixed partially overwriting sparse clusters on highly fragmented volumes. + * Fixed checking write errors in setxattr(). + * Fixed processing end of partial runlist for compressed files. + * Fixed updating file compressed sizes. + * Fixed checking the device mount state. + * Fixed processing of options silent and no_def_opts. + * Fixed excessive cluster allocation within big holes. + * Fixed creating empty encrypted extended attributes. + * Fixed too permissive sanity check before compressing. + * Fixed error returns when writing compressed data. + * Fixed sanity checked when closing a compressed file. + * Improved sanity checks on security descriptors. + +TEST Version 2010.6.31-RC (June 30, 2010) + + * New: Full, transparent, read-write compression support. + * New: Two new mount options: compression and nocompression (default). + * New: Introduced windows_names mount option to enforce only Windows names. + * Change: Re-enabled compression in root directory. + * Change: Reversed default for showing/hiding hidden files. + * Change: Redefined default user mapping. + * Change: Marked files whose name has a dot initial as “hidden” if option hide_dot_files is used. + * Change: Renamed option default_permissions to permissions. + * Fixed use of utimensat() with external fuse older than 2.8. + * Fixed a hang when reading a corrupt compressed file. + * Fixed a possible crash when creating a stream. + * Fixed all reported and found compressed write related bugs. + +STABLE Version 2010.5.22 (May 31, 2010) + + * Fixed build to create missing usermap and secaudit. + +STABLE Version 2010.5.16 (May 16, 2010) + + * Fixed a compilation issue with uClibc. + * Fixed modifying the read-only flag on a directory. + * Fixed a bug in ACL inheritance. + * Fixed a bad condition for security descriptor upgrade. + * Fixed a possible index block with no key in $SII. + * Fixed the condition for executing utime() and utimensat(). + * Fixed wrong flags when uid/gid are forced in mount options. + * Fixed a bad error checking when closing a compressed file. + * Fixed compiler warnings on OpenSolaris. + * Fixed conditional code for self-test in secaudit. + STABLE Version 2010.3.6 (March 7, 2010) New: Support Object Identifiers which are used by Windows for shortcuts and caused CHKDSK warnings when the target was deleted. only in patch2: unchanged: --- ntfs-3g-2011.1.15.orig/debian/libntfs-3g80.install +++ ntfs-3g-2011.1.15/debian/libntfs-3g80.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* only in patch2: unchanged: --- ntfs-3g-2011.1.15.orig/debian/libntfs-3g80.docs +++ ntfs-3g-2011.1.15/debian/libntfs-3g80.docs @@ -0,0 +1,4 @@ +NEWS +README +debian/README.Debian +debian/NEWS.Debian