diff -Nru coreutils-6.10/debian/changelog coreutils-6.10/debian/changelog --- coreutils-6.10/debian/changelog 2008-06-27 02:32:59.000000000 +0300 +++ coreutils-6.10/debian/changelog 2008-06-27 02:32:59.000000000 +0300 @@ -1,3 +1,12 @@ +coreutils (6.10-6ubuntu1) intrepid; urgency=low + + * debian/patches/99_factor_test_for_glibc_20080505: Wrote patch to + fix test case for factor. Glibc changed the output form of getopt's + error messages between 2.7 (in hardy) and 20080805 (current version in + intrepid). (LP: #243375) + + -- Lars Wirzenius Fri, 27 Jun 2008 02:06:01 +0300 + coreutils (6.10-6) unstable; urgency=low * [76] Add ubuntu/upstream patch to prevent failure of cp of a special diff -Nru coreutils-6.10/debian/control coreutils-6.10/debian/control --- coreutils-6.10/debian/control 2008-06-27 02:32:59.000000000 +0300 +++ coreutils-6.10/debian/control 2008-06-27 02:32:59.000000000 +0300 @@ -1,5 +1,6 @@ Source: coreutils -Maintainer: Michael Stone +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Michael Stone Section: utils Priority: required Standards-Version: 3.7.3.0 diff -Nru coreutils-6.10/debian/patches/99_factor_test_for_glibc_20080505 coreutils-6.10/debian/patches/99_factor_test_for_glibc_20080505 --- coreutils-6.10/debian/patches/99_factor_test_for_glibc_20080505 1970-01-01 02:00:00.000000000 +0200 +++ coreutils-6.10/debian/patches/99_factor_test_for_glibc_20080505 2008-06-27 02:32:59.000000000 +0300 @@ -0,0 +1,12 @@ +diff -ruN coreutils-6.10-old/tests/misc/factor coreutils-6.10/tests/misc/factor +--- coreutils-6.10-old/tests/misc/factor 2007-12-13 01:14:28.000000000 +0200 ++++ coreutils-6.10/tests/misc/factor 2008-06-27 01:37:33.000000000 +0300 +@@ -71,7 +71,7 @@ + ['x', '4294966896', {OUT => '2 2 2 2 3 3 3 11 607 1489'}], + ['y', '4294966998', {OUT => '2 3 7 3917 26107'}], + ['z', '-1', +- {ERR => "$prog: invalid option -- 1\n" ++ {ERR => "$prog: invalid option -- '1'\n" + . "Try `$prog --help' for more information.\n"}, + {EXIT => 1}], + ['cont', 'a 4',