[Python-modules-commits] [pysvn] 06/07: merge patched into master
Josué Ortega
noahfx-guest at moszumanska.debian.org
Mon Nov 2 01:15:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
noahfx-guest pushed a commit to branch master
in repository pysvn.
commit b12e33297784258863a19e7325075c780c848724
Merge: 5f62ace bfd39f6
Author: Josue Ortega <josueortega at debian.org.gt>
Date: Sun Nov 1 18:51:34 2015 -0600
merge patched into master
Builder/builder_custom_init.cmd | 39 +-
Builder/make-devel-rpm-build.sh | 23 +
Builder/version.info | 4 +-
Examples/Client/svn_cmd.py | 11 +
Kit/MacOSX/make_pkg.py | 3 +
Kit/Win32-1.6/pysvn.iss | 46 +-
Kit/Win32-1.6/setup_version_handling.py | 3 +-
Source/build.cmd | 28 +
Source/pysvn/__init__.py.template | 9 +-
Source/pysvn_client.cpp | 5 +
Source/pysvn_client_cmd_info.cpp | 19 +-
Source/pysvn_client_cmd_list.cpp | 21 +-
Source/pysvn_enum_string.cpp | 178 +++--
Source/pysvn_svnenv.hpp | 12 +-
Source/run_py.cmd | 4 +-
Source/run_py.sh | 2 +-
Source/setup_configure.py | 11 +-
Tests/benchmark_diff.py | 37 +-
Tests/test-01.cmd | 8 +-
Tests/test-01.unix.known_good-py2-svn1.9.log | 832 +++++++++++++++++++++
Tests/test-01.unix.known_good-py3-svn1.9.log | 832 +++++++++++++++++++++
Tests/test-02.cmd | 2 +-
Tests/test-03.cmd | 2 +-
Tests/test-03.unix.known_good-py2-svn1.9.log | 21 +
Tests/test-03.unix.known_good-py3-svn1.9.log | 21 +
Tests/test-04.cmd | 14 +-
Tests/test-04.unix.known_good-py2-svn1.9.log | 278 +++++++
Tests/test-04.unix.known_good-py3-svn1.9.log | 278 +++++++
Tests/test-05.cmd | 6 +-
Tests/test-05.unix.known_good-py2-svn1.9.log | 208 ++++++
Tests/test-05.unix.known_good-py3-svn1.9.log | 208 ++++++
Tests/test-06.cmd | 6 +-
Tests/test-06.unix.known_good-py2-svn1.9.log | 90 +++
Tests/test-06.unix.known_good-py3-svn1.9.log | 90 +++
Tests/test-07.cmd | 174 ++---
Tests/test-07.unix.known_good-py2-svn1.9.log | 95 +++
Tests/test-07.unix.known_good-py3-svn1.9.log | 95 +++
Tests/test-07.win32.known_good-py2-svn1.7.log | 17 +-
Tests/test-07.win32.known_good-py2-svn1.8.log | 17 +-
Tests/test-07.win32.known_good-py3-svn1.7.log | 101 +--
Tests/test-07.win32.known_good-py3-svn1.8.log | 101 +--
Tests/test-08.cmd | 6 +-
Tests/test-08.unix.known_good-py2-svn1.9.log | 94 +++
Tests/test-08.unix.known_good-py3-svn1.9.log | 94 +++
debian/.git-dpm | 6 +-
debian/changelog | 22 +-
debian/patches/01-setup_configure.patch | 12 +-
debian/patches/fix_spell_error.patch | 2 +-
.../specify_platform_kfreebsd-hurd_as_linux.patch | 6 +-
49 files changed, 3788 insertions(+), 405 deletions(-)
diff --cc debian/.git-dpm
index f914316,0000000..6d10005
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 3dc224cdf43ef6dc454f5400c82f36187562af52
- 3dc224cdf43ef6dc454f5400c82f36187562af52
- 65ba068643ffd664ed856655bfe99efb0f547dca
++bfd39f6eed3b8db70b61fc5db148d91eb0aa6b06
++bfd39f6eed3b8db70b61fc5db148d91eb0aa6b06
++a1f29e479b9efe37859cf989743d5e9a9bbe785b
+a1f29e479b9efe37859cf989743d5e9a9bbe785b
+pysvn_1.8.0.orig.tar.gz
+f1d584bc3b0d15eb27606ca1a6c364dc44fee345
+366583
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 827cf6c,0000000..6a31d68
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,373 -1,0 +1,355 @@@
- pysvn (1.7.10-1) UNRELEASED; urgency=medium
-
- * Not ready for upload:
- - Removing dh_installdocs override has the unintended consequence of
- changing doc directory from symlink to actual dir, which leads to a RC
- bug due to a missing copyright file. dpkg does not automatically convert
- symlinks to directories and vice versa; you must use maintainer scripts
- (preferably with dpkg-maintscript-helper) to do so yourself. See e.g.
- #775471. Please use piuparts to test your changes (or use a chroot/VM).
- - Don't hardcode python3.4 in debian/python3-svn.{dirs,install} (use
- wildcards instead).
- - (suggestion only, not blocker) Consider building a -dbg package for the
- python3 module?
- - lintian warnings:
- W: python-svn-dbg: debug-file-with-no-debug-symbols usr/lib/debug/.build-id/7b/cb03875adc2175775dd5062c2fd3098a14e8b9.debug
- W: python-svn-dbg: debug-file-with-no-debug-symbols usr/lib/debug/.build-id/81/56ff1987cb55ba82db278e3999a5550d6c06bc.debug
- W: python-svn-dbg: debug-file-with-no-debug-symbols usr/lib/debug/.build-id/f7/03ba025f0f342685935db02a931fa00c8a74bc.debug
-
- (reviewed by vcheng at debian.org)
++pysvn (1.8.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release:
+ - debian/patches/* updated to be compatible with the new upstream release.
+ * debian/control:
+ - Dependencies version updated.
+ - set Standards-Version: 3.9.6 no changes required.
+ * debian/copyright:
+ - Updated BSD license tag name to BSD-4-clause.
+ - Paragraphs reordered.
+ * Added Python 3 version of the package.
+ * debian/rules: Removed override_dh_installdocs in order to avoid
+ documentation conflicts between the Python 3 and Python 2 package.
+
- -- Josue Ortega <josueortega at debian.org.gt> Sun, 28 Jun 2015 11:26:41 -0600
++ -- Josue Ortega <josueortega at debian.org.gt> Sun, 01 Nov 2015 18:52:15 -0600
+
+pysvn (1.7.8-1) unstable; urgency=low
+
+ * New Maintainer (Closes: #741094)
+ * Buildsystem changed to pybuild
+ * debian/source/options adds extend-diff-ignore to ignore changes
+ made during compilation to upstream code.
+ * debian/rules override_dh_installdocs added (Closes: #736300).
+ * debian/copyright fixed issues with dep-5.
+ * debian/control:
+ - added new description to the dbg package.
+ - set Standards-Version: 3.9.5 no changes required.
+
+ -- Josue Ortega <josueortega at debian.org.gt> Mon, 14 Apr 2014 12:18:08 -0600
+
+pysvn (1.7.8-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/rules
+ - specify "--apr-lib-dir" to fix "FTBFS: 'Error:', 'cannot find APR
+ library libapr-0.so'" (Closes: #738371)
+
+ -- Hideki Yamane <henrich at debian.org> Tue, 11 Feb 2014 21:08:35 +0900
+
+pysvn (1.7.8-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+ * debian/rules (and more...)
+ - make it dh-nize
+ * debian/compat
+ - set 9
+ * debian/control
+ - set Standards-Version: 3.9.4
+
+ -- Hideki Yamane <henrich at debian.org> Sat, 05 Oct 2013 22:53:34 +0900
+
+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 <henrich at debian.org> 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 <henrich at debian.org> Thu, 02 Aug 2012 14:04:08 +0900
+
+pysvn (1.7.6-0.1) experimental; urgency=low
+
+ * Non-maintainer upload
+ * Upload to experimental, we're now freeze time and it may break other
+ package, so checking reverse dependency packages is needed to put it
+ to unstable.
+ * New upstream release
+ - works with subversion1.7 (Closes: #678559, LP#1016621)
+ * debian/control
+ - add "Build-Depends: libaprutil1-dev" to provide apu.h file.
+ * debian/rules
+ - specify "--apu-inc-dir" option to find apu.h.
+ - enable --norpath option to avoid "binary-or-shlib-defines-rpath" lintain
+ error
+ * debian/patches
+ - refresh it, meet to new upstream release
+
+ -- Hideki Yamane <henrich at debian.org> Thu, 19 Jul 2012 04:23:27 +0900
+
+pysvn (1.7.5-1.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Drop the not needed build dependency on libsvncpp-dev.
+
+ -- Matthias Klose <doko at debian.org> Mon, 05 Dec 2011 13:29:25 +0100
+
+pysvn (1.7.5-1) unstable; urgency=low
+
+ [ Henry Velez ]
+ * New maintainer. Closes: #611062
+ * New upstream release
+
+ [ Matthias Klose ]
+ * Build using subversion multiarch location.
+ * Use dpkg-buildflags.
+
+ -- Henry Velez <henry.debian at gmail.com> Mon, 13 Jun 2011 02:56:06 -0500
+
+pysvn (1.7.2-4) unstable; urgency=low
+
+ * Orphan the package.
+
+ -- Matthias Klose <doko at debian.org> Tue, 25 Jan 2011 07:22:03 +0100
+
+pysvn (1.7.2-3) unstable; urgency=low
+
+ * Build using dh_python2 instead of dh_pycentral. Closes: #590398.
+
+ -- Matthias Klose <doko at debian.org> Mon, 26 Jul 2010 10:54:35 +0200
+
+pysvn (1.7.2-2) unstable; urgency=low
+
+ * Don't explicitely use the name of the site directory. Closes: #567960.
+ * Provide python-pysvn. Closes: #556849.
+
+ -- Matthias Klose <doko at debian.org> Mon, 01 Feb 2010 16:36:57 +0100
+
+pysvn (1.7.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Mon, 04 Jan 2010 09:30:21 +0100
+
+pysvn (1.7.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sun, 03 Jan 2010 15:40:52 +0100
+
+pysvn (1.7.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sat, 29 Aug 2009 10:50:50 +0200
+
+pysvn (1.6.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Tue, 02 Dec 2008 02:56:09 +0000
+
+pysvn (1.6.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Store __init__.py for each python version and don't mix them
+ (Closes: #501646).
+ * Avoid setting rpath to /usr/lib64 in compiled modules.
+
+ -- Michal Čihař <nijel at debian.org> Wed, 22 Oct 2008 09:40:00 +0200
+
+pysvn (1.6.1-1) unstable; urgency=low
+
+ * New upstream version (supporting subversion-1.5.2).
+
+ -- Matthias Klose <doko at debian.org> Mon, 06 Oct 2008 23:16:01 +0200
+
+pysvn (1.6.0-1) unstable; urgency=low
+
+ * New upstream version (supporting subversion-1.5).
+
+ -- Matthias Klose <doko at debian.org> Sun, 20 Jul 2008 17:41:19 +0200
+
+pysvn (1.5.3-3) unstable; urgency=low
+
+ * Explicitely build-depend on libneon27-gnutls-dev. Closes: #489080.
+
+ -- Matthias Klose <doko at debian.org> Sat, 05 Jul 2008 11:23:02 +0200
+
+pysvn (1.5.3-2) unstable; urgency=low
+
+ * Add doc-base file.
+
+ -- Matthias Klose <doko at debian.org> Wed, 25 Jun 2008 00:49:35 +0200
+
+pysvn (1.5.3-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Mon, 18 Feb 2008 05:36:00 +0100
+
+pysvn (1.5.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Mon, 28 Jan 2008 21:36:43 +0100
+
+pysvn (1.5.1-2) unstable; urgency=low
+
+ * Fix maintainer address.
+
+ -- Matthias Klose <doko at debian.org> 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 <doko at debian.org> 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 <doko at debian.org> 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 <vorlon at debian.org> 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 <sesse at debian.org> 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 <doko at debian.org> 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 <doko at debian.org> 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 <tbm at cyrius.com> 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 <doko at debian.org> Tue, 7 Mar 2006 14:08:44 +0000
+
+pysvn (1.3.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sat, 15 Oct 2005 14:50:18 +0200
+
+pysvn (1.3.0-1) unstable; urgency=low
+
+ * Package from release tarball.
+
+ -- Matthias Klose <doko at debian.org> 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 <doko at debian.org> 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 <robertc at robertcollins.net>)
+
+ -- Matthias Klose <doko at debian.org> Wed, 24 Aug 2005 07:59:44 +0000
+
+pysvn (1.2.0-1ubuntu1) breezy; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> 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 <doko at debian.org> Sun, 8 May 2005 18:09:00 +0200
+
+pysvn (1.1.2-2) unstable; urgency=low
+
+ * Remove version control directories (closes: #301941).
+
+ -- Matthias Klose <doko at debian.org> Sun, 3 Apr 2005 16:12:53 +0200
+
+pysvn (1.1.2-1ubuntu1) hoary; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> 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 <doko at debian.org> 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 <doko at debian.org> Mon, 3 Jan 2005 08:51:08 +0100
+
+pysvn (1.0.0-2) unstable; urgency=low
+
+ * Add dependency on python.
+
+ -- Matthias Klose <doko at debian.org> Tue, 14 Dec 2004 12:28:21 +0100
+
+pysvn (1.0.0-1) unstable; urgency=low
+
+ * Build python2.4 packages.
+
+ -- Matthias Klose <doko at debian.org> Sun, 12 Dec 2004 18:28:28 +0100
+
+pysvn (1.0.0-0ubuntu1) hoary; urgency=low
+
+ * Initial Release.
+
+ -- Matthias Klose <m at klose.in-berlin.de> Fri, 3 Dec 2004 19:33:57 +0100
+
diff --cc debian/patches/01-setup_configure.patch
index fca1245,0000000..18ff698
mode 100644,000000..100644
--- a/debian/patches/01-setup_configure.patch
+++ b/debian/patches/01-setup_configure.patch
@@@ -1,59 -1,0 +1,59 @@@
- From 9e6a89e0167a4d2e11fadbf3d62fd6711537569c Mon Sep 17 00:00:00 2001
++From eb782927a723ac46264cbc2464cfc6ee0031412b Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+Date: Sun, 11 Oct 2015 21:16:57 +0200
+Subject: avoid FTBFS with Subversion1.7
+
+ Just converted old patch to pysvn 1.7.6 release...
+
+Author: Hideki Yamane <henrich at debian.org>
+
+Patch-Name: 01-setup_configure.patch
+---
+ Source/setup_configure.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
- index 5a1a2bf..842edf2 100644
++index afeee2d..65fd457 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
- @@ -469,11 +469,11 @@ class Compiler:
++@@ -470,11 +470,11 @@ class Compiler:
+ '--pycxx-dir',
+ None,
+ self._find_paths_pycxx_dir,
+- 'CXX/Version.hxx' )
++ 'cxxsupport.cxx' )
+
+ major_match = False
+ minor_match = False
+- f = open( os.path.join( pycxx_dir, 'CXX/Version.hxx' ) )
++ f = open( os.path.join( '/usr/include/python%s' % sys.version[:3], 'CXX/Version.hxx' ) )
+ for line in f:
+ words = line.split()
+ if 'PYCXX_VERSION_MAJOR' in words:
- @@ -484,6 +484,7 @@ class Compiler:
++@@ -485,6 +485,7 @@ class Compiler:
+ if not major_match and not minor_match:
+ raise SetupError( 'PyCXX version not as required.' )
+
++ return '/usr/share/python%s' % sys.version[:3]
+ return pycxx_dir
+
+ def find_pycxx_src( self ):
- @@ -548,7 +549,8 @@ class Compiler:
++@@ -549,7 +550,8 @@ class Compiler:
+
+ def find_apr_lib( self ):
+ last_exception = None
+- lib_list = [(self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'),
++ lib_list = [(self.get_lib_name_for_platform( 'libapr-1.0' ), 'apr-1.0'),
++ (self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'),
+ (self.get_lib_name_for_platform( 'libapr-0' ), 'apr-0')]
+
+ for apr_libname, self.lib_apr in lib_list:
- @@ -1235,7 +1237,7 @@ class CygwinCompilerGCC(UnixCompilerGCC):
++@@ -1240,7 +1242,7 @@ class CygwinCompilerGCC(UnixCompilerGCC):
+ '-L/usr/lib/python%d.%d/config -lpython%d.%d.dll' %
+ (sys.version_info[0], sys.version_info[1], sys.version_info[0], sys.version_info[1]),
+ '-lsvn_client-1',
+- '-lsvn_repos-1',
++ '-lsvn_repos-1 `apr-config --link-ld --libs`',
+ '-lsvn_subr-1',
+ '-lsvn_delta-1',
+ '-lsvn_fs_fs-1',
diff --cc debian/patches/fix_spell_error.patch
index 1bb4b66,0000000..5dfc107
mode 100644,000000..100644
--- a/debian/patches/fix_spell_error.patch
+++ b/debian/patches/fix_spell_error.patch
@@@ -1,60 -1,0 +1,60 @@@
- From 3dc224cdf43ef6dc454f5400c82f36187562af52 Mon Sep 17 00:00:00 2001
++From bfd39f6eed3b8db70b61fc5db148d91eb0aa6b06 Mon Sep 17 00:00:00 2001
+From: Hideki Yamane <henrich at debian.org>
+Date: Sun, 11 Oct 2015 21:16:59 +0200
+Subject: tiny spelling fix
+
+Patch-Name: fix_spell_error.patch
+---
+ Docs/pysvn_prog_ref.html | 4 ++--
+ Import/pycxx-6.2.6/Doc/Python2/PyCXX.html | 2 +-
+ Import/pycxx-6.2.6/Doc/Python3/PyCXX.html | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Docs/pysvn_prog_ref.html b/Docs/pysvn_prog_ref.html
+index 05de60e..c9844eb 100644
+--- a/Docs/pysvn_prog_ref.html
++++ b/Docs/pysvn_prog_ref.html
+@@ -691,7 +691,7 @@ checkin( [path,path],
+ </pre>
+ <p>
+ checkin the files in the path_list to the repository with the
+-specifed log_message. Set recurse to True to recursively checkin
++specified log_message. Set recurse to True to recursively checkin
+ a directory's children with the same log message. <span class="svn_1002000"> Set
+ keep_locks to True to prevent locks in the path being unlocked.</span>
+ </p>
+@@ -1027,7 +1027,7 @@ WC targets.
+ </div>
+
+ <p><span class="svn_1001000">native_eol parameter allows the line ending of files with
+-svn:eol-style propery set to native to be overriden.
++svn:eol-style properly set to native to be overridden.
+ Use None to use the eol-style of the Operating System,
+ use "LF" to use "\n", "CR" to use "\r" and "CRLF" to use "\r\n".</span>
+ </p>
+diff --git a/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html b/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html
+index c65270b..8682df4 100644
+--- a/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html
++++ b/Import/pycxx-6.2.6/Doc/Python2/PyCXX.html
+@@ -1251,7 +1251,7 @@ reference count is greater than one.</p>
+ <tr>
+ <td class="code">virtual void</td>
+ <td class="code">setItem (int offset, const Object&ob) </td>
+-<td>setItem is overriden to handle tuples properly. </td>
++<td>setItem is overridden to handle tuples properly. </td>
+ </tr>
+ <tr>
+ <td class="code">explicit</td>
+diff --git a/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html b/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html
+index 5846d52..9946e30 100644
+--- a/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html
++++ b/Import/pycxx-6.2.6/Doc/Python3/PyCXX.html
+@@ -1477,7 +1477,7 @@ reference count is greater than one.</p>
+ <tr>
+ <td class="code">virtual void</td>
+ <td class="code">setItem( int offset, const Object &ob ) </td>
+-<td>setItem is overriden to handle tuples properly. </td>
++<td>setItem is overridden to handle tuples properly. </td>
+ </tr>
+ <tr>
+ <td class="code">explicit</td>
diff --cc debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch
index 9b71cb7,0000000..52f3262
mode 100644,000000..100644
--- a/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch
+++ b/debian/patches/specify_platform_kfreebsd-hurd_as_linux.patch
@@@ -1,35 -1,0 +1,35 @@@
- From 002cd9e1fbe0ae086353d10460297a5c2d332519 Mon Sep 17 00:00:00 2001
++From 5594e8688e3ae2f4f7f592529f914bafccac6ce4 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor at debian.org>
+Date: Sun, 11 Oct 2015 21:16:58 +0200
+Subject: 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 <henrich at debian.org>
+
+Patch-Name: specify_platform_kfreebsd-hurd_as_linux.patch
+---
+ Source/setup_configure.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
- index 842edf2..ac6a47e 100644
++index 65fd457..b3d7c34 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
- @@ -200,6 +200,14 @@ class Setup:
++@@ -201,6 +201,14 @@ class Setup:
+ 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 )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pysvn.git
More information about the Python-modules-commits
mailing list