Hello, On Fri, Jan 04, 2013 at 10:31:09AM -0600, Chris J Arges wrote: > Package: calcurse > Version: 3.1.2-1 > Followup-For: Bug #697013 > User: ubuntu-de...@lists.ubuntu.com > Usertags: origin-ubuntu raring ubuntu-patch > > Dear Maintainer, > > This patch fixes an FTBFS that exists with this package. I have tested > this with the Ubuntu version of the package. > > * Fix FTBFS for 32-bit architectures. > > Thanks for considering the patch.
I have uploaded the previous fix to delayed 3 queue, debdiff follows: diff -Nru calcurse-3.1.2/debian/changelog calcurse-3.1.2/debian/changelog --- calcurse-3.1.2/debian/changelog 2012-12-20 13:51:38.000000000 +0100 +++ calcurse-3.1.2/debian/changelog 2013-08-04 19:40:02.000000000 +0200 @@ -1,3 +1,13 @@ +calcurse (3.1.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: testsuite failure" + - Thanks Chris J Arges for patch + (Closes: #697013) + * Fix "ftbfs with GCC-4.8" (Closes: #701249) + + -- Hector Oron <zu...@debian.org> Sun, 04 Aug 2013 19:32:00 +0200 + calcurse (3.1.2-1) unstable; urgency=low * The Akamai Technologies paid volunteer days release. diff -Nru calcurse-3.1.2/debian/patches/series calcurse-3.1.2/debian/patches/series --- calcurse-3.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ calcurse-3.1.2/debian/patches/series 2013-08-04 19:31:26.000000000 +0200 @@ -0,0 +1 @@ +test-Use-faketime-f.patch diff -Nru calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch --- calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch 1970-01-01 01:00:00.000000000 +0100 +++ calcurse-3.1.2/debian/patches/test-Use-faketime-f.patch 2013-08-04 19:31:26.000000000 +0200 @@ -0,0 +1,96 @@ +From: Chris J Arges <chris.j.ar...@canonical.com> +Subject: [PATCH] test/: Use `faketime -f` + +Description: Use the advanced timestamp specification format for libfaketime. + Before using that, some tests failed on 32-bit systems due to integer + overflows. It seems like faketime translates absolute dates to relative + dates by default. Moreover, libfaketime is not able to handle relative + dates that exceed the maximum value of a signed integer. Using "-f" + skips the conversion to relative dates. + +Bug-Debian: http://bugs.debian.org/697013 + +Origin: upstream, commit 2ea91e1a8a2ee4318e3530ec2680565ad11b1585 git://git.calcurse.org/calcurse.git +Author: Lukas Fleischer <calcu...@cryptocrack.de> + +--- a/test/appointment-001.sh ++++ b/test/appointment-001.sh +@@ -6,7 +6,7 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '2011-02-25 23:42' "$CALCURSE" --read-only -D "$DATA_DIR" -a ++ faketime -f '2011-02-25 23:42:00' "$CALCURSE" --read-only -D "$DATA_DIR" -a + elif [ "$1" = 'expected' ]; then + cat <<EOD + 02/25/11: +--- a/test/day-002.sh ++++ b/test/day-002.sh +@@ -6,7 +6,8 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '1912-06-23' "$CALCURSE" --read-only -D "$DATA_DIR"/ -d42 ++ faketime -f '1912-06-23 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ \ ++ -d42 + elif [ "$1" = 'expected' ]; then + cat <<EOD + 06/24/12: +--- a/test/day-003.sh ++++ b/test/day-003.sh +@@ -6,7 +6,8 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '1912-06-23' "$CALCURSE" --read-only -D "$DATA_DIR"/ -d42 ++ faketime -f '1912-06-23 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ \ ++ -d42 + elif [ "$1" = 'expected' ]; then + "$CALCURSE" --read-only -D "$DATA_DIR"/ -s06/23/1912 -r42 + else +--- a/test/next-001.sh ++++ b/test/next-001.sh +@@ -6,7 +6,7 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '1912-07-10 04:10' "$CALCURSE" --read-only -D "$DATA_DIR" -n ++ faketime -f '1912-07-10 04:10:00' "$CALCURSE" --read-only -D "$DATA_DIR" -n + elif [ "$1" = 'expected' ]; then + cat <<EOD + next appointment: +--- a/test/range-001.sh ++++ b/test/range-001.sh +@@ -6,7 +6,7 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '2011-02-25 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ -r ++ faketime -f '2011-02-25 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ -r + elif [ "$1" = 'expected' ]; then + cat <<EOD + 02/25/11: +--- a/test/range-002.sh ++++ b/test/range-002.sh +@@ -6,7 +6,8 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '2000-01-01 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ -r400 ++ faketime -f '2000-01-01 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ \ ++ -r400 + elif [ "$1" = 'expected' ]; then + cat <<EOD + 04/07/00: +--- a/test/range-003.sh ++++ b/test/range-003.sh +@@ -6,7 +6,8 @@ if [ ! -x "$(command -v faketime)" ]; th + fi + + if [ "$1" = 'actual' ]; then +- faketime '2000-01-01 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ -r400 ++ faketime -f '2000-01-01 00:00:00' "$CALCURSE" --read-only -D "$DATA_DIR"/ \ ++ -r400 + elif [ "$1" = 'expected' ]; then + "$CALCURSE" --read-only -D "$DATA_DIR"/ -s01/01/2000 -r400 Regards, -- Hector Oron
signature.asc
Description: Digital signature
