The following commit has been merged in the master branch:
commit 4202ca83f79fe7fc729794963e1e02c0e771ac6b
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Fri May 2 06:51:08 2008 +0300

    u-a: Do not suggest manually changing the symlinks on verbose mode
    
    Closes: #412487

diff --git a/ChangeLog b/ChangeLog
index 19cd7cf..1537657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-02  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * scripts/update-alternatives.pl: Do not suggest manually changing
+       the alternative symlinks on verbose mode.
+
 2008-04-29  Guillem Jover  <[EMAIL PROTECTED]>
 
        * configure.ac: Bump version to 1.15.0~.
diff --git a/debian/changelog b/debian/changelog
index ebf91e2..9faeadc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.15.0) UNRELEASED; urgency=low
 
+  * Do not suggest manually changing the alternative symlinks on
+    update-alternative's verbose mode. Closes: #412487
 
  -- Guillem Jover <[EMAIL PROTECTED]>  Tue, 29 Apr 2008 06:01:40 +0300
 
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index edbbec8..8b9b193 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -433,8 +433,8 @@ if ($state eq 'unexpected' && $mode eq 'auto') {
 # action=auto <=> state=nonexistent
 # state=unexpected => mode=manual
 
-&pr(sprintf(_g("Checking available versions of %s, updating links in %s ...\n".
-    "(You may modify the symlinks there yourself if desired - see \`man 
ln'.)"), $name, $altdir))
+pr(sprintf(_g("Checking available versions of %s, updating links in %s ..."),
+           $name, $altdir))
   if $verbosemode > 0;
 
 if ($action eq 'install') {

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to