Trying to get a working duplicity again (sigh), I rebuilt it to use
python2.4. Contrary to what I reported in #386607 before, this seems to
work ok; I can restore my old backups, and make new ones.

So I'd suggest reassigning this back to duplicity, maybe leaving a
normal severity bug cloned to python-central for its apparent problems
with supporting python 2.3, and uploading duplicity with the attached
patch. I've installed this on all my machines and it seems ok.

-- 
see shy jo
diff --new-file -ur a/duplicity-0.4.2/debian/changelog 
duplicity-0.4.2/debian/changelog
--- a/duplicity-0.4.2/debian/changelog  2006-11-05 20:56:35.000000000 -0500
+++ duplicity-0.4.2/debian/changelog    2006-11-05 21:12:22.000000000 -0500
@@ -1,3 +1,10 @@
+duplicity (0.4.2-10.1) unstable; urgency=low
+
+  * Switch back to python 2.4, as python-central can apparently no longer cope
+    with 2.3, and 2.4 seems to work ok now. Closes: #396158
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Sun,  5 Nov 2006 21:10:03 -0500
+
 duplicity (0.4.2-10) unstable; urgency=low
 
   * fix build target (Closes: #386933)
diff --new-file -ur a/duplicity-0.4.2/debian/control 
duplicity-0.4.2/debian/control
--- a/duplicity-0.4.2/debian/control    2006-11-05 20:56:35.000000000 -0500
+++ duplicity-0.4.2/debian/control      2006-11-05 21:25:01.000000000 -0500
@@ -2,9 +2,9 @@
 Section: utils
 Priority: optional
 Maintainer: Martin Wuertele <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), librsync-dev (>=0.9.6), python-all-dev (>= 
2.3.5-11), python-central (>= 0.5), dpatch
+Build-Depends: debhelper (>= 5), librsync-dev (>=0.9.6), python-dev, 
python-central (>= 0.5), dpatch
 Standards-Version: 3.7.2
-XS-Python-Version: 2.3
+XS-Python-Version: 2.4
 
 Package: duplicity
 Architecture: any
diff --new-file -ur a/duplicity-0.4.2/debian/patches/00list 
duplicity-0.4.2/debian/patches/00list
--- a/duplicity-0.4.2/debian/patches/00list     2006-11-05 20:56:35.000000000 
-0500
+++ duplicity-0.4.2/debian/patches/00list       2006-11-05 21:09:52.000000000 
-0500
@@ -1,3 +1,2 @@
-01python2.3
 02bzip2-compress
 03sftp-command
diff --new-file -ur a/duplicity-0.4.2/debian/patches/01python2.3 
duplicity-0.4.2/debian/patches/01python2.3
--- a/duplicity-0.4.2/debian/patches/01python2.3        2006-11-05 
20:56:35.000000000 -0500
+++ duplicity-0.4.2/debian/patches/01python2.3  1969-12-31 19:00:00.000000000 
-0500
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use python2.3 patch by Martin Wuertele <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use python2.3 as restore won't work with python2.4
-
[EMAIL PROTECTED]@
---- duplicity-0.4.2/duplicity  2006-02-03 04:44:31.000000000 +0100
-+++ duplicity-0.4.2.py2.3/duplicity    2006-09-09 11:08:50.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.3
- # duplicity -- Encrypted bandwidth efficient backup
- # Version 0.4.2 released September 29, 2002
- #
---- duplicity-0.4.2/rdiffdir   2006-02-03 04:44:31.000000000 +0100
-+++ duplicity-0.4.2.py2.3/rdiffdir     2006-09-09 11:08:40.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.3
- # rdiffdir -- Extend rdiff functionality to directories
- # Version 0.4.2 released June 30, 2002
- #
---- duplicity-0.4.2/setup.py   2006-02-03 04:44:31.000000000 +0100
-+++ duplicity-0.4.2.py2.3/setup.py     2006-09-09 11:08:59.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.3
- 
- import sys, os, getopt
- from distutils.core import setup, Extension
---- duplicity-0.4.2/src/tarfile.py     2006-02-03 04:44:31.000000000 +0100
-+++ duplicity-0.4.2.py2.3/src/tarfile.py       2006-09-09 11:09:06.000000000 
+0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.3
- #-------------------------------------------------------------------
- # tarfile.py
- #
diff --new-file -ur a/duplicity-0.4.2/debian/pyversions 
duplicity-0.4.2/debian/pyversions
--- a/duplicity-0.4.2/debian/pyversions 2006-11-05 20:56:35.000000000 -0500
+++ duplicity-0.4.2/debian/pyversions   2006-11-05 21:04:27.000000000 -0500
@@ -1 +1 @@
--2.3
+-2.4
diff --new-file -ur a/duplicity-0.4.2/debian/rules duplicity-0.4.2/debian/rules
--- a/duplicity-0.4.2/debian/rules      2006-11-05 20:56:35.000000000 -0500
+++ duplicity-0.4.2/debian/rules        2006-11-05 21:00:52.000000000 -0500
@@ -39,7 +39,7 @@
 
        # Add here commands to compile the package.
        #$(MAKE)
-       python2.3 setup.py build
+       python setup.py build
        rm -f
        
        touch build-stamp
@@ -67,14 +67,14 @@
        dh_installdirs
 
        # Add here commands to install the package into debian/duplicity.
-       python2.3 setup.py install --prefix=$(PREFIX) --no-compile
+       python setup.py install --prefix=$(PREFIX) --no-compile
 
        # remove GnuPGInterface.py as we already have it in
        # python-gnupginterface
-       rm -f $(PREFIX)/lib/python2.3/site-packages/duplicity/GnuPGInterface.py
+       rm -f $(PREFIX)/lib/python2.4/site-packages/duplicity/GnuPGInterface.py
 
        # fix permission for tarfile.py
-       chmod 755 $(PREFIX)/lib/python2.3/site-packages/duplicity/tarfile.py
+       chmod 755 $(PREFIX)/lib/python2.4/site-packages/duplicity/tarfile.py
        
        # remove docs as we create them with debhelper
        rm -rf $(PREFIX)/share/doc/duplicity-0.4.2

Attachment: signature.asc
Description: Digital signature

Reply via email to