[Python-modules-commits] [pysvn] 04/11: merge patched into master
Josué Ortega
josue at moszumanska.debian.org
Mon Jan 29 00:35:50 UTC 2018
This is an automated email from the git hooks/post-receive script.
josue pushed a commit to branch master
in repository pysvn.
commit 1cfa141a50c611aaee8b57174cf5c97a893d9111
Merge: a32187a a9c30aa
Author: Josue Ortega <josue at debian.org>
Date: Sun Jan 28 17:20:15 2018 -0600
merge patched into master
Builder/version.info | 2 +-
Docs/pysvn_prog_ref.html | 12 +-
Examples/Client/svn_cmd.py | 15 +-
Import/pycxx-6.2.8/CXX/Python2/Exception.hxx | 259 -------
Import/pycxx-6.2.8/CXX/Python3/Exception.hxx | 260 -------
Import/pycxx-6.2.8/SourceForge/index.html | 188 -----
Import/pycxx-6.2.8/build-all.cmd | 52 --
Import/{pycxx-6.2.8 => pycxx-7.0.3}/COPYRIGHT | 0
Import/{pycxx-6.2.8 => pycxx-7.0.3}/CXX/Config.hxx | 6 +
.../Config.hxx => pycxx-7.0.3/CXX/CxxDebug.hxx} | 6 +-
.../{pycxx-6.2.8 => pycxx-7.0.3}/CXX/Exception.hxx | 0
.../CXX/Extensions.hxx | 0
.../CXX/IndirectPythonInterface.hxx | 0
.../{pycxx-6.2.8 => pycxx-7.0.3}/CXX/Objects.hxx | 0
.../CXX/Python2/Config.hxx | 0
.../CXX/Python2/CxxDebug.hxx | 0
Import/pycxx-7.0.3/CXX/Python2/Exception.hxx | 166 +++++
.../CXX/Python2/ExtensionModule.hxx | 6 +-
.../CXX/Python2/ExtensionOldType.hxx | 8 +-
.../CXX/Python2/ExtensionType.hxx | 47 +-
.../CXX/Python2/ExtensionTypeBase.hxx | 10 +-
.../CXX/Python2/Extensions.hxx | 2 +-
.../CXX/Python2/IndirectPythonInterface.hxx | 49 +-
.../CXX/Python2/Objects.hxx | 485 ++++++++-----
.../CXX/Python2/PythonType.hxx | 104 ++-
.../CXX/Python2/cxx_standard_exceptions.hxx | 46 ++
.../CXX/Python3/Config.hxx | 0
.../CXX/Python3/CxxDebug.hxx | 0
Import/pycxx-7.0.3/CXX/Python3/Exception.hxx | 166 +++++
.../CXX/Python3/ExtensionModule.hxx | 6 +-
.../CXX/Python3/ExtensionOldType.hxx | 8 +-
.../CXX/Python3/ExtensionType.hxx | 47 +-
.../CXX/Python3/ExtensionTypeBase.hxx | 11 +-
.../CXX/Python3/Extensions.hxx | 2 +-
.../CXX/Python3/IndirectPythonInterface.hxx | 42 +-
.../CXX/Python3/Objects.hxx | 215 +++---
.../CXX/Python3/PythonType.hxx | 92 ++-
.../CXX/Python3/cxx_standard_exceptions.hxx | 68 ++
.../{pycxx-6.2.8 => pycxx-7.0.3}/CXX/Version.hxx | 6 +-
.../{pycxx-6.2.8 => pycxx-7.0.3}/CXX/WrapPython.h | 0
.../Demo/Python2/example.cxx | 63 +-
.../Demo/Python2/example.def | 0
.../Demo/Python2/pycxx_iter.cxx | 0
.../Demo/Python2/pycxx_iter.hxx | 0
.../Demo/Python2/python.cxx | 0
.../Demo/Python2/range.cxx | 11 +-
.../Demo/Python2/range.hxx | 8 +-
.../Demo/Python2/rangetest.cxx | 0
.../Demo/Python2/setup.py | 56 +-
.../Demo/Python2/simple.cxx | 47 +-
.../Demo/Python2/test_example.py | 0
.../Demo/Python2/test_pycxx_iter.py | 0
.../Demo/Python2/test_simple.py | 13 +-
.../Demo/Python3/example.cxx | 55 +-
.../Demo/Python3/example.def | 0
.../Demo/Python3/pycxx_iter.cxx | 2 +-
.../Demo/Python3/pycxx_iter.hxx | 2 +-
.../Demo/Python3/python.cxx | 0
.../Demo/Python3/range.cxx | 22 +-
.../Demo/Python3/range.hxx | 12 +-
.../Demo/Python3/rangetest.cxx | 0
.../Demo/Python3/setup.py | 58 +-
.../Demo/Python3/simple.cxx | 77 ++-
.../Demo/Python3/simple2.cxx | 0
.../Demo/Python3/test_assert.hxx | 26 +-
.../Demo/Python3/test_example.py | 0
.../Demo/Python3/test_pycxx_iter.py | 0
.../Demo/Python3/test_simple.py | 58 +-
.../Demo/Python3/test_simple2.py | 0
.../Doc/Python2/PyCXX.html | 4 +-
.../Doc/Python2/style.css | 0
.../Doc/Python3/PyCXX.html | 163 ++---
.../Doc/Python3/make_contents.py | 12 +-
.../Doc/Python3/style.css | 0
.../{pycxx-6.2.8 => pycxx-7.0.3}/Lib/__init__.py | 0
Import/pycxx-7.0.3/PyCXX-Release-Notes.txt | 3 +
Import/{pycxx-6.2.8 => pycxx-7.0.3}/README.html | 83 ++-
Import/pycxx-7.0.3/README.txt | 3 +
.../RegressionTests/mem-leak.py | 0
Import/pycxx-7.0.3/SourceForge/PyCXX-Python2.html | 1 +
Import/pycxx-7.0.3/SourceForge/PyCXX-Python3.html | 1 +
Import/pycxx-7.0.3/SourceForge/README.html | 1 +
.../SourceForge/deploy.sh | 0
Import/pycxx-7.0.3/SourceForge/index.html | 59 ++
Import/pycxx-7.0.3/SourceForge/style.css | 1 +
.../Src/IndirectPythonInterface.cxx | 127 +---
Import/pycxx-7.0.3/Src/Python2/cxx_exceptions.cxx | 72 ++
.../Src/Python2/cxx_extensions.cxx | 764 +++++++++++++--------
.../Src/Python2/cxxextensions.c | 0
.../Src/Python2/cxxsupport.cxx | 0
Import/pycxx-7.0.3/Src/Python3/cxx_exceptions.cxx | 72 ++
.../Src/Python3/cxx_extensions.cxx | 615 ++++++++++-------
.../Src/Python3/cxxextensions.c | 0
.../Src/Python3/cxxsupport.cxx | 20 +-
Import/pycxx-7.0.3/Src/cxx_exceptions.cxx | 7 +
.../Src/cxx_extensions.cxx | 0
.../Src/cxxextensions.c | 0
.../Src/cxxsupport.cxx | 0
Import/pycxx-7.0.3/build-all.cmd | 67 ++
Import/{pycxx-6.2.8 => pycxx-7.0.3}/build-all.sh | 1 -
.../how_to_release_pycxx.txt | 7 +-
.../{pycxx-6.2.8 => pycxx-7.0.3}/make_src_kit.py | 2 +-
Import/{pycxx-6.2.8 => pycxx-7.0.3}/run_tests.cmd | 0
Import/{pycxx-6.2.8 => pycxx-7.0.3}/setup.py | 0
.../{pycxx-6.2.8 => pycxx-7.0.3}/setup_makefile.py | 26 +-
Import/{pycxx-6.2.8 => pycxx-7.0.3}/tag_pycxx.py | 32 +-
Kit/MacOSX/make_pkg.py | 18 +-
Source/build.cmd | 2 +
Source/pysvn_client_cmd_diff.cpp | 4 +-
Source/pysvn_client_cmd_prop.cpp | 3 +-
Source/setup_configure.py | 2 +
Tests/test-09.cmd | 191 +++---
Tests/test-09.sh | 16 +-
Tests/test-09.unix.known_good-py2-svn1.8.log | 120 ++--
Tests/test-09.unix.known_good-py2-svn1.9.log | 128 ++--
Tests/test-09.unix.known_good-py3-svn1.8.log | 122 ++--
Tests/test-09.unix.known_good-py3-svn1.9.log | 128 ++--
Tests/test-09.win32.known_good-py2-svn1.8.log | 82 ++-
Tests/test-09.win32.known_good-py2-svn1.9.log | 87 ++-
Tests/test-09.win32.known_good-py3-svn1.8.log | 82 ++-
Tests/test-09.win32.known_good-py3-svn1.9.log | 83 ++-
debian/.git-dpm | 6 +-
debian/changelog | 7 +
.../patches/0001-fix-multiple-arch-support.patch | 10 +-
124 files changed, 3638 insertions(+), 2492 deletions(-)
diff --cc debian/.git-dpm
index 7151ea5,0000000..a0265ee
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
- d7e3944164a843ef4e33a4e384a337984ea233d7
- d7e3944164a843ef4e33a4e384a337984ea233d7
- fdbb6c2ae0eaa851c9dbee243b205588a2ec1fa0
++a9c30aaa5907306e56791474c3a7364d9e2e6d86
++a9c30aaa5907306e56791474c3a7364d9e2e6d86
++5ca41ef4cd78e7ea3c071ab810ed7205dd538783
+5ca41ef4cd78e7ea3c071ab810ed7205dd538783
+pysvn_1.9.5.orig.tar.gz
+72bdb2b75c535144d4263c257c9255141c1a4fa7
+473495
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 056d798,0000000..e2a887b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,401 -1,0 +1,408 @@@
++pysvn (1.9.5-1) UNRELEASED; urgency=medium
++
++ * New upstream release (1.9.5):
++ - Update debian/patches.
++
++ -- Josue Ortega <josue at debian.org> Sun, 28 Jan 2018 17:32:15 -0600
++
+pysvn (1.9.4-3) unstable; urgency=medium
+
+ * Team upload.
+ * Update to build python3-svn for all supported python3 versions
+ (Closes: #862423)
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 01 Jul 2017 13:14:54 -0400
+
+pysvn (1.9.4-2) unstable; urgency=medium
+
+ * Adds patch 0001-fix-multiple-arch-support.patch to support
+ architectures besides amd64.
+ * debian/rules: Comments verbosity flag.
+
+ -- Josue Ortega <josue at debian.org> Sun, 09 Oct 2016 22:12:10 -0600
+
+pysvn (1.9.4-1) unstable; urgency=medium
+
+ * New upstream release:
+ - debian/rules: Updated --pycxx-dir in CONFIG_OPTIONS(3).
+ - debian/rules: Updated Import/pycxx-6.28 directory.
+ * debian/control:
+ - Changes python-cxx-dev build depend relationship grater-equal than
+ 7.0.1, (Closes: #839366).
+ - Removes suggests field with pyhon-svn-dbg in Python package.
+ * debian/watch: Updates origin URL.
+
+ -- Josue Ortega <josue at debian.org> Sun, 02 Oct 2016 17:22:10 -0600
+
+pysvn (1.8.0-2) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Josue Ortega ]
+ * debian/control:
+ - python-svn-dbg removed, since it was generated with no
+ debug symbols.
+ - Adds Python 3 package.
+ - Updates uploader's mail.
+ - Standards-Version updated to 3.9.8, no changes required.
+ - Changes python-cxx-dev build depend relationship to be strictly less
+ than 6.2.7.
+ * debian/rules: Adds Python3 package scripts.
+ * debian/copyright: Updates year and email for debian/* copyright
+ holder.
+
+ -- Josue Ortega <josue at debian.org> Tue, 05 Jul 2016 16:01:01 +0200
+
+pysvn (1.8.0-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #802121):
+ - 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 have been reordered.
+
+ -- Josue Ortega <josueortega at debian.org.gt> Sun, 20 Dec 2015 17:55:29 -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/0001-fix-multiple-arch-support.patch
index d9c08c1,0000000..e79685b
mode 100644,000000..100644
--- a/debian/patches/0001-fix-multiple-arch-support.patch
+++ b/debian/patches/0001-fix-multiple-arch-support.patch
@@@ -1,91 -1,0 +1,91 @@@
- From d7e3944164a843ef4e33a4e384a337984ea233d7 Mon Sep 17 00:00:00 2001
++From a9c30aaa5907306e56791474c3a7364d9e2e6d86 Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josue at debian.org>
+Date: Sun, 9 Oct 2016 21:16:25 -0600
+Subject: =?UTF-8?q?fix-multiple-arch-support=0AFixes=20issue=20building=20?=
+ =?UTF-8?q?the=20package=20on=20archs=20that=20are=20not=20amd64?=
+
+---
+ Source/setup_configure.py | 40 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 38 insertions(+), 2 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
- index 27aaf7c..44997ba 100644
++index 06e4a51..c04e413 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -14,6 +14,7 @@
+ #
+ import sys
+ import os
++import subprocess
+ import distutils
+ import distutils.sysconfig
+ import distutils.util
+@@ -21,6 +22,31 @@ import distutils.util
+ import xml.dom.minidom
+ import xml.sax
+
++def get_debian_lib_directory():
++ debian_lib_path = "/usr/lib/%(arch_name)s"
++ _process = subprocess.Popen(["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
++ stdout=subprocess.PIPE)
++ _stdout, _stderr = _process.communicate()
++
++ if _stderr is not None:
++ return None
++
++ _arch = None
++
++ if type(_stdout) == type(str()):
++ _arch = _stdout.replace("\n", "")
++ elif type(_stdout) == type(bytes()):
++ _arch = _stdout.decode("utf-8").replace("\n", "")
++
++ _debian_lib_path = debian_lib_path % {
++ "arch_name" : _arch
++ }
++
++ print('Debian lib directory %s\n', _debian_lib_path)
++
++ return _debian_lib_path
++
++
+ class SetupError(Exception):
+ pass
+
- @@ -1184,6 +1210,8 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1186,6 +1212,8 @@ class UnixCompilerGCC(CompilerGCC):
+ def __init__( self, setup ):
+ CompilerGCC.__init__( self, setup )
+
++ _debian_arch = get_debian_lib_directory()
++
+ self._find_paths_pycxx_dir = [
+ distutils.sysconfig.get_python_inc(), # typical Linux
+ '/usr/include'
- @@ -1210,8 +1238,13 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1212,8 +1240,13 @@ class UnixCompilerGCC(CompilerGCC):
+ '/usr/local/lib64', # typical 64bit Linux
+ '/usr/local/lib', # typical *BSD
+ '/usr/pkg/lib', # netbsd
+- '/usr/lib/x86_64-linux-gnu', # debian/unbuntu
++ # '/usr/lib/x86_64-linux-gnu', # debian/unbuntu
+ ]
++
++ if _debian_arch is not None \
++ and _debian_arch not in self._find_paths_svn_lib:
++ self._find_paths_svn_lib.append(_debian_arch)
++
+ self._find_paths_apr_inc = [
+ '/usr/include/apr-1', # typical Linux
+ '/usr/include/apr-1.0', # typical Linux
- @@ -1230,8 +1263,11 @@ class UnixCompilerGCC(CompilerGCC):
++@@ -1232,8 +1265,11 @@ class UnixCompilerGCC(CompilerGCC):
+ '/usr/local/lib', # typical *BSD
+ '/usr/local/apr/lib', # Mac OS X www.metissian.com
+ '/usr/pkg/lib', # netbsd
+- '/usr/lib/x86_64-linux-gnu', # debian/unbuntu
++ # '/usr/lib/x86_64-linux-gnu', # debian/unbuntu
+ ]
++ if _debian_arch is not None \
++ and _debian_arch not in self._find_paths_apr_lib:
++ self._find_paths_apr_lib.append(_debian_arch)
+
+ self._completeInit()
+
--
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