[arch-commits] Commit in coreutils/repos (3 files)
Allan McRae
allan at archlinux.org
Tue Aug 25 05:37:27 UTC 2009
Date: Tuesday, August 25, 2009 @ 01:37:27
Author: allan
Revision: 50284
Merged revisions 50283 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/coreutils/trunk
........
r50283 | allan | 2009-08-25 15:36:15 +1000 (Tue, 25 Aug 2009) | 1 line
update patches
........
Modified:
coreutils/repos/testing-x86_64/ (properties)
coreutils/repos/testing-x86_64/coreutils-6.10-configuration.patch
coreutils/repos/testing-x86_64/coreutils-i18n.patch
------------------------------------+
coreutils-6.10-configuration.patch | 29 +++++++++++++++++++++++++++++
coreutils-i18n.patch | 16 +++++++++-------
2 files changed, 38 insertions(+), 7 deletions(-)
Property changes on: coreutils/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /coreutils/trunk:1-50200
+ /coreutils/trunk:1-50283
Modified: testing-x86_64/coreutils-6.10-configuration.patch
===================================================================
--- testing-x86_64/coreutils-6.10-configuration.patch 2009-08-25 05:36:15 UTC (rev 50283)
+++ testing-x86_64/coreutils-6.10-configuration.patch 2009-08-25 05:37:27 UTC (rev 50284)
@@ -1,3 +1,32 @@
+diff -urNp coreutils-7.2-orig/gnulib-tests/gnulib.mk coreutils-7.2/gnulib-tests/gnulib.mk
+--- coreutils-7.2-orig/gnulib-tests/gnulib.mk 2009-03-31 14:28:30.000000000 +0200
++++ coreutils-7.2/gnulib-tests/gnulib.mk 2009-04-01 12:37:00.000000000 +0200
+@@ -606,9 +606,9 @@ EXTRA_DIST += test-mbsstr1.c test-mbsstr
+
+ ## begin gnulib module memchr-tests
+
+-TESTS += test-memchr
+-check_PROGRAMS += test-memchr
+-EXTRA_DIST += test-memchr.c zerosize-ptr.h
++#TESTS += test-memchr
++#check_PROGRAMS += test-memchr
++#EXTRA_DIST += test-memchr.c zerosize-ptr.h
+
+ ## end gnulib module memchr-tests
+
+@@ -910,9 +910,9 @@ EXTRA_DIST += test-strtod.c
+
+ ## begin gnulib module strverscmp-tests
+
+-TESTS += test-strverscmp
+-check_PROGRAMS += test-strverscmp
+-EXTRA_DIST += test-strverscmp.c
++#TESTS += test-strverscmp
++#check_PROGRAMS += test-strverscmp
++#EXTRA_DIST += test-strverscmp.c
+
+ ## end gnulib module strverscmp-tests
+
diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
--- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200
+++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200
Modified: testing-x86_64/coreutils-i18n.patch
===================================================================
--- testing-x86_64/coreutils-i18n.patch 2009-08-25 05:36:15 UTC (rev 50283)
+++ testing-x86_64/coreutils-i18n.patch 2009-08-25 05:37:27 UTC (rev 50284)
@@ -2089,7 +2089,7 @@
while (blanks[to_uchar (*a)])
a++;
@@ -1510,6 +1813,25 @@
- return strnumcmp (a, b, decimal_point, thousands_sep);
+ : strnumcmp (a, b, decimal_point, thousands_sep));
}
+#if HAVE_MBRTOWC
@@ -2202,9 +2202,9 @@
-keycompare (const struct line *a, const struct line *b)
+keycompare_uni (const struct line *a, const struct line *b)
{
- struct keyfield const *key = keylist;
+ struct keyfield *key = keylist;
-@@ -1875,6 +2265,179 @@
+@@ -1875,6 +2265,181 @@
return key->reverse ? -diff : diff;
}
@@ -2254,6 +2254,8 @@
+ (texta, textb));
+ *lima = savea, *limb = saveb;
+ }
++ else if (key->version)
++ diff = compare_version (texta, lena, textb, lenb);
+ else if (key->month)
+ diff = getmonth (texta, lena) - getmonth (textb, lenb);
+ else
@@ -2384,7 +2386,7 @@
/* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */
-@@ -2744,7 +3305,7 @@
+@@ -2744,7 +3307,7 @@
initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -2393,7 +2395,7 @@
hard_LC_TIME = hard_locale (LC_TIME);
#endif
-@@ -2765,6 +3326,27 @@
+@@ -2765,6 +3328,27 @@
thousands_sep = -1;
}
@@ -2421,7 +2423,7 @@
have_read_stdin = false;
inittables ();
-@@ -3015,13 +3597,35 @@
+@@ -3015,13 +3599,35 @@
case 't':
{
@@ -2461,7 +2463,7 @@
else
{
/* Provoke with `sort -txx'. Complain about
-@@ -3032,9 +3636,12 @@
+@@ -3032,9 +3638,12 @@
quote (optarg));
}
}
More information about the arch-commits
mailing list