--- pysvn-1.5.2.orig/Source/pysvn_common.mak +++ pysvn-1.5.2/Source/pysvn_common.mak @@ -59,16 +59,16 @@ pysvn_profile.o: pysvn_profile.cpp $(PYSVN_INCLUDES) $(CCC) $(CCCFLAGS) -o $@ $< -cxxsupport.o: $(PYCXX)/Src/cxxsupport.cxx +cxxsupport.o: $(PYCXX)/cxxsupport.cxx $(CCC) $(CCCFLAGS) -o $@ $< -cxx_extensions.o: $(PYCXX)/Src/cxx_extensions.cxx +cxx_extensions.o: $(PYCXX)/cxx_extensions.cxx $(CCC) $(CCCFLAGS) -o $@ $< -cxxextensions.o: $(PYCXX)/Src/cxxextensions.c - $(CC) -c $(CCFLAGS) -o $@ $< +cxxextensions.o: $(PYCXX)/cxxextensions.c + $(CC) -c $(CCCFLAGS) -o $@ $< -IndirectPythonInterface.o: $(PYCXX)/Src/IndirectPythonInterface.cxx +IndirectPythonInterface.o: $(PYCXX)/IndirectPythonInterface.cxx $(CCC) $(CCCFLAGS) -o $@ $< clean: --- pysvn-1.5.2.orig/Source/setup.py +++ pysvn-1.5.2/Source/setup.py @@ -150,6 +150,8 @@ for flag in py_cflags_python_list: if flag.startswith( '-D' ): py_cflags_list.append( flag ) + if flag.startswith( '-O' ) or flag.startswith( '-f' ) or flag.startswith( '-g' ): + py_cflags_list.append( flag ) # add platform specific defines if self.is_mac_os_x: @@ -330,8 +332,7 @@ LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ -lsvn_client-1 \ -lsvn_diff-1 \ --lsvn_repos-1 \ - -lgssapi_krb5 -lkrb5 -lk5crypto -lkrb5support -lcom_err -lresolv -lexpat -lneon +-lsvn_repos-1 `apr-config --link-ld --libs` #include pysvn_common.mak ''' @@ -565,12 +566,13 @@ ''' def find_pycxx( self, argv ): + return '/usr/share/python%s/CXX' % sys.version[:3] return self.find_dir( argv, 'PyCXX include', '--pycxx-dir=', None, [ '../Import/pycxx-5.4.0'], - 'CXX/Version.hxx' ) + 'cxxsupport.cxx' ) def find_svn_inc( self, argv ): return self.find_dir( argv, @@ -608,7 +610,7 @@ def find_apr_inc( self, argv ): last_exception = None - for apr_ver in ['apr-1', 'apr-0']: + for apr_ver in ['apr-1.0', 'apr-1', 'apr-0']: try: return self.find_dir( argv, 'APR include', --- pysvn-1.5.2.orig/debian/compat +++ pysvn-1.5.2/debian/compat @@ -0,0 +1 @@ +5 --- pysvn-1.5.2.orig/debian/rules +++ pysvn-1.5.2/debian/rules @@ -0,0 +1,119 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS +export LC_ALL=C + +CFLAGS = -Wall -g #-fvisibility=hidden -fvisibility-inlines-hidden + +PYVERS := $(shell pyversions -vr debian/control) + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +p = python-svn +d = debian/$(p) + +defver = $(shell /usr/bin/python -c 'import sys; print sys.version[:3]') +pdef = python$(defver)-svn + +CXX = g++ + +APR_INC = $(strip $(shell apr-config --includes | sed 's/-I//')) + +build: build-stamp +build-stamp: $(PYVERS:%=build-stamp%) $(PYVERS:%=dbg-build-stamp%) + touch $@ + +build-stamp%: + dh_testdir + rm -f Source/*.o Source/Makefile + cd Source && python$* setup.py configure \ + --pycxx-dir=/usr/share/python$*/CXX \ + --apr-inc-dir=$(APR_INC) + PYSVN_BUILD_REVISION=1 \ + $(MAKE) -C Source + mv Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*).so + touch $@ + +dbg-build-stamp%: + dh_testdir + rm -f Source/*.o Source/Makefile + cd Source && python$*-dbg setup.py configure \ + --pycxx-dir=/usr/share/python$*/CXX \ + --apr-inc-dir=$(APR_INC) + PYSVN_BUILD_REVISION=1 \ + $(MAKE) -C Source + mv Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*)_d.so + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp* dbg-build-stamp* + rm -f Source/*.o Source/pysvn/*.so Source/pysvn_version.hpp + rm -f Source/pysvn_docs.[ch]pp Source/Makefile Tests/Makefile + rm -f _pysvn*.so* + dh_clean + +install: install-stamp +install-pre: + dh_testdir + dh_testroot + dh_clean -k -s +install-stamp: build-stamp install-pre $(PYVERS:%=install-python%) $(PYVERS:%=dbg-install-python%) +install-python%: + dh_installdirs -ppython-svn \ + usr/lib/python$*/site-packages/pysvn + cp -pr Source/pysvn $(d)/usr/lib/python$*/site-packages/ + cp -p _pysvn_$(subst .,_,$*).so $(d)/usr/lib/python$*/site-packages/pysvn/ + + -find $(d) -name .svn | xargs rm -rf + +dbg-install-python%: + dh_installdirs -ppython-svn-dbg \ + usr/lib/python$*/site-packages/pysvn + cp -p _pysvn_$(subst .,_,$*)_d.so $(d)-dbg/usr/lib/python$*/site-packages/pysvn/ + -find $(d)-dbg -name .svn | xargs rm -rf + +# Build architecture independant packages using the common target. +binary-indep: build install +# nothing to do + +# Build architecture dependant packages using the common target. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -a -A -X.svn Docs/* + dh_installexamples -a -A Examples/* + dh_strip -ppython-svn --dbg-package=python-svn-dbg + rm -rf debian/python-svn-dbg/usr/share/doc/python-svn-dbg + ln -s python-svn debian/python-svn-dbg/usr/share/doc/python-svn-dbg + dh_compress -a -X.py -X.sxw + dh_fixperms -a + DH_PYCENTRAL=nomove dh_pycentral -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install --- pysvn-1.5.2.orig/debian/copyright +++ pysvn-1.5.2/debian/copyright @@ -0,0 +1,58 @@ +This package was debianized by Matthias Klose +on Fri, 3 Dec 2004 19:33:57 +0100. + +It was downloaded from http://pysvn.tigris.org/ + +Copyright: + +Upstream Author: Barry A. Scott + +License: + +================================================================= +Copyright (C) 2003-2004 Barry A. Scott. All rights reserved. + +================================================================= +The Apache Software License, Version 1.1 + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by + Barry A. Scott http://www.barrys-emacs.org." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + +4. The names "PySVN" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact + barry@barrys-emacs.org. + +5. Products derived from this software may not be called "PySVN", + nor may "PySVN" appear in their name, without prior written + permission of Barry Scott. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR +ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +================================================================= --- pysvn-1.5.2.orig/debian/control +++ pysvn-1.5.2/debian/control @@ -0,0 +1,29 @@ +Source: pysvn +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-cxx-dev (>= 5.4), libsvncpp-dev (>= 0.9.1), libapr1-dev, subversion (>= 1.4) +XS-Python-Version: all +Standards-Version: 3.7.2 + +Package: python-svn +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends} +Conflicts: python2.3-svn, python2.4-svn +Replaces: python2.3-svn, python2.4-svn +Provides: ${python:Provides} +Suggests: python-svn-dbg +XB-Python-Version: ${python:Versions} +Description: A(nother) Python interface to Subversion + The pysvn module is a python interface to the Subversion version + control system. This API exposes client interfaces for managing a + working copy, querying a repository, and synchronizing the two. + +Package: python-svn-dbg +Priority: extra +Architecture: any +Depends: python-svn (= ${Source-Version}), python-dbg, ${shlibs:Depends} +Description: A(nother) Python interface to Subversion (debug extension) + The pysvn module is a python interface to the Subversion version + control system. This API exposes client interfaces for managing a + working copy, querying a repository, and synchronizing the two. --- pysvn-1.5.2.orig/debian/watch +++ pysvn-1.5.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pysvn.tigris.org/project_downloads.html .*/pysvn-(.*)\.tar\.gz --- pysvn-1.5.2.orig/debian/changelog +++ pysvn-1.5.2/debian/changelog @@ -0,0 +1,164 @@ +pysvn (1.5.2-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 28 Jan 2008 21:36:43 +0100 + +pysvn (1.5.1-2) unstable; urgency=low + + * Fix maintainer address. + + -- Matthias Klose Sat, 02 Jun 2007 09:56:37 +0200 + +pysvn (1.5.1-1) unstable; urgency=low + + * New upstream version, supporting subversion-1.4. + * Merge from Ubuntu: + - Build a python-svn-dbg package. + - Bump debhelper compatibility to v5. + + -- Matthias Klose Sat, 02 Jun 2007 09:31:42 +0200 + +pysvn (1.5.0dfsg-1) unstable; urgency=low + + * New upstream version, supporting subversion-1.4. + + -- Matthias Klose Sat, 28 Oct 2006 23:14:37 +0200 + +pysvn (1.4.2+dfsg-0.2) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for etch-targetted RC bugfix. + * Build-depend on libapr1-dev instead of libapr0-dev and use + apr-config --includedir in setup.py, for the apache2.2 transition. + Closes: #391637. + + -- Steve Langasek Tue, 24 Oct 2006 02:15:19 -0700 + +pysvn (1.4.2+dfsg-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * Repack upstream tarball, removing Kit/Win32/vc6redist/ which is not + DFSG-free. (Closes: #383525) + * Set LC_ALL=C in debian/rules; fixes FTBFS in some locales. + (Closes: #383524, #383532) + + -- Steinar H. Gunderson Tue, 29 Aug 2006 00:53:29 +0200 + +pysvn (1.4.2-2) unstable; urgency=medium + + * Fixed in 1.4.x: + - Fixed documentation of pysvn.Client.propget. Closes: #339525. + - Client.revpropget doesn't segfault when property doesn't exist. + Closes: #294263. + * Update watch file. + + -- Matthias Klose Sun, 9 Jul 2006 16:36:59 +0200 + +pysvn (1.4.2-1) unstable; urgency=low + + * New upstream version. + * Convert to new Python policy. Closes: #373507. + + -- Matthias Klose Fri, 16 Jun 2006 20:18:32 +0200 + +pysvn (1.4.1-1.1) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * Remove extra qualification from C++ header file (closes: #357964). + + -- Martin Michlmayr Fri, 26 May 2006 16:22:18 +0200 + +pysvn (1.4.1-1) unstable; urgency=low + + * New upstream version. + * Supports subversion 1.3 (closes: #354962). + + -- Matthias Klose Tue, 7 Mar 2006 14:08:44 +0000 + +pysvn (1.3.1-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 15 Oct 2005 14:50:18 +0200 + +pysvn (1.3.0-1) unstable; urgency=low + + * Package from release tarball. + + -- Matthias Klose Thu, 8 Sep 2005 05:13:33 +0000 + +pysvn (1.2.99-1) unstable; urgency=low + + * New upstream version (1.3, taken from the svn repository). + * Compatible with subversion-1.2 (closes: #325194). + * Fix issues with g++-4.0 (closes: #325178, #325168, #325384). + * Remove .svn directory in package (closes: #301941). + + -- Matthias Klose Wed, 7 Sep 2005 18:53:15 +0000 + +pysvn (1.2.0-2) unstable; urgency=low + + * Build for new C++ ABI. + * Build using -fvisibility=hidden -fvisibility-inlines-hidden. + * Merge Ubuntu changes: + * Diff results should be literal strings, there is no globally safe + encoding for them (Robert Collins ) + + -- Matthias Klose Wed, 24 Aug 2005 07:59:44 +0000 + +pysvn (1.2.0-1ubuntu1) breezy; urgency=low + + * New upstream version. + + -- Matthias Klose Fri, 3 Jun 2005 12:15:20 +0000 + +pysvn (1.1.2-3) unstable; urgency=medium + + * Fix a race condition with a buffered temp file (Robert Collins). + + -- Matthias Klose Sun, 8 May 2005 18:09:00 +0200 + +pysvn (1.1.2-2) unstable; urgency=low + + * Remove version control directories (closes: #301941). + + -- Matthias Klose Sun, 3 Apr 2005 16:12:53 +0200 + +pysvn (1.1.2-1ubuntu1) hoary; urgency=low + + * New upstream version. + + -- Matthias Klose Tue, 1 Mar 2005 22:52:12 +0100 + +pysvn (1.1.0-2) unstable; urgency=low + + * Fix pasto in revpropset command (closes: #288970). + + -- Matthias Klose Fri, 7 Jan 2005 07:45:12 +0100 + +pysvn (1.1.0-1) unstable; urgency=low + + * New upstream version (closes: #287427). + * Apply patch to build with gcc-4.0 (closes: #287427). + + -- Matthias Klose Mon, 3 Jan 2005 08:51:08 +0100 + +pysvn (1.0.0-2) unstable; urgency=low + + * Add dependency on python. + + -- Matthias Klose Tue, 14 Dec 2004 12:28:21 +0100 + +pysvn (1.0.0-1) unstable; urgency=low + + * Build python2.4 packages. + + -- Matthias Klose Sun, 12 Dec 2004 18:28:28 +0100 + +pysvn (1.0.0-0ubuntu1) hoary; urgency=low + + * Initial Release. + + -- Matthias Klose Fri, 3 Dec 2004 19:33:57 +0100 + --- pysvn-1.5.2.orig/debian/pysvn.doc-base.EX +++ pysvn-1.5.2/debian/pysvn.doc-base.EX @@ -0,0 +1,22 @@ +Document: pysvn +Title: Debian pysvn Manual +Author: +Abstract: This manual describes what pysvn is + and how it can be used to + manage online manuals on Debian systems. +Section: unknown + +Format: debiandoc-sgml +Files: /usr/share/doc/pysvn/pysvn.sgml.gz + +Format: postscript +Files: /usr/share/doc/pysvn/pysvn.ps.gz + +Format: text +Files: /usr/share/doc/pysvn/pysvn.text.gz + +Format: HTML +Index: /usr/share/doc/pysvn/html/index.html +Files: /usr/share/doc/pysvn/html/*.html + +