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=b5339be262e17e698b7a988a628590d690b123df;hp=6374d4be05b9ee663ecfd84fb32d2df79788866e;hb=582e963f4aa62c9c6957c3868d487a82385cc5a1;hpb=16e41b6b9b1961fbd755a85639bbc2e282b3c67c diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch index 6374d4b..b5339be 100644 --- a/debian/patches/08-dont-build-getkversion.patch +++ b/debian/patches/08-dont-build-getkversion.patch @@ -1,8 +1,8 @@ -Index: nfs-utils-1.0.10/configure.in +Index: nfs-utils-1.0.11~git-20060117/configure.in =================================================================== ---- nfs-utils-1.0.10.orig/configure.in -+++ nfs-utils-1.0.10/configure.in -@@ -317,7 +317,6 @@ AC_CONFIG_FILES([ +--- nfs-utils-1.0.11~git-20060117.orig/configure.in ++++ nfs-utils-1.0.11~git-20060117/configure.in +@@ -319,7 +319,6 @@ AC_CONFIG_FILES([ support/nfs/Makefile tools/Makefile tools/getiversion/Makefile @@ -10,10 +10,10 @@ Index: nfs-utils-1.0.10/configure.in tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile -Index: nfs-utils-1.0.10/tools/Makefile.am +Index: nfs-utils-1.0.11~git-20060117/tools/Makefile.am =================================================================== ---- nfs-utils-1.0.10.orig/tools/Makefile.am -+++ nfs-utils-1.0.10/tools/Makefile.am +--- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.am ++++ nfs-utils-1.0.11~git-20060117/tools/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in @@ -21,33 +21,20 @@ Index: nfs-utils-1.0.10/tools/Makefile.am +SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest MAINTAINERCLEANFILES = Makefile.in -Index: nfs-utils-1.0.10/tools/Makefile.in +Index: nfs-utils-1.0.11~git-20060117/configure =================================================================== ---- nfs-utils-1.0.10.orig/tools/Makefile.in -+++ nfs-utils-1.0.10/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 - -Index: nfs-utils-1.0.10/configure -=================================================================== ---- nfs-utils-1.0.10.orig/configure -+++ nfs-utils-1.0.10/configure -@@ -30603,7 +30603,7 @@ AM_CFLAGS="$my_am_cflags" +--- nfs-utils-1.0.11~git-20060117.orig/configure ++++ nfs-utils-1.0.11~git-20060117/configure +@@ -28722,7 +28722,7 @@ AM_CFLAGS="$my_am_cflags" 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" +-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/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/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 +31225,6 @@ do +@@ -29357,7 +29357,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" ;; @@ -55,3 +42,16 @@ Index: nfs-utils-1.0.10/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-20060117/tools/Makefile.in +=================================================================== +--- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.in ++++ nfs-utils-1.0.11~git-20060117/tools/Makefile.in +@@ -204,7 +204,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 +