diff -Nru pysvn-1.7.6/debian/changelog pysvn-1.7.6/debian/changelog --- pysvn-1.7.6/debian/changelog 2012-09-12 19:26:36.000000000 +0000 +++ pysvn-1.7.6/debian/changelog 2013-01-24 14:12:42.000000000 +0000 @@ -1,3 +1,32 @@ +pysvn (1.7.6-0.3ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/02-fix-ld-shared.patch: + + Fix linking with -lsvn* (LP: #1045021) + * debian/patches/python-multiarch-include.patch: fix include paths for new + multiarch include locations. + + -- Robie Basak Thu, 24 Jan 2013 13:58:38 +0000 + +pysvn (1.7.6-0.3) unstable; urgency=low + + * Non-maintainer upload + * debian/rules + - add "--platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)" to + setup.py to solve problem on kfrebsd arch. + * debian/patches + - add specify_platform_kfreebsd-hurd_as_linux.patch to deal with kfreebsd + and hurd as platform + + -- Hideki Yamane Sat, 04 Aug 2012 07:10:54 +0900 + +pysvn (1.7.6-0.2) unstable; urgency=low + + * Non-maintainer upload + * upload to unstable + + -- Hideki Yamane Thu, 02 Aug 2012 14:04:08 +0900 + pysvn (1.7.6-0.1ubuntu1) quantal; urgency=low * debian/patches/02-fix-ld-shared.patch: @@ -12,7 +41,7 @@ package, so checking reverse dependency packages is needed to put it to unstable. * New upstream release - - works with subversion1.7 (Closes: #678559) + - works with subversion1.7 (Closes: #678559, LP#1016621) * debian/control - add "Build-Depends: libaprutil1-dev" to provide apu.h file. * debian/rules diff -Nru pysvn-1.7.6/debian/patches/01-setup_configure.patch pysvn-1.7.6/debian/patches/01-setup_configure.patch --- pysvn-1.7.6/debian/patches/01-setup_configure.patch 2012-07-14 21:59:42.000000000 +0000 +++ pysvn-1.7.6/debian/patches/01-setup_configure.patch 2013-01-24 14:12:42.000000000 +0000 @@ -1,7 +1,7 @@ Description: avoid FTBFS with Subversion1.7 Just converted old patch to pysvn 1.7.6 release... -Author: Hideki Yamane +Author: Hideki Yamane --- Origin: vendor diff -Nru pysvn-1.7.6/debian/patches/02-fix-ld-shared.patch pysvn-1.7.6/debian/patches/02-fix-ld-shared.patch --- pysvn-1.7.6/debian/patches/02-fix-ld-shared.patch 2012-09-12 19:31:48.000000000 +0000 +++ pysvn-1.7.6/debian/patches/02-fix-ld-shared.patch 2013-01-24 14:12:42.000000000 +0000 @@ -12,7 +12,7 @@ --- a/Source/setup_configure.py +++ b/Source/setup_configure.py -@@ -875,7 +875,7 @@ +@@ -883,7 +883,7 @@ rules.append( '%s : %s' % (target_filename, ' '.join( all_objects )) ) rules.append( '\t@echo Link %s' % (target_filename,) ) @@ -21,7 +21,7 @@ self.makePrint( self.expand( '\n'.join( rules ) ) ) -@@ -1156,7 +1156,7 @@ +@@ -1164,7 +1164,7 @@ self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) diff -Nru pysvn-1.7.6/debian/patches/python-multiarch-include.patch pysvn-1.7.6/debian/patches/python-multiarch-include.patch --- pysvn-1.7.6/debian/patches/python-multiarch-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ pysvn-1.7.6/debian/patches/python-multiarch-include.patch 2013-01-24 14:12:42.000000000 +0000 @@ -0,0 +1,22 @@ +Description: handle Python multiarch include locations correctly +Author: Robie Basak +Bug: http://pysvn.tigris.org/issues/show_bug.cgi?id=184 +Forwarded: http://pysvn.tigris.org/issues/show_bug.cgi?id=184 +Last-Update: 2013-01-24 + +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -1146,11 +1146,13 @@ + + self._addVar( 'PYTHON_VERSION', '%d.%d' % (sys.version_info[0], sys.version_info[1]) ) + self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) ++ self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc(True) ) + + py_cflags_list = [ + '-Wall -fPIC -fexceptions -frtti', + '-I. -I%(APR_INC)s -I%(SVN_INC)s', + '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s', ++ '-I%(PYTHON_ARCH_SPECIFIC_INC)s', + '-D%(DEBUG)s', + ] + for define, value in self.py_module_defines: diff -Nru pysvn-1.7.6/debian/patches/series pysvn-1.7.6/debian/patches/series --- pysvn-1.7.6/debian/patches/series 2012-09-12 19:26:36.000000000 +0000 +++ pysvn-1.7.6/debian/patches/series 2013-01-24 14:12:42.000000000 +0000 @@ -1,2 +1,4 @@ 01-setup_configure.patch +specify_platform_kfreebsd-hurd_as_linux.patch 02-fix-ld-shared.patch +python-multiarch-include.patch diff -Nru pysvn-1.7.6/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch pysvn-1.7.6/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch --- pysvn-1.7.6/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch 1970-01-01 00:00:00.000000000 +0000 +++ pysvn-1.7.6/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch 2013-01-24 14:12:42.000000000 +0000 @@ -0,0 +1,31 @@ +Description: add kfreebsd and hurd to setup_configure.py + original Source/setup_configure.py cannot detect kfreebsd and hurd, + if dpkg-architecture -qDEB_HOST_ARCH_OS returns such platform, it would + be processed as same as Linux. + +Author: Hideki Yamane + +--- +Origin: vendor +Forwarded: no +Last-Update: 2012-08-04 + +Index: pysvn-1.7.6/Source/setup_configure.py +=================================================================== +--- pysvn-1.7.6.orig/Source/setup_configure.py 2012-08-04 06:45:48.373174679 +0900 ++++ pysvn-1.7.6/Source/setup_configure.py 2012-08-04 06:51:20.050110596 +0900 +@@ -200,6 +200,14 @@ + self.c_utils = LinuxCompilerGCC( self ) + self.c_pysvn = LinuxCompilerGCC( self ) + ++ elif self.platform == 'kfreebsd': ++ self.c_utils = LinuxCompilerGCC( self ) ++ self.c_pysvn = LinuxCompilerGCC( self ) ++ ++ elif self.platform == 'hurd': ++ self.c_utils = LinuxCompilerGCC( self ) ++ self.c_pysvn = LinuxCompilerGCC( self ) ++ + elif self.platform == 'freebsd': + self.c_utils = FreeBsdCompilerGCC( self ) + self.c_pysvn = FreeBsdCompilerGCC( self ) diff -Nru pysvn-1.7.6/debian/rules pysvn-1.7.6/debian/rules --- pysvn-1.7.6/debian/rules 2012-07-18 21:18:56.000000000 +0000 +++ pysvn-1.7.6/debian/rules 2013-01-24 14:12:42.000000000 +0000 @@ -57,7 +57,8 @@ --svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --apr-inc-dir=$(APR_INC) \ --apu-inc-dir=$(APR_INC) \ - --norpath + --norpath \ + --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) PYSVN_BUILD_REVISION=1 \ $(MAKE) -C $(if $(filter $*, 2.4 2.5),backport/)Source mv $(if $(filter $*, 2.4 2.5),backport/)Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*).so @@ -73,7 +74,8 @@ --svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --apr-inc-dir=$(APR_INC) \ --apu-inc-dir=$(APR_INC) \ - --norpath + --norpath \ + --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) PYSVN_BUILD_REVISION=1 \ $(MAKE) -C $(if $(filter $*, 2.4 2.5),backport/)Source mv $(if $(filter $*, 2.4 2.5),backport/)Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*)_d.so