Merge branch 'new-master'

Conflicts:
	debian/changelog

8 files changed, 80 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 0ae9b6e..5df58fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+inotify-tools (3.13-4) UNRELEASED; urgency=low
+
+  * debian/source/format now set to 3.0 (quilt)
+    - remove quilt from Build-Deps and rules file as dpkg handles this
+  * move git repository to collab-maint
+  * remove dh_make comments from d/watch
+  * Include NMU thanks to Moritz Muehlenhoff
+  * Add patch to fix spelling of writable
+  * Update Standards-Version to 3.9.3
+  * Add dependency from libinotifytools0-dev for symlinking to
+     the file in libinotifytools0
+  * Add patch documenting inode behavior, thanks to Ondřej Kuzník
+    (Closes: #594163)
+
+ -- Ryan Niebur <ryan@debian.org>  Mon, 18 Jun 2012 02:21:50 -0700
+
 inotify-tools (3.13-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 108359c..f644fde 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: inotify-tools
 Section: misc
 Priority: optional
 Maintainer: Ryan Niebur <ryan@debian.org>
-Build-Depends: debhelper (>= 7), doxygen, autotools-dev, linux-libc-dev | linux-kernel-headers (>= 2.6.18), quilt (>= 0.46-7)
-Standards-Version: 3.8.3
-Vcs-Git: git://git.ryan52.info/git/inotify-tools
-Vcs-Browser: http://git.ryan52.info/?p=inotify-tools;a=summary
+Build-Depends: debhelper (>= 7.0.50~), doxygen, autotools-dev, linux-libc-dev | linux-kernel-headers (>= 2.6.18)
+Standards-Version: 3.9.3
+Vcs-Git: git://anonscm.debian.org/git/collab-maint/inotify-tools.git/
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/inotify-tools.git;a=summary
 Homepage: http://inotify-tools.sourceforge.net/
 
 Package: libinotifytools0
@@ -27,7 +27,7 @@ Section: libdevel
 Provides: libinotifytools-dev
 Conflicts: libinotifytools-dev
 Replaces: inotify-tools (<< 3.10-2)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libinotifytools0 (= ${binary:Version})
 Description: Development library and header files for libinotifytools0
  Headers, static libraries, and documentation for the libinotifytools
  library.
diff --git a/debian/patches/document-files-handled-by-their-inodes b/debian/patches/document-files-handled-by-their-inodes
new file mode 100644
index 0000000..c041892
--- /dev/null
+++ b/debian/patches/document-files-handled-by-their-inodes
@@ -0,0 +1,39 @@
+Index: inotify-tools/man/inotifywait.1
+===================================================================
+--- inotify-tools.orig/man/inotifywait.1	2012-06-18 02:15:54.000000000 -0700
++++ inotify-tools/man/inotifywait.1	2012-06-18 02:20:15.000000000 -0700
+@@ -320,6 +320,14 @@
+ DELETE badfile
+ .fi
+ 
++.SH CAVEATS
++
++When using inotifywait, the filename that is outputted is not
++guaranteed to be up to date after a move because it is the inode that
++is being monitored. Additionaly, none of the observed operations are
++guaranteed to have been performed on the filename inotifywait was
++instructed to monitor in cases when the file is known by several names
++in the filesystem.
+ 
+ .SH BUGS
+ There are race conditions in the recursive directory watching code
+Index: inotify-tools/man/inotifywatch.1
+===================================================================
+--- inotify-tools.orig/man/inotifywatch.1	2012-06-18 02:15:54.000000000 -0700
++++ inotify-tools/man/inotifywatch.1	2012-06-18 02:20:30.000000000 -0700
+@@ -254,6 +254,15 @@
+ 2      2       0       /home/rohan/.beagle/Indexes/KMailIndex/SecondaryIndex/
+ .fi
+ 
++.SH CAVEATS
++
++When using inotifywatch, the filename that is outputted is not
++guaranteed to be up to date after a move because it is the inode that
++is being monitored. Additionaly, none of the observed operations are
++guaranteed to have been performed on the filename inotifywatch was
++instructed to monitor in cases when the file is known by several names
++in the filesystem.
++
+ .SH BUGS
+ There are race conditions in the recursive directory watching code
+ which can cause events to be missed if they occur in a directory immediately
diff --git a/debian/patches/fix-spelling-of-writable.patch b/debian/patches/fix-spelling-of-writable.patch
new file mode 100644
index 0000000..04e2451
--- /dev/null
+++ b/debian/patches/fix-spelling-of-writable.patch
@@ -0,0 +1,13 @@
+Index: inotify-tools/src/common.c
+===================================================================
+--- inotify-tools.orig/src/common.c	2012-01-31 08:57:59.000000000 -0800
++++ inotify-tools/src/common.c	2012-06-18 02:10:25.000000000 -0700
+@@ -26,7 +26,7 @@
+ 	printf("\tmodify\t\tfile or directory contents were written\n");
+ 	printf("\tattrib\t\tfile or directory attributes changed\n");
+ 	printf("\tclose_write\tfile or directory closed, after being opened in\n"
+-	       "\t           \twriteable mode\n");
++	       "\t           \twritable mode\n");
+ 	printf("\tclose_nowrite\tfile or directory closed, after being opened in\n"
+ 	       "\t           \tread-only mode\n");
+ 	printf("\tclose\t\tfile or directory closed, regardless of read/write "
diff --git a/debian/patches/series b/debian/patches/series
index c5fe576..ddf6cd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 fix-segfault-csv.patch
 fix-ftbfs.patch
 fix-hyphens-in-manpages
+fix-spelling-of-writable.patch
+document-files-handled-by-their-inodes
diff --git a/debian/rules b/debian/rules
index 76053a3..2baf6ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index ea63b4c..a9e24fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,12 +1,5 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
 http://sf.net/inotify-tools/inotify-tools-(.*)\.tar\.gz