[Python-modules-commits] [pycxx] 04/08: merge patched into master
Josué Ortega
josue at moszumanska.debian.org
Sun Sep 25 19:06:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
josue pushed a commit to branch master
in repository pycxx.
commit d294c2c3a4a5fe4b28d15f46d9052f12fbadc040
Merge: d11e238 94f4f62
Author: Josue Ortega <josue at debian.org>
Date: Sun Sep 25 12:25:58 2016 -0600
merge patched into master
CXX/Config.hxx | 6 +
CXX/{Config.hxx => CxxDebug.hxx} | 6 +-
CXX/Python2/Exception.hxx | 289 ++++------
CXX/Python2/ExtensionModule.hxx | 6 +-
CXX/Python2/ExtensionOldType.hxx | 8 +-
CXX/Python2/ExtensionType.hxx | 51 +-
CXX/Python2/ExtensionTypeBase.hxx | 10 +-
CXX/Python2/Extensions.hxx | 2 +-
CXX/Python2/IndirectPythonInterface.hxx | 49 +-
CXX/Python2/Objects.hxx | 369 +++++++------
CXX/Python2/PythonType.hxx | 104 +++-
CXX/Python2/cxx_standard_exceptions.hxx | 46 ++
CXX/Python3/Exception.hxx | 290 ++++------
CXX/Python3/ExtensionModule.hxx | 6 +-
CXX/Python3/ExtensionOldType.hxx | 8 +-
CXX/Python3/ExtensionType.hxx | 51 +-
CXX/Python3/ExtensionTypeBase.hxx | 11 +-
CXX/Python3/Extensions.hxx | 2 +-
CXX/Python3/IndirectPythonInterface.hxx | 42 +-
CXX/Python3/Objects.hxx | 243 ++++++---
CXX/Python3/PythonType.hxx | 92 +++-
CXX/Python3/cxx_standard_exceptions.hxx | 68 +++
CXX/Version.hxx | 6 +-
Demo/Python2/example.cxx | 30 +-
Demo/Python2/range.cxx | 11 +-
Demo/Python2/range.hxx | 8 +-
Demo/Python2/simple.cxx | 49 +-
Demo/Python2/test_simple.py | 13 +-
Demo/Python3/example.cxx | 26 +-
Demo/Python3/pycxx_iter.cxx | 2 +-
Demo/Python3/pycxx_iter.hxx | 2 +-
Demo/Python3/range.cxx | 22 +-
Demo/Python3/range.hxx | 12 +-
Demo/Python3/simple.cxx | 108 +++-
Demo/Python3/test_assert.hxx | 19 +-
Demo/Python3/test_simple.py | 83 ++-
Doc/Python2/PyCXX.html | 34 +-
Doc/Python3/PyCXX.html | 187 +++----
Doc/Python3/make_contents.py | 12 +-
Lib/__init__.py | 4 +-
PyCXX-Release-Notes.txt | 13 +
README.html | 82 ++-
README.txt | 13 +
SourceForge/PyCXX-Python2.html | 1 +
SourceForge/PyCXX-Python3.html | 1 +
SourceForge/README.html | 1 +
SourceForge/deploy.sh | 2 +-
SourceForge/index.html | 118 +---
SourceForge/style.css | 1 +
Src/IndirectPythonInterface.cxx | 134 ++---
Src/Python2/cxx_exceptions.cxx | 72 +++
Src/Python2/cxx_extensions.cxx | 772 +++++++++++++++++----------
Src/Python3/cxx_exceptions.cxx | 72 +++
Src/Python3/cxx_extensions.cxx | 620 +++++++++++++--------
Src/Python3/cxxsupport.cxx | 20 +-
Src/cxx_exceptions.cxx | 7 +
build-all.cmd | 78 ++-
build-all.sh | 19 +-
debian/.git-dpm | 6 +-
debian/changelog | 9 +-
debian/patches/01_change_include_paths.patch | 2 +-
debian/patches/fix-version.patch | 25 -
debian/patches/series | 1 -
how_to_release_pycxx.txt | 12 +-
make_src_kit.py | 2 +-
setup.py | 16 +-
setup_makefile.py | 32 +-
tag_pycxx.py | 32 +-
68 files changed, 2695 insertions(+), 1855 deletions(-)
diff --cc debian/.git-dpm
index 8437959,0000000..42495c9
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
- 9a1156b8d789e1c81eba9ee9fb14aa7c8b36dd6a
- 9a1156b8d789e1c81eba9ee9fb14aa7c8b36dd6a
- ce15a1407d8b3267f8b0bc1253d7e131305234bd
++94f4f62f73fbf61f364f0fc80195263898a64aea
++94f4f62f73fbf61f364f0fc80195263898a64aea
++5183a3c282af02f765f3b0a763df8aa9c3a2672c
+5183a3c282af02f765f3b0a763df8aa9c3a2672c
+pycxx_7.0.1.orig.tar.gz
+7227ba62cae2459ba694e9bc30f9f73054ac80ca
+147541
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 7587ab1,0000000..b59917a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,314 -1,0 +1,319 @@@
- pycxx (6.2.6-3) UNRELEASED; urgency=medium
++pycxx (7.0.1-1) UNRELEASED; urgency=medium
+
++ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
- -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 21:48:35 +0200
++ [ Josue Ortega ]
++ * Team upload.
++ * New upsteram version.
++
++ -- Josue Ortega <josue at debian.org> Sun, 25 Sep 2016 12:26:59 -0600
+
+pycxx (6.2.6-2) unstable; urgency=medium
+
+ * Team upload.
+ * Rebuild to add support for python3.5
+ * Add dh-python to build-depends
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 11 Oct 2015 20:00:28 -0400
+
+pycxx (6.2.6-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * debian/control: Bump Standards-Version to 3.9.6; no changes needed.
+ * debian/copyright: Use the correct license shortname (BSD-3-clause
+ instead of BSD).
+ * debian/patches:
+ - fix-version.patch: Refreshed.
+ - fix-example-crash.patch: Removed; applied upstream.
+
+ -- Barry Warsaw <barry at debian.org> Mon, 17 Aug 2015 14:56:26 -0400
+
+pycxx (6.2.5-3) unstable; urgency=medium
+
+ * Team upload.
+ * Install python3 files in real vice symlinked location (Closes: #767831)
+ - Change debian/rules to use python3.Xm vice python3.X
+ - Bump minimum X-Python3-Version to 3.3 for compatibility with the new
+ location
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 13 Nov 2014 00:23:35 -0500
+
+pycxx (6.2.5-2) unstable; urgency=medium
+
+ * Team upload
+
+ [ Iain Lane ]
+ * Dereference symlinks when copying the examples into the test directory, so
+ that they exist when the autopkgtest tries to run them.
+
+ [ Scott Kitterman ]
+ * Rebuild to drop python3.3 support
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 12 Jul 2014 12:04:15 -0400
+
+pycxx (6.2.5-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #739879)
+ - drop upstream applied 02_fix_indentation.patch
+ - add fix-version.patch to fix setup.py version number
+ - fix-example-crash.patch: fix crash of example with python3.4-dbg
+ * additionally install sources into a folder independent of the python
+ version and provide PyCXX.pc to export its location
+ * add README.Debian documenting a way to use pycxx (Closes: #732120)
+ * debian/rules: clean to allow build twice in a row (Closes: #671415)
+ * Bump standard version to 3.9.5, no changes required
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 09 Mar 2014 14:48:16 +0100
+
+pycxx (6.2.4-5) unstable; urgency=low
+
+ * Team upload
+ * No change rebuild to drop python3.2 support
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 03 Aug 2013 22:39:21 -0400
+
+pycxx (6.2.4-4) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Julian Taylor ]
+ * drop obsolete python2.[4]-* break/replaces
+ * Bump standard version to 3.9.4, no changes required
+ * drop obsolete transitional python{3,}-cxx
+ * don't compress examples and fix their permissions
+ * add autopkgtest testing compilation
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Fri, 02 Aug 2013 18:53:51 +0200
+
+pycxx (6.2.4-3) unstable; urgency=low
+
+ * install into real include/python3* folder instead of symlink folder
+ Thanks to Sebastian Ramacher for the patch. (Closes: #700782)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 27 Feb 2013 19:34:50 +0100
+
+pycxx (6.2.4-2) unstable; urgency=low
+
+ * Remove symlink /usr/share/doc/python{,3}-cxx-dev before installing
+ - Closes: #696074
+ - thanks to Andreas Beckmann for the report and Ivo De Decker for the patch
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sat, 22 Dec 2012 14:02:12 +0100
+
+pycxx (6.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * fix dep-5 format error in copyright
+ * update package descriptions
+ * update to standard 3.9.3 (no changes necessary)
+ * debian/copyright: update format url
+ * add description to patches
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 04 Mar 2012 19:09:09 +0100
+
+pycxx (6.2.3-1) unstable; urgency=low
+
+ * New maintainer (Closes: #611061)
+ * Imported Upstream version 6.2.3
+ * drop debian patches changing comment style + indentation
+ * change to source format 3.0 (quilt)
+ * quiltify include path changing patches
+ * quiltify indentation fix patch of setup.py
+ - update version number to 6.2.3
+ * simplify debian/rules by using debhelper 7
+ * made non -dev packages virtual, files now contained in -dev packages
+ * removed build dependency on python{,3}-dev, was never needed
+ * debian/control:
+ - set Homepage to http://cxx.sourceforge.net/
+ - added Vcs-* fields
+ * Bump standard version to 3.9.2
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sat, 16 Apr 2011 01:47:47 +0200
+
+pycxx (6.2.0-7) unstable; urgency=low
+
+ * QA upload.
+ * No change rebuild for the python3.1 to 3.2 transition
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 09 Apr 2011 09:57:43 -0400
+
+pycxx (6.2.0-6) unstable; urgency=low
+
+ * QA upload
+ * add -w -n to 2to3 usage so the files are actually modified (LP: #730144)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 06 Mar 2011 18:14:57 +0100
+
+pycxx (6.2.0-5) unstable; urgency=low
+
+ * Orphan the package.
+
+ -- Matthias Klose <doko at debian.org> Tue, 25 Jan 2011 07:07:25 +0100
+
+pycxx (6.2.0-4) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Matthias Klose <doko at debian.org> Thu, 23 Sep 2010 01:51:34 +0200
+
+pycxx (6.2.0-3) experimental; urgency=low
+
+ * Use python3:* macros in the control file. Closes: #591955.
+ * Run 2to3 for python3-cxx. Closes: #595501.
+ * Fix typo in package description. Closes: #590634.
+
+ -- Matthias Klose <doko at debian.org> Mon, 13 Sep 2010 23:32:14 +0200
+
+pycxx (6.2.0-2) unstable; urgency=low
+
+ * Build packages for python3.
+
+ -- Matthias Klose <doko at debian.org> Sat, 17 Jul 2010 15:10:37 +0200
+
+pycxx (6.2.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sat, 17 Jul 2010 15:05:11 +0200
+
+pycxx (6.1.1-3) unstable; urgency=low
+
+ * Rebuild to add headers for python2.6. Closes: #567226.
+
+ -- Matthias Klose <doko at debian.org> Thu, 28 Jan 2010 14:37:35 +0100
+
+pycxx (6.1.1-2) unstable; urgency=low
+
+ * Install missing header files.
+
+ -- Matthias Klose <doko at debian.org> Sun, 03 Jan 2010 16:30:10 +0100
+
+pycxx (6.1.1-1) unstable; urgency=low
+
+ * New upstream version. Closes: #548315.
+
+ -- Matthias Klose <doko at debian.org> Sun, 03 Jan 2010 15:48:14 +0100
+
+pycxx (5.5.0-1ubuntu1) karmic; urgency=low
+
+ * Call setup.py install using --install-layout=deb.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 29 Aug 2009 11:45:49 +0200
+
+pycxx (5.5.0-1) unstable; urgency=low
+
+ * New upstream version. Closes: #536394.
+
+ -- Matthias Klose <doko at debian.org> Sat, 29 Aug 2009 10:32:19 +0200
+
+pycxx (5.4.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sun, 30 Nov 2008 14:30:21 +0000
+
+pycxx (5.4.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sun, 20 Jul 2008 18:08:58 +0200
+
+pycxx (5.4.0-2) unstable; urgency=low
+
+ * Fix some lintian warnings.
+
+ -- Matthias Klose <doko at debian.org> Wed, 25 Jun 2008 00:48:04 +0200
+
+pycxx (5.4.0-1) unstable; urgency=low
+
+ * New upstream version:
+ - license changed to BSD.
+ - bug fix release.
+ * Merge from Ubuntu:
+ - Apply header patches from sf#1640952.
+ - Install headers for the python debug builds.
+
+ -- Matthias Klose <doko at debian.org> Sat, 02 Jun 2007 09:26:34 +0200
+
+pycxx (5.3.6-1) unstable; urgency=low
+
+ * New upstream snapshot, to support python2.5.
+
+ -- Matthias Klose <doko at debian.org> Sat, 21 Oct 2006 17:43:45 +0200
+
+pycxx (5.3.5-3) unstable; urgency=low
+
+ * Update debian/watch.
+
+ -- Matthias Klose <doko at debian.org> Sun, 9 Jul 2006 16:26:36 +0200
+
+pycxx (5.3.5-2) unstable; urgency=low
+
+ * Updated for the renewed Python policy. Closes: #373488.
+
+ -- Matthias Klose <doko at debian.org> Fri, 16 Jun 2006 17:05:49 +0000
+
+pycxx (5.3.5-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove trainling slash in cp command (Closes: #339877).
+
+ -- Luk Claes <luk at debian.org> Sun, 1 Jan 2006 15:10:27 +0100
+
+pycxx (5.3.5-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sat, 15 Oct 2005 12:38:43 +0000
+
+pycxx (5.3.4-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Wed, 7 Sep 2005 20:37:58 +0200
+
+pycxx (5.3.3-3) unstable; urgency=low
+
+ * Fix file conflict.
+
+ -- Matthias Klose <doko at debian.org> Sat, 13 Aug 2005 13:09:43 +0200
+
+pycxx (5.3.3-2) unstable; urgency=low
+
+ * New upstream version, upload to unstable.
+
+ -- Matthias Klose <doko at debian.org> Sat, 13 Aug 2005 09:42:47 +0200
+
+pycxx (5.3.3-1ubuntu1) breezy; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 3 Jun 2005 13:01:13 +0000
+
+pycxx (5.3.2-1ubuntu1) hoary; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at ubuntu.com> Tue, 1 Mar 2005 22:45:30 +0100
+
+pycxx (5.3.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Matthias Klose <doko at debian.org> Sun, 23 Jan 2005 01:10:10 +0100
+
+pycxx (5.3.0-1) unstable; urgency=low
+
+ * Build python2.4 packages.
+
+ -- Matthias Klose <doko at debian.org> Sun, 12 Dec 2004 18:21:44 +0100
+
+pycxx (5.3.0-0ubuntu1) hoary; urgency=low
+
+ * Initial Release.
+
+ -- Matthias Klose <m at klose.in-berlin.de> Fri, 3 Dec 2004 17:16:12 +0100
+
diff --cc debian/patches/01_change_include_paths.patch
index afdefde,0000000..d797a30
mode 100644,000000..100644
--- a/debian/patches/01_change_include_paths.patch
+++ b/debian/patches/01_change_include_paths.patch
@@@ -1,41 -1,0 +1,41 @@@
- From f3a47448eb4298e38ee321b2ad4c81aa490138b3 Mon Sep 17 00:00:00 2001
++From 94f4f62f73fbf61f364f0fc80195263898a64aea Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:26:03 -0700
+Subject: fix includes to match packaged layout
+
+Forwarded: not-needed
+
+Patch-Name: 01_change_include_paths.patch
+---
+ Src/cxxextensions.c | 4 ++--
+ Src/cxxsupport.cxx | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Src/cxxextensions.c b/Src/cxxextensions.c
+index 28a8e1d..cfab556 100644
+--- a/Src/cxxextensions.c
++++ b/Src/cxxextensions.c
+@@ -37,7 +37,7 @@
+ #include "CXX/WrapPython.h"
+
+ #if PY_MAJOR_VERSION == 2
+-#include "Src/Python2/cxxextensions.c"
++#include "Python2/cxxextensions.c"
+ #else
+-#include "Src/Python3/cxxextensions.c"
++#include "Python3/cxxextensions.c"
+ #endif
+diff --git a/Src/cxxsupport.cxx b/Src/cxxsupport.cxx
+index 1f2fb43..946e60d 100644
+--- a/Src/cxxsupport.cxx
++++ b/Src/cxxsupport.cxx
+@@ -37,7 +37,7 @@
+ #include "CXX/WrapPython.h"
+
+ #if PY_MAJOR_VERSION == 2
+-#include "Src/Python2/cxxsupport.cxx"
++#include "Python2/cxxsupport.cxx"
+ #else
+-#include "Src/Python3/cxxsupport.cxx"
++#include "Python3/cxxsupport.cxx"
+ #endif
diff --cc debian/patches/series
index 6131224,0000000..90032d5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+01_change_include_paths.patch
- fix-version.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycxx.git
More information about the Python-modules-commits
mailing list