[arch-commits] Commit in coreutils/repos (2 files)

Allan McRae allan at archlinux.org
Sun May 3 06:19:29 EDT 2009


    Date: Sunday, May 3, 2009 @ 06:19:28
  Author: allan
Revision: 37580

Merged revisions 37579 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/coreutils/trunk

........
  r37579 | allan | 2009-05-03 20:18:20 +1000 (Sun, 03 May 2009) | 2 lines
  
  upgpkg: coreutils 7.3-1
      fix issues with i18n patch and multibyte charaters... ironic?
........

Modified:
  coreutils/repos/testing-i686/	(properties)
  coreutils/repos/testing-i686/coreutils-i18n.patch

----------------------+
 coreutils-i18n.patch |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)


Property changes on: coreutils/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /coreutils/trunk:1-37576
   + /coreutils/trunk:1-37579

Modified: testing-i686/coreutils-i18n.patch
===================================================================
--- testing-i686/coreutils-i18n.patch	2009-05-03 10:18:20 UTC (rev 37579)
+++ testing-i686/coreutils-i18n.patch	2009-05-03 10:19:28 UTC (rev 37580)
@@ -39,7 +39,7 @@
 +locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
 +errors=0
 +
-+$xx -t ï¼  -k2 -n misc/mb1.I > misc/mb1.O
++$xx -t @ -k2 -n misc/mb1.I > misc/mb1.O
 +code=$?
 +if test $code != 0; then
 +  $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -57,7 +57,7 @@
 +  esac
 +fi
 +
-+$xx -t ï¼  -k4 -n misc/mb2.I > misc/mb2.O
++$xx -t @ -k4 -n misc/mb2.I > misc/mb2.O
 +code=$?
 +if test $code != 0; then
 +  $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -85,31 +85,31 @@
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb2.I	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
-+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
-+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
-+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
++Apple@AA10@@20
++Banana@AA5@@30
++Citrus@AA20@@5
++Cherry@AA30@@10
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb2.X	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
-+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
-+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
-+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
++Citrus@AA20@@5
++Cherry@AA30@@10
++Apple@AA10@@20
++Banana@AA5@@30
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb1.I	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Appleï¼ 10
-+Bananaï¼ 5
-+Citrusï¼ 20
-+Cherryï¼ 30
++Apple@10
++Banana@5
++Citrus@20
++Cherry@30
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb1.X	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Bananaï¼ 5
-+Appleï¼ 10
-+Citrusï¼ 20
-+Cherryï¼ 30
++Banana@5
++Apple@10
++Citrus@20
++Cherry@30
 diff -urN coreutils-6.12-orig/tests/Makefile.am coreutils-6.12/tests/Makefile.am
 --- coreutils-6.12-orig/tests/Makefile.am	2008-05-27 13:47:53.000000000 +0200
 +++ coreutils-6.12/tests/Makefile.am	2008-06-02 10:06:03.000000000 +0200



More information about the arch-commits mailing list