tags 396158 + patch
thanks
Hi,
Attached is the diff for my duplicity 0.4.2-10.1 NMU.
--
Homepage: http://www.sesse.net/
diff -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/changelog
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/changelog
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/changelog 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/changelog 2006-11-11
13:46:59.000000000 +0100
@@ -1,3 +1,11 @@
+duplicity (0.4.2-10.1) unstable; urgency=medium
+
+ * 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; patch from Joey Hess.
+ (Closes: #396158)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 11 Nov 2006 13:32:07 +0100
+
duplicity (0.4.2-10) unstable; urgency=low
* fix build target (Closes: #386933)
diff -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/control
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/control
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/control 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/control 2006-11-11
13:46:59.000000000 +0100
@@ -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 -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/patches/00list
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/patches/00list
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/patches/00list 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/patches/00list 2006-11-11
13:46:59.000000000 +0100
@@ -1,3 +1,2 @@
-01python2.3
02bzip2-compress
03sftp-command
diff -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/patches/01python2.3
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/patches/01python2.3
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/patches/01python2.3 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/patches/01python2.3 1970-01-01
01:00:00.000000000 +0100
@@ -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 -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/pyversions
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/pyversions
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/pyversions 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/pyversions 2006-11-11
13:46:59.000000000 +0100
@@ -1 +1 @@
--2.3
+-2.4
diff -Nru /tmp/tfpJPmugcq/duplicity-0.4.2/debian/rules
/tmp/ckiJTOXwGg/duplicity-0.4.2/debian/rules
--- /tmp/tfpJPmugcq/duplicity-0.4.2/debian/rules 2006-11-11
13:46:58.000000000 +0100
+++ /tmp/ckiJTOXwGg/duplicity-0.4.2/debian/rules 2006-11-11
13:46:59.000000000 +0100
@@ -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
