Imported Debian patch 1.6.8p12-3

diff --git a/debian/changelog b/debian/changelog
index b7cb5e40868241a897c840e03b7c8ef4ac69dde2..a85acd921a8d2184d3b5ad5792465bab198ef6c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sudo (1.6.8p12-3) unstable; urgency=low
+
+  * force-feed configure knowledge of nroff's path so we get unformatted man
+    pages installed without build-depending on groff-base, closes: #360894
+  * add a reference to OPTIONS in the man page, closes: #186226
+
+ -- Bdale Garbee <bdale@gag.com>  Wed,  5 Apr 2006 17:53:13 -0700
+
 sudo (1.6.8p12-2) unstable; urgency=low
 
   * fix typos in init scripts, closes: #346325

diff --git a/debian/rules b/debian/rules
index fca7b5f4ef0533e4a39cd16ae4ea487e43fea574..3e99018a6070cf5fca9d3df8576a49f50773177a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ config-stamp:
 
        # simple version
        mkdir -p build-simple
-       cd build-simple && ../configure --prefix=/usr -v \
+       cd build-simple && NROFFPROG=/usr/bin/nroff ../configure \
+               --prefix=/usr -v \
                --with-all-insults \
                --with-exempt=sudo --with-pam --with-fqdn \
                --with-logging=syslog --with-logfac=authpriv \
@@ -27,7 +28,8 @@ config-stamp:
 
        # LDAP version
        mkdir -p build-ldap
-       cd build-ldap && ../configure --prefix=/usr -v \
+       cd build-ldap && NROFFPROG=/usr/bin/nroff ../configure \
+               --prefix=/usr -v \
                --with-all-insults \
                --with-exempt=sudo --with-pam --with-ldap --with-fqdn \
                --with-logging=syslog --with-logfac=authpriv \

diff --git a/sudo.pod b/sudo.pod
index 6321380c7b2d5d9f1af4827f370b491c1db29778..8e762bbc6dc0d240ed241123d7070d93b48c6643 100644 (file)
--- a/sudo.pod
+++ b/sudo.pod
@@ -440,6 +440,10 @@ to make the C<cd> and file redirection work.
 L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<sudoers(@mansectform@)>,
 L<passwd(@mansectform@)>, L<visudo(@mansectsu@)>
 
+The file /usr/share/doc/sudo/OPTIONS describes the options used for building
+the Debian version of sudo, some of which change default behaviors documented
+elsewhere in this document.
+
 =head1 AUTHORS
 
 Many people have worked on B<sudo> over the years; this