Imported Debian patch 1.6.8p9-2

diff --git a/debian/changelog b/debian/changelog
index fcfb3773f0db6bb6417efb93701b9699780bb678..c88578984a844d35793b134bbd63a59d2e9216a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.6.8p9-2) unstable; urgency=high
+
+  * merge the NMU fix for sudoedit symlink problem that was in 1.6.8p7-1.1,
+    closes: #305735
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 28 Jun 2005 16:18:47 -0400
+
 sudo (1.6.8p9-1) unstable; urgency=high
 
   * new upstream version, fixes a race condition in sudo's pathname

diff --git a/debian/rules b/debian/rules
index 6e6e939feae44b14327ade617078eb764e768c2a..50b19ebcd848be65bc84081c0448ff8d13e6c8ff 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ install: build
        dh_installdirs
 
        install -o root -g root -m 4755 -s sudo debian/sudo/usr/bin/sudo
-       ln -sf debian/sudo/usr/bin/sudo debian/sudo/usr/bin/sudoedit
+       ln -sf sudo debian/sudo/usr/bin/sudoedit
        install -o root -g root -m 0755 -s visudo debian/sudo/usr/sbin/visudo
        install -o root -g root -m 0644 sudo.man \
                debian/sudo/usr/share/man/man8/sudo.8