Imported Debian patch 1.0.10-6~quilt.3

diff --git a/debian/changelog b/debian/changelog
index 235dd9c7ece9d8271127472c301506e45ebc292b..1e35b6bae65cb8f1e969930a3be9641895663faa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-utils (1:1.0.10-6~quilt.3) experimental; urgency=low
+
+  * Remove obsolete DEB_* variables from debian/rules.
+  * Refresh 08-dont-build-getkversion.patch for consistency.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu,  4 Jan 2007 03:23:45 +0100
+
 nfs-utils (1:1.0.10-6~quilt.2) experimental; urgency=low
 
   * 08-dont-build-getkversion.patch: Don't build getkversion, since it fails

diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch
index 2a3d5c1ee0d5200da81445f9a4c378f4ef7c4c15..6374d4be05b9ee663ecfd84fb32d2df79788866e 100644 (file)
--- 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" ;;

diff --git a/debian/rules b/debian/rules
index d1f160a87d7cd01de74a8ec9ae0fe44add4bf7b4..26168cf9e72083e16dd4b986ae3a6244aa1be6bf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,6 @@
 
 include /usr/share/quilt/quilt.make
 
-DEB_BUILD_GNU_TYPE     := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE      := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH          := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS       := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
 # Temporary root
 DEBTMP := $(shell pwd)/debian/tmp