From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 25 Jul 2007 18:53:05 +0000 (+0200)
Subject: Imported Debian patch 1.1.0-13
X-Git-Tag: debian/1%1.1.0-13^0
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=43930dd61912d0d6edfcf64b18f19b37c9f0c2b6;hp=b81d81eb5700ebf282b8c89967255561011f47ed;p=nfs-utils.git

Imported Debian patch 1.1.0-13
---

diff --git a/debian/changelog b/debian/changelog
index 840d305..b2f8759 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nfs-utils (1:1.1.0-13) unstable; urgency=low
+
+  * 06-gssd-manpage-typo.patch: New patch from A Costa, fixes a typo in the
+    gssd man page. (Closes: #434665) 
+  * Sort debian/patches/series, so the patches are applied in the expected
+    order. This also fixes a hunk offset when applying the patches.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 25 Jul 2007 20:53:05 +0200
+
 nfs-utils (1:1.1.0-12) unstable; urgency=low
 
   * Yet another round of fixing the boot issues, mostly in nfs-common.init:
diff --git a/debian/patches/06-gssd-manpage-typo.patch b/debian/patches/06-gssd-manpage-typo.patch
new file mode 100644
index 0000000..4dfc72f
--- /dev/null
+++ b/debian/patches/06-gssd-manpage-typo.patch
@@ -0,0 +1,13 @@
+Index: nfs-utils-1.1.0/utils/gssd/gssd.man
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/gssd/gssd.man
++++ nfs-utils-1.1.0/utils/gssd/gssd.man
+@@ -35,7 +35,7 @@ With the \-n option, "machine credential
+ for accesses by UID 0.  Instead, credentials must be obtained
+ manually like all other users.  Use of this option means that
+ "root" must manually obtain Kerberos credentials before
+-attemtpting to mount an nfs filesystem requiring Kerberos
++attempting to mount an nfs filesystem requiring Kerberos
+ authentication.
+ .TP
+ .B -k keytab
diff --git a/debian/patches/series b/debian/patches/series
index ae6f898..25e339a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
-05-ignore-quota-option.patch
-04-umount-exit-status.patch
-03-sm-notify-in-sbin.patch
 01-fix-hostent-memory-leak.diff
 02-document-debian-init-scripts.patch
+03-sm-notify-in-sbin.patch
+04-umount-exit-status.patch
+05-ignore-quota-option.patch
+06-gssd-manpage-typo.patch