Imported Debian patch 1.0.10-6~quilt.5

diff --git a/debian/changelog b/debian/changelog
index 320f9715003b41c1162a52f495355e707f024a93..bfdfc646f84417f6cb60926fba6497f193e3bcfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.0.10-6~quilt.5) experimental; urgency=low
+
+  * Make quilt build-dependency versioned to (>= 0.40), as per lintian
+    recommendation. 
+  * Change a hyphen (-) to a minus (\-) in 07-exports-default-options.patch.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu,  4 Jan 2007 15:04:05 +0100
+

 nfs-utils (1:1.0.10-6~quilt.4) experimental; urgency=low
 
   * 09-manpage-paths-fixup.patch: Fix up the paths to rpc.lockd and showmount
 nfs-utils (1:1.0.10-6~quilt.4) experimental; urgency=low
 
   * 09-manpage-paths-fixup.patch: Fix up the paths to rpc.lockd and showmount

diff --git a/debian/control b/debian/control
index dfd37ab2dd4a88e97ab6c4003b66ade1c18f7cf6..537d2d6c85d3aedeebc3e940976b34c17848ef9b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>

-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, pkg-config, quilt
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, pkg-config, quilt (>= 0.40)

 Build-Conflicts: librpcsecgss-dev (= 0.14-1)
 Standards-Version: 3.7.2
 
 Build-Conflicts: librpcsecgss-dev (= 0.14-1)
 Standards-Version: 3.7.2
 

diff --git a/debian/patches/07-exports-default-options.patch b/debian/patches/07-exports-default-options.patch
index 55b9a4196e86682dec82042d015a23807bca68cb..da799a4546fbcfbadaf623851c8255d55f942784 100644 (file)
--- a/debian/patches/07-exports-default-options.patch
+++ b/debian/patches/07-exports-default-options.patch
@@ -183,7 +183,7 @@ Index: nfs-utils-1.0.10/utils/exportfs/exports.man
  /usr            *.local.domain(ro) @trusted(rw)
  /home/joe       pc001(rw,all_squash,anonuid=150,anongid=100)
  /pub            (ro,insecure,all_squash)
  /usr            *.local.domain(ro) @trusted(rw)
  /home/joe       pc001(rw,all_squash,anonuid=150,anongid=100)
  /pub            (ro,insecure,all_squash)

-+/srv/www        -sync,rw server @trusted @external(ro)
++/srv/www        \-sync,rw server @trusted @external(ro)

  '''/pub/private    (noaccess)
  .fi
  .PP
  '''/pub/private    (noaccess)
  .fi
  .PP