--- pycxx-5.5.0.orig/setup.py +++ pycxx-5.5.0/setup.py @@ -3,7 +3,8 @@ from distutils.command.install import install from distutils.core import setup -headers = glob (os.path.join ("CXX","*.hxx")) +headers = glob (os.path.join ("CXX","*.hxx")) + \ + glob (os.path.join ("CXX","*.h")) sources = glob (os.path.join ("Src", "*.cxx")) + \ glob (os.path.join ("Src", "*.c")) --- pycxx-5.5.0.orig/CXX/Objects.hxx +++ pycxx-5.5.0/CXX/Objects.hxx @@ -372,7 +372,7 @@ // PyObject_SetItem is too weird to be using from C++ // so it is intentionally omitted. - void delItem (const Object& key) + void delItem (const Object& /*key*/) { //if(PyObject_DelItem(p, *key) == -1) // failed to link on Windows? --- pycxx-5.5.0.orig/CXX/WrapPython.h +++ pycxx-5.5.0/CXX/WrapPython.h @@ -1,3 +1,4 @@ +/* //----------------------------------------------------------------------------- // // Copyright (c) 1998 - 2007, The Regents of the University of California @@ -34,16 +35,25 @@ // DAMAGE. // //----------------------------------------------------------------------------- +*/ #ifndef __PyCXX_wrap_python_hxx__ #define __PyCXX_wrap_python_hxx__ -// On some platforms we have to include time.h to get select defined +/* On some platforms we have to include time.h to get select defined */ #if !defined(__WIN32__) && !defined(WIN32) && !defined(_WIN32) && !defined(_WIN64) #include #endif -// pull in python definitions +/* Prevent warnings */ +#if defined(_XOPEN_SOURCE) + #undef _XOPEN_SOURCE +#endif +#if defined(_POSIX_C_SOURCE) + #undef _POSIX_C_SOURCE +#endif + +/* pull in python definitions */ #include #endif --- pycxx-5.5.0.orig/debian/compat +++ pycxx-5.5.0/debian/compat @@ -0,0 +1 @@ +5 --- pycxx-5.5.0.orig/debian/watch +++ pycxx-5.5.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/cxx/pycxx-(5[\d.]+)\.tar.gz --- pycxx-5.5.0.orig/debian/control +++ pycxx-5.5.0/debian/control @@ -0,0 +1,32 @@ +Source: pycxx +Section: python +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.7.1), python-central (>= 0.4.17), python-all-dev (>= 2.3.5-9) +XS-Python-Version: all +Standards-Version: 3.8.3 + +Package: python-cxx +Architecture: all +Depends: ${python:Depends} +Conflicts: python2.3-cxx, python2.4-cxx +Replaces: python2.3-cxx, python2.4-cxx +XB-Python-Version: ${python:Versions} +Description: A Set of facilities to extend Python with C++ + PyCXX is a set of C++ facilities to make it easier to write Python + extensions. The chief way in which PyCXX makes it easier to write + Python extensions is that it greatly increases the probability that + your program will not make a reference-counting error and will not + have to continually check error returns from the Python C API. + +Package: python-cxx-dev +Architecture: all +Depends: python-cxx, ${python:Depends}, python-dev +Conflicts: python2.3-cxx-dev, python2.4-cxx-dev +Replaces: python2.3-cxx-dev, python2.4-cxx-dev +Description: A Set of facilities to extend Python with C++ + PyCXX is a set of C++ facilities to make it easier to write Python + extensions. The chief way in which PyCXX makes it easier to write + Python extensions is that it greatly increases the probability that + your program will not make a reference-counting e rror and will not + have to continually check error returns from the Python C API. --- pycxx-5.5.0.orig/debian/copyright +++ pycxx-5.5.0/debian/copyright @@ -0,0 +1,66 @@ +This package was debianized by Matthias Klose +on Fri, 3 Dec 2004 17:16:12 +0100. + +It was downloaded from http://prdownloads.sourceforge.net/cxx/ + +Copyright: + +Upstream Authors: Barry Scott, Paul F. Dubois + +License: + + Copyright (c) 1998 - 2007 + The Regents of the University of California + Produced at the Lawrence Livermore National Laboratory + Written by Geoff Furnish, Paul F. Dubois, Barry A. Scott + UCRL-CODE-227018 + All rights reserved. + +This file is part of PyCXX. For details, see http://cxx.sourceforge.net. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, this + list of conditions and the disclaimer below. + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the disclaimer (as noted below) in the + documentation and/or materials provided with the distribution. + - Neither the name of the UC/LLNL nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS 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 REGENTS OF THE UNIVERSITY OF CALIFORNIA, +THE U.S. DEPARTMENT OF ENERGY OR 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. + +Additional BSD Notice + +1. This notice is required to be provided under our contract with the U.S. + Department of Energy (DOE). This work was produced at the University of + California, Lawrence Livermore National Laboratory under Contract No. + W-7405-ENG-48 with the DOE. + +2. Neither the United States Government nor the University of California + nor any of their employees, makes any warranty, express or implied, or + assumes any liability or responsibility for the accuracy, completeness, + or usefulness of any information, apparatus, product, or process disclosed, + or represents that its use would not infringe privately-owned rights. + +3. Also, reference herein to any specific commercial products, process, or + services by trade name, trademark, manufacturer or otherwise does not + necessarily constitute or imply its endorsement, recommendation, or + favoring by the United States Government or the University of California. + The views and opinions of authors expressed herein do not necessarily + state or reflect those of the United States Government or the University + of California, and shall not be used for advertising or product endorsement + purposes. + --- pycxx-5.5.0.orig/debian/rules +++ pycxx-5.5.0/debian/rules @@ -0,0 +1,158 @@ +#!/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 + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +PYVERS := $(shell pyversions -vs) +defver := $(shell /usr/bin/python -c 'import sys; print sys.version[:3]') + +PWD = $(shell pwd) + +p_cxx = python-cxx +d_cxx = debian/$(p_cxx) + + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: build-indep-stamp +# cd Demo && \ +# CFLAGS="-I$(PWD)" \ +# SUPPORT_DIR=$(PWD)/Src \ +# /usr/bin/python2.3 setup.py build --build-base $(PWD) + +# $(MAKE) -f example_common.mak \ +# CCC="g++ -c" \ +# CCCFLAGS="$(CFLAGS) -fPIC -I/usr/include/python2.3 -I." \ +# LDSHARED="g++ -shared" \ +# LDLIBS= \ +# PYTHON=/usr/bin/python2.3 + touch build-arch-stamp + +build-indep: build-indep-stamp $(PYVERS:%=build-python%) +build-indep-stamp: +# $(MAKE) doc + touch build-indep-stamp + +build-python%: + #cd bindings/python && python$* setup.py build + python$* setup.py build + touch build-python$* + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp build-python* + $(MAKE) -f example_common.mak clean + rm -rf build + rm -rf Demo/build + dh_clean + +pre-install: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + dh_installchangelogs -i + +install-indep: pre-install $(PYVERS:%=install-python%) install-arch + dh_installdocs -ppython-cxx README.html Doc/PyCXX.html + + rm -rf debian/python-cxx-dev/usr/share/doc/python-cxx-dev + mkdir -p debian/python-cxx-dev/usr/share/doc + ln -sf python-cxx \ + debian/python-cxx-dev/usr/share/doc/python-cxx-dev + mkdir -p debian/python-cxx-dev/usr/share/doc/python-cxx + cp -a Demo \ + debian/python-cxx-dev/usr/share/doc/python-cxx/examples + chmod 644 debian/python-cxx-dev/usr/share/doc/python-cxx/examples/*.?xx + rm -rf debian/python-cxx-dev/usr/share/doc/python-cxx/examples/build + + rm -rf debian/python-cxx/usr/include + +install-python%: + /usr/bin/python$* setup.py install \ + --root=$(shell pwd)/debian/python-cxx --install-layout=deb + find debian/python-cxx -name '*.egg-info' | xargs -r rm -f + mkdir -p debian/python-cxx-dev/usr/share/ + mv debian/python-cxx/usr/share/python$* \ + debian/python-cxx-dev/usr/share/ + mkdir -p debian/python-cxx-dev/usr/include + mv debian/python-cxx/usr/include/python$* debian/python-cxx-dev/usr/include/ + + mkdir -p debian/python-cxx-dev/usr/include/python$*_d + ln -s ../python$*/CXX debian/python-cxx-dev/usr/include/python$*_d/CXX + + +install-arch: + dh_testdir + dh_testroot +# dh_clean -k -s +# dh_installdirs -s +# cd Demo && \ +# CFLAGS="-I$(PWD)" \ +# SUPPORT_DIR=$(PWD)/Src \ +# /usr/bin/python2.3 setup.py install --root=$(shell pwd)/$(d23_cxx) +# dh_install -s + +# Build architecture independant packages +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + + dh_compress -i -X.py -X.cxx -X.hxx + dh_fixperms -i + DH_PYCENTRAL=nomove dh_pycentral -i + grep -v python:Versions debian/python-cxx.substvars \ + > debian/python-cxx.substvars.tmp + echo "python:Versions=$(PYVERS)" | sed 's/ /, /g' \ + >> debian/python-cxx.substvars.tmp + mv debian/python-cxx.substvars.tmp debian/python-cxx.substvars + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture dependant packages +binary-arch: build-arch install-arch +# dh_testdir +# dh_testroot +# dh_installchangelogs -a +# dh_installdocs -a +# dh_installexamples -a +# dh_strip -a +# dh_compress -a +# dh_fixperms -a +# 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 install-indep install-arch configure --- pycxx-5.5.0.orig/debian/README.debian +++ pycxx-5.5.0/debian/README.debian @@ -0,0 +1,8 @@ +pycxx for Ubuntu (and Debian) +----------------------------- + +- python-cxx just contains just an empty CXX package. +- python-cxx-dev contains the development files to build extensions + using PyCXX. Holds the example files as well. + + -- Matthias Klose , Fri, 3 Dec 2004 17:16:12 +0100 --- pycxx-5.5.0.orig/debian/changelog +++ pycxx-5.5.0/debian/changelog @@ -0,0 +1,121 @@ +pycxx (5.5.0-2) unstable; urgency=low + + * Call setup.py install with --install-layout=deb. Closes: #556364. + * Fix typo in package description. Closes: #544425, #545953. + + -- Matthias Klose Mon, 16 Nov 2009 21:30:48 +0100 + +pycxx (5.5.0-1) unstable; urgency=low + + * New upstream version. Closes: #536394. + + -- Matthias Klose Sat, 29 Aug 2009 10:32:19 +0200 + +pycxx (5.4.2-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sun, 30 Nov 2008 14:30:21 +0000 + +pycxx (5.4.1-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sun, 20 Jul 2008 18:08:58 +0200 + +pycxx (5.4.0-2) unstable; urgency=low + + * Fix some lintian warnings. + + -- Matthias Klose 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 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 Sat, 21 Oct 2006 17:43:45 +0200 + +pycxx (5.3.5-3) unstable; urgency=low + + * Update debian/watch. + + -- Matthias Klose 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 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 Sun, 1 Jan 2006 15:10:27 +0100 + +pycxx (5.3.5-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 15 Oct 2005 12:38:43 +0000 + +pycxx (5.3.4-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Wed, 7 Sep 2005 20:37:58 +0200 + +pycxx (5.3.3-3) unstable; urgency=low + + * Fix file conflict. + + -- Matthias Klose Sat, 13 Aug 2005 13:09:43 +0200 + +pycxx (5.3.3-2) unstable; urgency=low + + * New upstream version, upload to unstable. + + -- Matthias Klose Sat, 13 Aug 2005 09:42:47 +0200 + +pycxx (5.3.3-1ubuntu1) breezy; urgency=low + + * New upstream version. + + -- Matthias Klose Fri, 3 Jun 2005 13:01:13 +0000 + +pycxx (5.3.2-1ubuntu1) hoary; urgency=low + + * New upstream version. + + -- Matthias Klose Tue, 1 Mar 2005 22:45:30 +0100 + +pycxx (5.3.1-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sun, 23 Jan 2005 01:10:10 +0100 + +pycxx (5.3.0-1) unstable; urgency=low + + * Build python2.4 packages. + + -- Matthias Klose Sun, 12 Dec 2004 18:21:44 +0100 + +pycxx (5.3.0-0ubuntu1) hoary; urgency=low + + * Initial Release. + + -- Matthias Klose Fri, 3 Dec 2004 17:16:12 +0100 +