From: Steinar H. Gunderson Date: Fri, 5 Jan 2007 12:38:07 +0000 (+0100) Subject: Imported Debian patch 1.0.11~git-20060105-2 X-Git-Tag: debian/1%1.0.11_git-20060105-2^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=502ca94daf33c7a15db1b47286aad920338b04fa;p=nfs-utils.git Imported Debian patch 1.0.11~git-20060105-2 --- diff --git a/debian/changelog b/debian/changelog index 1b6c5fa..fe5799d 100644 --- 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 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 20c98e3..db80383 100644 --- 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 feb08fb..620f6ff 100644 --- 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