diff -Nru -w cmor-2.5.0/debian/changelog cmor-2.5.0/debian/changelog --- cmor-2.5.0/debian/changelog 2010-11-13 16:16:33.000000000 +0100 +++ cmor-2.5.0/debian/changelog 2010-11-14 16:05:15.000000000 +0100 @@ -1,9 +1,25 @@ +cmor (2.5.0-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #675199). Remaining changes: + - fix-ftbfs-with-binutils-gold.patch: patch Makefile.in and cmor.pc.in + to add explicit linking against libm. This fixes a FTBFS with + binutils-gold + + -- Angel Abad Sun, 14 Nov 2010 14:46:56 +0100 + cmor (2.5.0-1) unstable; urgency=low * New upstream release. -- Alastair McKinstry Sat, 13 Nov 2010 15:15:27 +0000 +cmor (2.4.0-1ubuntu1) natty; urgency=low + + * fix-ftbfs-with-binutils-gold.patch: patch Makefile.in and cmor.pc.in to add + explicit linking against libm. This fixes a FTBFS with binutils-gold + + -- Fabrice Coutadeur Wed, 03 Nov 2010 06:06:27 +0100 + cmor (2.4.0-1) unstable; urgency=low * New upstream release. diff -Nru -w cmor-2.5.0/debian/control cmor-2.5.0/debian/control --- cmor-2.5.0/debian/control 2010-11-13 16:16:33.000000000 +0100 +++ cmor-2.5.0/debian/control 2010-11-14 01:58:49.000000000 +0100 @@ -1,7 +1,8 @@ Source: cmor Section: utils Priority: extra -Maintainer: Alastair McKinstry +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Alastair McKinstry Build-Depends: debhelper (>= 7.0.50~), dh-buildinfo, libossp-uuid-dev, libudunits2-dev, libnetcdf-dev, uuid-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), libgfortran3, automake, python-numpy, gfortran Build-Conflicts: libcmor2 Standards-Version: 3.9.1 diff -Nru -w cmor-2.5.0/debian/patches/fix-ftbfs-with-binutils-gold.patch cmor-2.5.0/debian/patches/fix-ftbfs-with-binutils-gold.patch --- cmor-2.5.0/debian/patches/fix-ftbfs-with-binutils-gold.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmor-2.5.0/debian/patches/fix-ftbfs-with-binutils-gold.patch 2010-11-03 07:14:55.000000000 +0100 @@ -0,0 +1,42 @@ +Description: Fix FTBFS with binutils-gold by explicitly linking tests against + libm. Also, add -lm to .pc file, as the previous FTBFS has demonstrated that + libm is required to use libcmor +Author: Fabrice Coutadeur +Index: cmor-2.4.0/Makefile.in +=================================================================== +--- cmor-2.4.0.orig/Makefile.in 2010-11-03 07:04:14.000000000 +0100 ++++ cmor-2.4.0/Makefile.in 2010-11-03 07:04:14.000000000 +0100 +@@ -113,9 +113,9 @@ + Tables: TestTables + ln -sf TestTables Tables + test_C: cmor Tables +- @rm -f ./ipcc_test_code ; @CC@ @CPPFLAGS@ @CFLAGS@ Test/ipcc_test_code.c -L@prefix@/lib -I@prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@ +- @rm -f test_grid ; @CC@ @CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ Test/test_grid.c -L@prefix@/lib -I@prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@; +- @rm -f test_lots_of_variables ; @CC@ @CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L@prefix@/lib -I@prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@; ++ @rm -f ./ipcc_test_code ; @CC@ @CPPFLAGS@ @CFLAGS@ Test/ipcc_test_code.c -L@prefix@/lib -I@prefix@/include -L. -lcmor -lm @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@ ++ @rm -f test_grid ; @CC@ @CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ Test/test_grid.c -L@prefix@/lib -I@prefix@/include -L. -lcmor -lm @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@; ++ @rm -f test_lots_of_variables ; @CC@ @CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L@prefix@/lib -I@prefix@/include -L. -lcmor -lm @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@; + python: + @echo "Building Python interface" + @${PYTHONEXEC} setup.py install @CDATPREFIX@ +@@ -152,7 +152,7 @@ + + test_case: + @echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}" +- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L@prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ; ++ @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L@prefix@/lib -L. -lcmor -lm @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ; + @./${TEST_NAME} @VERB@ < ${INPUT_FILE} ; + @ rm ./${TEST_NAME} + ifeq (@MAKEDEPPYTHON@,python) +Index: cmor-2.4.0/cmor.pc.in +=================================================================== +--- cmor-2.4.0.orig/cmor.pc.in 2010-11-03 07:04:14.000000000 +0100 ++++ cmor-2.4.0/cmor.pc.in 2010-11-03 07:04:14.000000000 +0100 +@@ -7,6 +7,6 @@ + Name: cmor + Description: Climate Model Output Rewriter library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lcmor ++Libs: -L${libdir} -lcmor -lm + CFlags: -I${includedir} -I${includedir}/cdTime + Requires: udunits netcdf ossp-uuid diff -Nru -w cmor-2.5.0/debian/patches/series cmor-2.5.0/debian/patches/series --- cmor-2.5.0/debian/patches/series 2010-11-13 16:16:33.000000000 +0100 +++ cmor-2.5.0/debian/patches/series 2010-11-14 01:58:49.000000000 +0100 @@ -2,3 +2,4 @@ shlib-link.patch pkgconfig.patch makefile-fix.patch +fix-ftbfs-with-binutils-gold.patch