X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fpatches%2F08-dont-build-getkversion.patch;h=6374d4be05b9ee663ecfd84fb32d2df79788866e;hp=2a3d5c1ee0d5200da81445f9a4c378f4ef7c4c15;hb=16e41b6b9b1961fbd755a85639bbc2e282b3c67c;hpb=4a161b04be2914c7f2a491ac9fac68087e7f82db

diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch
index 2a3d5c1..6374d4b 100644
--- a/debian/patches/08-dont-build-getkversion.patch
+++ b/debian/patches/08-dont-build-getkversion.patch
@@ -1,7 +1,8 @@
-diff -u nfs-utils-1.0.10/debian/changelog nfs-utils-1.0.10/debian/changelog
+Index: nfs-utils-1.0.10/configure.in
+===================================================================
 --- nfs-utils-1.0.10.orig/configure.in
 +++ nfs-utils-1.0.10/configure.in
-@@ -317,7 +317,6 @@
+@@ -317,7 +317,6 @@ AC_CONFIG_FILES([
  	support/nfs/Makefile
  	tools/Makefile
  	tools/getiversion/Makefile
@@ -9,8 +10,8 @@ diff -u nfs-utils-1.0.10/debian/changelog nfs-utils-1.0.10/debian/changelog
  	tools/locktest/Makefile
  	tools/nlmtest/Makefile
  	tools/rpcdebug/Makefile
-only in patch2:
-unchanged:
+Index: nfs-utils-1.0.10/tools/Makefile.am
+===================================================================
 --- nfs-utils-1.0.10.orig/tools/Makefile.am
 +++ nfs-utils-1.0.10/tools/Makefile.am
 @@ -1,5 +1,5 @@
@@ -20,11 +21,11 @@ unchanged:
 +SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest
  
  MAINTAINERCLEANFILES = Makefile.in
-only in patch2:
-unchanged:
+Index: nfs-utils-1.0.10/tools/Makefile.in
+===================================================================
 --- nfs-utils-1.0.10.orig/tools/Makefile.in
 +++ nfs-utils-1.0.10/tools/Makefile.in
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ statduser = @statduser@
  statedir = @statedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -33,9 +34,11 @@ unchanged:
  MAINTAINERCLEANFILES = Makefile.in
  all: all-recursive
  
+Index: nfs-utils-1.0.10/configure
+===================================================================
 --- nfs-utils-1.0.10.orig/configure
 +++ nfs-utils-1.0.10/configure
-@@ -30603,7 +30672,7 @@
+@@ -30603,7 +30603,7 @@ AM_CFLAGS="$my_am_cflags"
  ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
  
  
@@ -44,7 +47,7 @@ unchanged:
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -31225,7 +31294,6 @@
+@@ -31225,7 +31225,6 @@ do
      "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" ;;