tags 678559 + fixed-upstream patch
thanks

It seems that this requires a new upstream release of pysvn. The 1.7.6
version release notes:
http://pysvn.tigris.org/ds/viewMessage.do?dsForumId=1333&dsMessageId=2930777

The diff between 1.7.5 and 1.7.6 appears to be rather large though:
   268 files changed, 35301 insertions(+), 40135 deletions(-)
but excluding Win/Mac build scripts, bundled PyCXX, test logs,
auto-generated files and other not relevant files it seems more
manageable:
    27 files changed, 367 insertions(+), 425 deletions(-)

Anyway, attached is a patch to the 1.7.5-1.1 packaging to upgrade to
1.7.6.

I haven't really tested the resulting packages yet but at least the
build works now. Can someone test resulting packages?

(btw, it would be nice if the package was in the DPMT repository)

-- 
-- arthur - adej...@debian.org - http://people.debian.org/~adejong --
diff -Naur pysvn-1.7.5/debian/changelog pysvn-1.7.6/debian/changelog
--- pysvn-1.7.5/debian/changelog	2011-12-05 13:30:36.000000000 +0100
+++ pysvn-1.7.6/debian/changelog	2012-07-18 23:46:04.000000000 +0200
@@ -1,3 +1,11 @@
+pysvn (1.7.6-0.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * Drop the 01-setup_configure.patch which should be integrated upstream.
+
+ -- Arthur de Jong <adej...@debian.org>  Wed, 18 Jul 2012 23:03:31 +0200
+
 pysvn (1.7.5-1.1) unstable; urgency=low
 
   * Non maintainer upload.
diff -Naur pysvn-1.7.5/debian/patches/series pysvn-1.7.6/debian/patches/series
--- pysvn-1.7.5/debian/patches/series	2011-08-14 21:27:17.000000000 +0200
+++ pysvn-1.7.6/debian/patches/series	2012-07-18 23:03:19.000000000 +0200
@@ -1 +0,0 @@
-01-setup_configure.patch
diff -Naur pysvn-1.7.5/debian/rules pysvn-1.7.6/debian/rules
--- pysvn-1.7.5/debian/rules	2011-12-04 23:15:09.000000000 +0100
+++ pysvn-1.7.6/debian/rules	2012-07-18 23:38:36.000000000 +0200
@@ -53,9 +53,10 @@
 	rm -f $(if $(filter $*, 2.4 2.5),backport/)Source/*.o $(if $(filter $*, 2.4 2.5),backport/)Source/Makefile
 	cd $(if $(filter $*, 2.4 2.5),backport/)Source && python$* setup.py configure \
 		--pycxx-src-dir=/usr/share/python$*/CXX \
-		--pycxx-dir=/usr/share/python$*/CXX \
+		--pycxx-dir=/usr/include/python$* \
 		--svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--apr-inc-dir=$(APR_INC) \
+		--apu-inc-dir=$(APR_INC) \
 
 #		--norpath
 	PYSVN_BUILD_REVISION=1 \
@@ -69,9 +70,10 @@
 	rm -f $(if $(filter $*, 2.4 2.5),backport/)Source/*.o $(if $(filter $*, 2.4 2.5),backport/)Source/Makefile
 	cd $(if $(filter $*, 2.4 2.5),backport/)Source && python$*-dbg setup.py configure \
 		--pycxx-src-dir=/usr/share/python$*/CXX \
-		--pycxx-dir=/usr/share/python$*/CXX \
+		--pycxx-dir=/usr/include/python$* \
 		--svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--apr-inc-dir=$(APR_INC) \
+		--apu-inc-dir=$(APR_INC) \
 
 #		--norpath
 	PYSVN_BUILD_REVISION=1 \

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to