Imported Debian patch 1.0.11~git-20060105-2

diff --git a/debian/changelog b/debian/changelog
index 1b6c5fa7d5a696f888d66705bbf277086fcdb0dd..fe5799ddd829768fa4d58bb67f5e97c96600fb0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.0.11~git-20060105-2) experimental; urgency=low
+
+  * 08-dont-build-getkversion.patch: We missed tools/Makefile.in on last
+    refresh, so it ended up in the .diff.gz. Fix.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri,  5 Jan 2007 13:38:07 +0100
+
 nfs-utils (1:1.0.11~git-20060105-1) experimental; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch
index 20c98e3b779550e452fe1b50cf99bc492816826d..db80383e6903806985715507e9095e1a5bc5b2f3 100644 (file)
--- a/debian/patches/08-dont-build-getkversion.patch
+++ b/debian/patches/08-dont-build-getkversion.patch
@@ -42,3 +42,16 @@ Index: nfs-utils-1.0.11~git-20060105/configure
      "tools/locktest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/locktest/Makefile" ;;
      "tools/nlmtest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nlmtest/Makefile" ;;
      "tools/rpcdebug/Makefile") CONFIG_FILES="$CONFIG_FILES tools/rpcdebug/Makefile" ;;
+Index: nfs-utils-1.0.11~git-20060105/tools/Makefile.in
+===================================================================
+--- nfs-utils-1.0.11~git-20060105.orig/tools/Makefile.in
++++ nfs-utils-1.0.11~git-20060105/tools/Makefile.in
+@@ -207,7 +207,7 @@ statduser = @statduser@
+ statedir = @statedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
++SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
+ MAINTAINERCLEANFILES = Makefile.in
+ all: all-recursive
+ 

diff --git a/tools/Makefile.in b/tools/Makefile.in
index feb08fbf925ce27f561cd805ff325c0b3c96a2af..620f6ff95399328dcf8482f0ed94923e79e1e782 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -207,7 +207,7 @@ statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
+SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive