diff -u cedar-backup2-2.18.0/debian/rules cedar-backup2-2.18.0/debian/rules --- cedar-backup2-2.18.0/debian/rules +++ cedar-backup2-2.18.0/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make - build_dir = build install_dir = debian/tmp python = /usr/bin/python @@ -35,7 +33,7 @@ dh_installdirs build: build-stamp -build-stamp: $(QUILT_STAMPFN) +build-stamp: dh_testdir $(setup) build --build-base $(build_dir) install --no-compile --install-purelib $(install_dir)/lib/cedar-backup2 --install-scripts $(install_dir)/bin ifndef NOTESTS @@ -43,7 +41,7 @@ endif touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp reverted: --- cedar-backup2-2.18.0/debian/patches/series +++ cedar-backup2-2.18.0.orig/debian/patches/series @@ -1 +0,0 @@ -01_python25_hex_float_literals.diff reverted: --- cedar-backup2-2.18.0/debian/patches/01_python25_hex_float_literals.diff +++ cedar-backup2-2.18.0.orig/debian/patches/01_python25_hex_float_literals.diff @@ -1,82 +0,0 @@ -Index: cedar-backup2-2.14.0/CedarBackup2/testutil.py -=================================================================== ---- cedar-backup2-2.14.0.orig/CedarBackup2/testutil.py 2008-03-19 19:19:31.000000000 +0100 -+++ cedar-backup2-2.14.0/CedarBackup2/testutil.py 2008-03-19 19:46:08.000000000 +0100 -@@ -482,3 +482,27 @@ - locales.append(line.rstrip()) - return locales - -+#################################### -+# hexFloatLiteralAllowed() function -+#################################### -+ -+def hexFloatLiteralAllowed(): -+ """ -+ Indicates whether hex float literals are allowed by the interpreter. -+ -+ As far back as 2004, some Python documentation indicated that octal and hex -+ notation applies only to integer literals. However, prior to Python 2.5, it -+ was legal to construct a float with an argument like 0xAC. This check -+ provides a version-based indication of whether the current interpreter -+ supports that behavior. -+ -+ This check exists so that unit tests can continue to test the same thing as -+ always for pre-2.5 interpreters (i.e. making sure backwards compatibility -+ doesn't break) while still continuing to work for later interpreters. -+ -+ The returned value is True for Python <= 2.5, and False otherwise. -+ """ -+ if map(int, [sys.version_info[0], sys.version_info[1]]) < [2, 5]: -+ return True -+ return False -+ -Index: cedar-backup2-2.14.0/test/configtests.py -=================================================================== ---- cedar-backup2-2.14.0.orig/test/configtests.py 2008-03-19 19:19:31.000000000 +0100 -+++ cedar-backup2-2.14.0/test/configtests.py 2008-03-19 19:47:42.000000000 +0100 -@@ -102,6 +102,7 @@ - import os - import unittest - from CedarBackup2.testutil import findResources, removedir, failUnlessAssignRaises -+from CedarBackup2.testutil import hexFloatLiteralAllowed - from CedarBackup2.config import ActionHook, PreActionHook, PostActionHook, CommandOverride - from CedarBackup2.config import ExtendedAction, ActionDependencies, BlankBehavior - from CedarBackup2.config import CollectFile, CollectDir, PurgeDir, LocalPeer, RemotePeer -@@ -1083,8 +1084,10 @@ - self.failUnlessEqual("1E6", behavior.blankFactor) - behavior.blankFactor = "0.25E2" - self.failUnlessEqual("0.25E2", behavior.blankFactor) -- behavior.blankFactor = "0xAC" -- self.failUnlessEqual("0xAC", behavior.blankFactor) -+ if hexFloatLiteralAllowed(): -+ # Some interpreters allow this, some don't -+ behavior.blankFactor = "0xAC" -+ self.failUnlessEqual("0xAC", behavior.blankFactor) - - def testConstructor_007(self): - """ -Index: cedar-backup2-2.14.0/test/splittests.py -=================================================================== ---- cedar-backup2-2.14.0.orig/test/splittests.py 2008-03-19 19:19:31.000000000 +0100 -+++ cedar-backup2-2.14.0/test/splittests.py 2008-03-19 19:47:58.000000000 +0100 -@@ -111,6 +111,7 @@ - from CedarBackup2.util import UNIT_BYTES, UNIT_KBYTES, UNIT_MBYTES, UNIT_GBYTES - from CedarBackup2.testutil import findResources, buildPath, removedir, extractTar - from CedarBackup2.testutil import failUnlessAssignRaises, platformSupportsLinks, availableLocales -+from CedarBackup2.testutil import hexFloatLiteralAllowed - from CedarBackup2.xmlutil import createOutputDom, serializeDom - from CedarBackup2.extend.split import LocalConfig, SplitConfig, ByteQuantity - from CedarBackup2.extend.split import _splitFile, _splitDailyDir -@@ -221,8 +222,10 @@ - self.failUnlessEqual("1E6", quantity.quantity) - quantity.quantity = "0.25E2" - self.failUnlessEqual("0.25E2", quantity.quantity) -- quantity.quantity = "0xAC" -- self.failUnlessEqual("0xAC", quantity.quantity) -+ if hexFloatLiteralAllowed(): -+ # Some interpreters allow this, some don't -+ quantity.quantity = "0xAC" -+ self.failUnlessEqual("0xAC", quantity.quantity) - - def testConstructor_005(self): - """ diff -u cedar-backup2-2.18.0/debian/changelog cedar-backup2-2.18.0/debian/changelog --- cedar-backup2-2.18.0/debian/changelog +++ cedar-backup2-2.18.0/debian/changelog @@ -1,3 +1,11 @@ +cedar-backup2 (2.18.0-1ubuntu2) intrepid; urgency=low + + * Remove the Ubuntu applied patch as the same patch is now + upstream. Before the patch wouldn't apply, and so would + FTBFS. (LP: #242781) + + -- James Westby Tue, 24 Jun 2008 22:19:06 +0100 + cedar-backup2 (2.18.0-1ubuntu1) intrepid; urgency=low * Merge from debian unstable (LP: #228515), remaining changes: diff -u cedar-backup2-2.18.0/debian/control cedar-backup2-2.18.0/debian/control --- cedar-backup2-2.18.0/debian/control +++ cedar-backup2-2.18.0/debian/control @@ -3,7 +3,7 @@ Section: admin Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Kenneth J. Pronovici -Build-Depends: python-support (>= 0.3), debhelper(>= 5.0.37.2), quilt (>= 0.40) +Build-Depends: python-support (>= 0.3), debhelper(>= 5.0.37.2) Standards-Version: 3.7.3 Package: cedar-backup2