The following commit has been merged in the master branch:
commit 5324c97681508ef8a74f12f25d7b3aea40a21eec
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Mar 2 05:23:13 2009 +0200

    u-a: Do not use non-ASCII strings on C locale
    
    The C locale is supposed to only get ASCII strings, for non-ASCII
    strings there are things like the en_US or en_GB locales.

diff --git a/ChangeLog b/ChangeLog
index d50f975..3d3b8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-02  Guillem Jover  <guil...@debian.org>
 
+       * scripts/update-alternatives.pl: Do not use non-ASCII strings on C
+       locale.
+       (version): Likewise.
+
+2009-03-02  Guillem Jover  <guil...@debian.org>
+
        * po/POTFILES.in: Remove reference to cleanup-info.pl.
        * scripts/.gitignore: Likewise.
 
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 4dcb3f4..6447804 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -159,7 +159,7 @@ if ($action eq "install") {
           $file) unless $file =~ m|^/|;
     error(_g("alternative path %s doesn't exist."), $file)
         unless -e $file;
-    error(_g("alternative name (%s) must not contain “/” and spaces."), $name)
+    error(_g("alternative name (%s) must not contain '/' and spaces."), $name)
         if $name =~ m|[/\s]|;
     foreach my $slave ($inst_alt->slaves()) {
         $link = $inst_alt->slave_link($slave);
@@ -179,7 +179,7 @@ if ($action eq "install") {
               $link) unless $link =~ m|^/|;
         error(_g("alternative path is not absolute as it should be: %s"),
               $file) unless $file =~ m|^/|;
-        error(_g("alternative name (%s) must not contain “/” and spaces."), 
$slave)
+        error(_g("alternative name (%s) must not contain '/' and spaces."), 
$slave)
             if $slave =~ m|[/\s]|;
     }
 }
@@ -401,9 +401,9 @@ sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
 
     printf _g("
-Copyright © 1995 Ian Jackson.
-Copyright © 2000-2002 Wichert Akkerman.
-Copyright © 2009 Raphaël Hertzog.");
+Copyright (C) 1995 Ian Jackson.
+Copyright (C) 2000-2002 Wichert Akkerman.
+Copyright (C) 2009 Raphael Hertzog.");
 
     printf _g("
 This is free software; see the GNU General Public Licence version 2 or

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to