Imported Debian patch 1.0.10-6~quilt.2

diff --git a/debian/changelog b/debian/changelog
index a67b70cf407280738dae4c06b3f90dec4ad09483..235dd9c7ece9d8271127472c301506e45ebc292b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.0.10-6~quilt.2) experimental; urgency=low
+
+  * 08-dont-build-getkversion.patch: Don't build getkversion, since it fails
+    when trying to build against newer kernel headers; it's not really used in
+    the package anyhow. Adapted from an Ubuntu patch by Tollef Fog Heen.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue,  2 Jan 2007 14:47:36 +0100
+
 nfs-utils (1:1.0.10-6~quilt.1) experimental; urgency=low
 
   * 07-exports-default-options.patch: Support default options in exports(5),

diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch
new file mode 100644 (file)
index 0000000..2a3d5c1
--- /dev/null
+++ b/debian/patches/08-dont-build-getkversion.patch
@@ -0,0 +1,54 @@
+diff -u nfs-utils-1.0.10/debian/changelog nfs-utils-1.0.10/debian/changelog
+--- nfs-utils-1.0.10.orig/configure.in
++++ nfs-utils-1.0.10/configure.in
+@@ -317,7 +317,6 @@
+       support/nfs/Makefile
+       tools/Makefile
+       tools/getiversion/Makefile
+-      tools/getkversion/Makefile
+       tools/locktest/Makefile
+       tools/nlmtest/Makefile
+       tools/rpcdebug/Makefile
+only in patch2:
+unchanged:
+--- nfs-utils-1.0.10.orig/tools/Makefile.am
++++ nfs-utils-1.0.10/tools/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = getiversion getkversion locktest rpcdebug rpcgen nlmtest
++SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+only in patch2:
+unchanged:
+--- nfs-utils-1.0.10.orig/tools/Makefile.in
++++ nfs-utils-1.0.10/tools/Makefile.in
+@@ -207,7 +207,7 @@
+ 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
+ 
+--- nfs-utils-1.0.10.orig/configure
++++ nfs-utils-1.0.10/configure
+@@ -30603,7 +30672,7 @@
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
+ 
+ 
+-ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/getiversion/Makefile tools/getkversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nhfsstone/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile"
++ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/getiversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/lockd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nhfsstone/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -31225,7 +31294,6 @@
+     "support/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES support/nfs/Makefile" ;;
+     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+     "tools/getiversion/Makefile") CONFIG_FILES="$CONFIG_FILES tools/getiversion/Makefile" ;;
+-    "tools/getkversion/Makefile") CONFIG_FILES="$CONFIG_FILES tools/getkversion/Makefile" ;;
+     "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" ;;

diff --git a/debian/patches/series b/debian/patches/series
index 48f21912cb05b9e3bfc4d3af6c747a16f8aef526..03b6c20f665d5d807d867e49db3527dd31f0c060 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 05-refuse-non-ident-maptypes.patch
 06-fix-no-tcp-short-option.patch
 07-exports-default-options.patch
+08-dont-build-getkversion.patch