Update other patches.

diff --git a/debian/changelog b/debian/changelog
index 54eef7c4071e473d1c7847b5d35bbd4d5ad9d7c3..ace5d5c19c594772c89696559a3535301e2c2d18 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
 
   * New upstream version
     - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.
 
   * New upstream version
     - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.

+    - Update other patches.

   * Check for blank exports file (Closes: #673798).
 
  -- Luk Claes <luk@debian.org>  Fri, 25 May 2012 19:16:54 +0200
   * Check for blank exports file (Closes: #673798).
 
  -- Luk Claes <luk@debian.org>  Fri, 25 May 2012 19:16:54 +0200

diff --git a/debian/patches/11-532048-reduce-verbosity.patch b/debian/patches/11-532048-reduce-verbosity.patch
index ecb2bb1e959eb0a8062450384b506b6d91a41108..c303c8bd6f65ba49cabec16b041cec72da31756b 100644 (file)
--- a/debian/patches/11-532048-reduce-verbosity.patch
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -37,7 +37,7 @@ Steve Langasek <steve.langasek@canonical.com>
        }
  
        if (!authgss_get_private_data(auth, &pd)) {
        }
  
        if (!authgss_get_private_data(auth, &pd)) {

--              printerr(0, "WARNING: Failed to obtain authentication "
+-              printerr(1, "WARNING: Failed to obtain authentication "

 +              printerr(2, "WARNING: Failed to obtain authentication "
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
 +              printerr(2, "WARNING: Failed to obtain authentication "
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);

diff --git a/debian/patches/17-multiarch-kerberos-paths.patch b/debian/patches/17-multiarch-kerberos-paths.patch
index 6f3365ccb8b0005e3d3eae3587475ddb712d5057..92f01c1e47311e0b1c2f098eac0e2a8025291a19 100644 (file)
--- a/debian/patches/17-multiarch-kerberos-paths.patch
+++ b/debian/patches/17-multiarch-kerberos-paths.patch
@@ -7,7 +7,7 @@
 +    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
      if test "$K5CONFIG" != ""; then
        KRBCFLAGS=`$K5CONFIG --cflags`
 +    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
      if test "$K5CONFIG" != ""; then
        KRBCFLAGS=`$K5CONFIG --cflags`

-       KRBLIBS=`$K5CONFIG --libs gssapi`
+       KRBLIBS=`$K5CONFIG --libs`

 @@ -38,6 +39,7 @@
                  \( -f $dir/lib/libgssapi_krb5.a -o \
                     -f $dir/lib64/libgssapi_krb5.a -o \
 @@ -38,6 +39,7 @@
                  \( -f $dir/lib/libgssapi_krb5.a -o \
                     -f $dir/lib64/libgssapi_krb5.a -o \

diff --git a/debian/patches/series b/debian/patches/series
index 14b84c17d4dac9a803c45e7524dc4f9f1a43fde2..e05755be28305c2bf621aee393afd50a723b9aed 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 11-532048-reduce-verbosity.patch
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch
 11-532048-reduce-verbosity.patch
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch

-18-dont-use-PAGE_SIZE.patch