diff -Nru pyode-1.2.0/debian/changelog pyode-1.2.0/debian/changelog --- pyode-1.2.0/debian/changelog 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/changelog 2018-04-18 08:05:36.000000000 +0000 @@ -1,3 +1,20 @@ +pyode (1.2.0-4+cvs20090320.3) unstable; urgency=medium + + * Team upload. + * Fix team name + * Moved packaging from SVN to salsa.debian.org + * source format 3.0 (quilt), switch from dpatch to quilt + * Remove unused files d/description.in and d/control.in + * cme fix dpkg-control: + - Standards-Version: 4.1.4 + - Consistent formatting + - Remove unneeded version restrictions + * Suggests: python-pyode-doc + Closes: #849975 + * d/rules: short debhelper using pybuild + + -- Andreas Tille Wed, 18 Apr 2018 10:05:36 +0200 + pyode (1.2.0-4+cvs20090320.2) unstable; urgency=medium * Non-maintainer upload diff -Nru pyode-1.2.0/debian/clean pyode-1.2.0/debian/clean --- pyode-1.2.0/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ pyode-1.2.0/debian/clean 2018-04-18 08:05:36.000000000 +0000 @@ -0,0 +1 @@ +_trimesh_switch.pyx diff -Nru pyode-1.2.0/debian/control pyode-1.2.0/debian/control --- pyode-1.2.0/debian/control 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/control 2018-04-18 08:05:36.000000000 +0000 @@ -1,21 +1,30 @@ Source: pyode +Maintainer: NeuroDebian Team +Uploaders: Yaroslav Halchenko , + Michael Hanke Section: python Priority: optional -Maintainer: ExpPsy Maintainers -Uploaders: Yaroslav Halchenko , Michael Hanke -Build-Depends: debhelper (>= 10~), python-all-dev (>= 2.6.6-3~), libode-dev (>=0.7), dpatch, python-pyrex -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 10~), + dh-python, + python-all-dev, + libode-dev, + python-pyrex +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/neurodebian-team/pyode +Vcs-Git: https://salsa.debian.org/neurodebian-team/pyode.git Homepage: http://pyode.sourceforge.net/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-exppsy/pyode/trunk/ -Vcs-svn: svn://svn.debian.org/pkg-exppsy/pyode/trunk/ - Package: python-pyode Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends} -Conflicts: python2.3-pyode, python2.4-pyode -Replaces: python2.3-pyode, python2.4-pyode +Depends: ${python:Depends}, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: python2.3-pyode, + python2.4-pyode Provides: ${python:Provides} +Replaces: python2.3-pyode, + python2.4-pyode +Suggests: python-pyode-doc Description: Python bindings for The Open Dynamics Engine PyODE is a set of open-source Python bindings for The Open Dynamics Engine, an open-source physics engine. PyODE also includes an XODE @@ -26,6 +35,7 @@ Package: python-pyode-doc Architecture: all Section: doc +Depends: ${misc:Depends} Description: Python bindings for The Open Dynamics Engine PyODE is a set of open-source Python bindings for The Open Dynamics Engine, an open-source physics engine. PyODE also includes an XODE diff -Nru pyode-1.2.0/debian/control.in pyode-1.2.0/debian/control.in --- pyode-1.2.0/debian/control.in 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/control.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#define RUNWITH sed -e "/#include \"description.in\"/r debian/description.in" -e "/#.*/d" -Source: pyode -Section: science -Priority: optional -Maintainer: ExpPsy Maintainers -Uploaders: Yaroslav Halchenko , Michael Hanke -Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-10), python-central (>=0.4.17), libode0-dev, dpatch -XS-Python-Version: all -Standards-Version: 3.7.2 - -Package: python-pyode -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends} -Conflicts: python2.3-pyode, python2.4-pyode -Replaces: python2.3-pyode, python2.4-pyode -Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} -#include "description.in" - . - This package provides PyODE for supported versions of Python. - -Package: python-pyode-doc -Architecture: all -Section: doc -#include "description.in" - . - This package provides examples for PyODE. diff -Nru pyode-1.2.0/debian/description.in pyode-1.2.0/debian/description.in --- pyode-1.2.0/debian/description.in 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/description.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Description: open-source Python bindings for The Open Dynamics Engine - PyODE is a set of open-source Python bindings for The Open Dynamics - Engine, an open-source physics engine. PyODE also includes an XODE - parser. - . - Homepage: http://pyode.sourceforge.net/ diff -Nru pyode-1.2.0/debian/docs pyode-1.2.0/debian/docs --- pyode-1.2.0/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ pyode-1.2.0/debian/docs 2018-04-18 08:05:36.000000000 +0000 @@ -0,0 +1,2 @@ +AUTHORS +README diff -Nru pyode-1.2.0/debian/patches/00list pyode-1.2.0/debian/patches/00list --- pyode-1.2.0/debian/patches/00list 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -00_upstream_1.2.0-now.dpatch diff -Nru pyode-1.2.0/debian/patches/00_upstream_1.2.0-now.dpatch pyode-1.2.0/debian/patches/00_upstream_1.2.0-now.dpatch --- pyode-1.2.0/debian/patches/00_upstream_1.2.0-now.dpatch 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/patches/00_upstream_1.2.0-now.dpatch 2018-04-18 08:05:36.000000000 +0000 @@ -1,13 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 00_upstream_1.2.0-now.dpatch by Yaroslav Halchenko -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Upstream changes since 1.2.0 till 20090320 +Author: Yaroslav Halchenko +Description: Upstream changes since 1.2.0 till 20090320 -@DPATCH@ -diff -urNad pyode-1.2.0~/ChangeLog pyode-1.2.0/ChangeLog ---- pyode-1.2.0~/ChangeLog 2006-11-28 11:33:29.000000000 -0500 -+++ pyode-1.2.0/ChangeLog 2009-03-20 12:06:16.000000000 -0400 +--- a/ChangeLog ++++ b/ChangeLog @@ -1,8 +1,56 @@ -2006-11-28 Matthias Baas +2009-02-19 Ethan Glasser-Camp @@ -143,10 +138,9 @@ * src\geomobject.pyx (setCollideBits, setCategoryBits): Bits can now also be passed as int. Updated doc about collide and category bits (which are actually long instead of int). -diff -urNad pyode-1.2.0~/examples/tutorial3.py pyode-1.2.0/examples/tutorial3.py ---- pyode-1.2.0~/examples/tutorial3.py 2005-12-16 12:06:48.000000000 -0500 -+++ pyode-1.2.0/examples/tutorial3.py 2009-03-20 12:06:16.000000000 -0400 -@@ -70,7 +70,7 @@ +--- a/examples/tutorial3.py ++++ b/examples/tutorial3.py +@@ -70,7 +70,7 @@ def draw_body(body): glMultMatrixd(rot) if body.shape=="box": sx,sy,sz = body.boxsize @@ -155,7 +149,7 @@ glutSolidCube(1) glPopMatrix() -@@ -93,21 +93,22 @@ +@@ -93,21 +93,22 @@ def create_box(world, space, density, lx geom = ode.GeomBox(space, lengths=body.boxsize) geom.setBody(body) @@ -181,7 +175,7 @@ counter=0 objcount+=1 -@@ -197,6 +198,9 @@ +@@ -197,6 +198,9 @@ floor = ode.GeomPlane(space, (0,1,0), 0) # A list with ODE bodies bodies = [] @@ -191,10 +185,9 @@ # A joint group for the contact joints that are generated whenever # two bodies collide contactgroup = ode.JointGroup() -diff -urNad pyode-1.2.0~/setup.py pyode-1.2.0/setup.py ---- pyode-1.2.0~/setup.py 2007-01-11 11:37:39.000000000 -0500 -+++ pyode-1.2.0/setup.py 2009-03-20 12:06:16.000000000 -0400 -@@ -7,6 +7,10 @@ +--- a/setup.py ++++ b/setup.py +@@ -7,6 +7,10 @@ import distutils.sysconfig import shutil, os, os.path, sys, glob from stat import * @@ -205,7 +198,7 @@ # Include directories INC_DIRS = [] # Library directories -@@ -15,8 +19,10 @@ +@@ -15,8 +19,10 @@ LIB_DIRS = [] LIBS = [] # Additional compiler arguments CC_ARGS = [] @@ -216,7 +209,7 @@ # If your version of ODE was compiled with OPCODE (trimesh support) enabled, # this should be set to True. -@@ -46,7 +52,6 @@ +@@ -46,7 +52,6 @@ else: LIBS += ["ode", "stdc++"] @@ -224,10 +217,9 @@ ###################################################################### ###################################################################### ###################################################################### -diff -urNad pyode-1.2.0~/src/body.pyx pyode-1.2.0/src/body.pyx ---- pyode-1.2.0~/src/body.pyx 2005-06-06 09:09:30.000000000 -0400 -+++ pyode-1.2.0/src/body.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -43,7 +43,7 @@ +--- a/src/body.pyx ++++ b/src/body.pyx +@@ -43,7 +43,7 @@ cdef class Body: # (set via __getattr__ and __setattr__) cdef object userattribs @@ -236,10 +228,9 @@ self.bid = dBodyCreate(world.wid) def __init__(self, World world not None): -diff -urNad pyode-1.2.0~/src/contact.pyx pyode-1.2.0/src/contact.pyx ---- pyode-1.2.0~/src/contact.pyx 2004-11-15 15:16:03.000000000 -0500 -+++ pyode-1.2.0/src/contact.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -38,7 +38,7 @@ +--- a/src/contact.pyx ++++ b/src/contact.pyx +@@ -38,7 +38,7 @@ cdef class Contact: cdef dContact _contact @@ -248,10 +239,9 @@ self._contact.surface.mode = ContactBounce self._contact.surface.mu = dInfinity -diff -urNad pyode-1.2.0~/src/declarations.pyx pyode-1.2.0/src/declarations.pyx ---- pyode-1.2.0~/src/declarations.pyx 2006-11-10 05:53:40.000000000 -0500 -+++ pyode-1.2.0/src/declarations.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -49,6 +49,8 @@ +--- a/src/declarations.pyx ++++ b/src/declarations.pyx +@@ -49,6 +49,8 @@ cdef extern from "ode/ode.h": int _dummy cdef struct dxTriMeshData: int _dummy @@ -260,7 +250,7 @@ # Types ctypedef dxWorld* dWorldID -@@ -58,6 +60,7 @@ +@@ -58,6 +60,7 @@ cdef extern from "ode/ode.h": ctypedef dxJoint* dJointID ctypedef dxJointGroup* dJointGroupID ctypedef dxTriMeshData* dTriMeshDataID @@ -268,7 +258,7 @@ ctypedef dReal dVector3[4] ctypedef dReal dVector4[4] ctypedef dReal dMatrix3[4*3] -@@ -81,6 +84,7 @@ +@@ -81,6 +84,7 @@ cdef extern from "ode/ode.h": dVector3 t2 ctypedef void dNearCallback(void* data, dGeomID o1, dGeomID o2) @@ -276,7 +266,7 @@ ctypedef struct dSurfaceParameters: int mode -@@ -111,6 +115,7 @@ +@@ -111,6 +115,7 @@ cdef extern from "ode/ode.h": void dWorldDestroy (dWorldID) void dCloseODE() @@ -284,7 +274,7 @@ void dWorldSetGravity (dWorldID, dReal x, dReal y, dReal z) void dWorldGetGravity (dWorldID, dVector3 gravity) -@@ -136,6 +141,10 @@ +@@ -136,6 +141,10 @@ cdef extern from "ode/ode.h": int dWorldGetAutoDisableSteps (dWorldID) void dWorldSetAutoDisableTime (dWorldID, dReal time) dReal dWorldGetAutoDisableTime (dWorldID) @@ -295,7 +285,7 @@ void dWorldImpulseToForce (dWorldID, dReal stepsize, dReal ix, dReal iy, dReal iz, dVector3 force) -@@ -281,6 +290,10 @@ +@@ -281,6 +290,10 @@ cdef extern from "ode/ode.h": void dJointGetUniversalAxis1 (dJointID, dVector3 result) void dJointGetUniversalAxis2 (dJointID, dVector3 result) dReal dJointGetUniversalParam (dJointID, int parameter) @@ -306,7 +296,7 @@ int dJointGetAMotorNumAxes (dJointID) void dJointGetAMotorAxis (dJointID, int anum, dVector3 result) int dJointGetAMotorAxisRel (dJointID, int anum) -@@ -446,8 +459,24 @@ +@@ -446,8 +459,24 @@ cdef extern from "ode/ode.h": void dGeomTriMeshGetTriangle (dGeomID g, int Index, dVector3 *v0, dVector3 *v1, dVector3 *v2) @@ -331,10 +321,9 @@ + dGeomID dCreateHeightfield (dSpaceID space, dHeightfieldDataID data, + int bPlaceable) + -diff -urNad pyode-1.2.0~/src/geomobject.pyx pyode-1.2.0/src/geomobject.pyx ---- pyode-1.2.0~/src/geomobject.pyx 2006-01-17 04:07:54.000000000 -0500 -+++ pyode-1.2.0/src/geomobject.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -52,7 +52,9 @@ +--- a/src/geomobject.pyx ++++ b/src/geomobject.pyx +@@ -52,7 +52,9 @@ cdef class GeomObject: # A dictionary with user defined attributes cdef object attribs @@ -345,7 +334,7 @@ self.gid = NULL self.space = None self.body = None -@@ -75,6 +77,12 @@ +@@ -75,6 +77,12 @@ cdef class GeomObject: def __setattr__(self, name, val): self.attribs[name]=val @@ -358,10 +347,9 @@ def _id(self): """_id() -> int -diff -urNad pyode-1.2.0~/src/geoms.pyx pyode-1.2.0/src/geoms.pyx ---- pyode-1.2.0~/src/geoms.pyx 2006-11-10 05:53:40.000000000 -0500 -+++ pyode-1.2.0/src/geoms.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -30,7 +30,7 @@ +--- a/src/geoms.pyx ++++ b/src/geoms.pyx +@@ -30,7 +30,7 @@ cdef class GeomSphere(GeomObject): GeomSphere(space=None, radius=1.0) """ @@ -370,7 +358,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ cdef class GeomBox(GeomObject): GeomBox(space=None, lengths=(1.0, 1.0, 1.0)) """ @@ -379,7 +367,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -163,7 +163,7 @@ +@@ -163,7 +163,7 @@ cdef class GeomPlane(GeomObject): """ @@ -388,7 +376,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -223,7 +223,7 @@ +@@ -223,7 +223,7 @@ cdef class GeomCapsule(GeomObject): The length parameter does not include the caps. """ @@ -397,7 +385,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -285,7 +285,7 @@ +@@ -285,7 +285,7 @@ cdef class GeomCylinder(GeomObject): GeomCylinder(space=None, radius=0.5, length=1.0) """ @@ -406,7 +394,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -337,7 +337,7 @@ +@@ -337,7 +337,7 @@ cdef class GeomRay(GeomObject): """ @@ -415,7 +403,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -362,15 +362,40 @@ +@@ -362,15 +362,40 @@ cdef class GeomRay(GeomObject): return id def setLength(self, rlen): @@ -456,7 +444,7 @@ cdef dVector3 start cdef dVector3 dir dGeomRayGet(self.gid, start, dir) -@@ -392,7 +417,7 @@ +@@ -392,7 +417,7 @@ cdef class GeomTransform(GeomObject): cdef object geom @@ -465,9 +453,8 @@ cdef SpaceBase sp cdef dSpaceID sid -diff -urNad pyode-1.2.0~/src/heightfield.pyx pyode-1.2.0/src/heightfield.pyx ---- pyode-1.2.0~/src/heightfield.pyx 1969-12-31 19:00:00.000000000 -0500 -+++ pyode-1.2.0/src/heightfield.pyx 2009-03-20 12:06:16.000000000 -0400 +--- /dev/null ++++ b/src/heightfield.pyx @@ -0,0 +1,59 @@ +###################################################################### +# Python Open Dynamics Engine Wrapper @@ -528,9 +515,8 @@ + cdef long id + id = self.gid + return id -diff -urNad pyode-1.2.0~/src/heightfielddata.pyx pyode-1.2.0/src/heightfielddata.pyx ---- pyode-1.2.0~/src/heightfielddata.pyx 1969-12-31 19:00:00.000000000 -0500 -+++ pyode-1.2.0/src/heightfielddata.pyx 2009-03-20 12:06:16.000000000 -0400 +--- /dev/null ++++ b/src/heightfielddata.pyx @@ -0,0 +1,54 @@ +###################################################################### +# Python Open Dynamics Engine Wrapper @@ -586,10 +572,9 @@ + tup = data + callback, arg = tup + return callback(arg, x, z) -diff -urNad pyode-1.2.0~/src/joints.pyx pyode-1.2.0/src/joints.pyx ---- pyode-1.2.0~/src/joints.pyx 2006-11-10 05:43:23.000000000 -0500 -+++ pyode-1.2.0/src/joints.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -47,7 +47,7 @@ +--- a/src/joints.pyx ++++ b/src/joints.pyx +@@ -47,7 +47,7 @@ cdef class JointGroup: # A list of Python joints that were added to the group cdef object jointlist @@ -598,7 +583,7 @@ self.gid = dJointGroupCreate(0) def __init__(self): -@@ -108,7 +108,7 @@ +@@ -108,7 +108,7 @@ cdef class Joint: # (set via __getattr__ and __setattr__) cdef object userattribs @@ -607,7 +592,7 @@ self.jid = NULL self.world = None self.feedback = NULL -@@ -263,7 +263,7 @@ +@@ -263,7 +263,7 @@ cdef class BallJoint(Joint): BallJoint(world, jointgroup=None) """ @@ -616,7 +601,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -335,7 +335,7 @@ +@@ -335,7 +335,7 @@ cdef class HingeJoint(Joint): HingeJoint(world, jointgroup=None) """ @@ -625,7 +610,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -489,7 +489,7 @@ +@@ -489,7 +489,7 @@ cdef class SliderJoint(Joint): SlideJoint(world, jointgroup=None) """ @@ -634,7 +619,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -575,7 +575,7 @@ +@@ -575,7 +575,7 @@ cdef class UniversalJoint(Joint): UniversalJoint(world, jointgroup=None) """ @@ -643,7 +628,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -684,13 +684,25 @@ +@@ -684,13 +684,25 @@ cdef class UniversalJoint(Joint): """ dJointAddUniversalTorques(self.jid, torque1, torque2) @@ -670,7 +655,7 @@ # Hinge2Joint -@@ -702,7 +714,7 @@ +@@ -702,7 +714,7 @@ cdef class Hinge2Joint(Joint): Hinge2Joint(world, jointgroup=None) """ @@ -679,7 +664,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -858,7 +870,7 @@ +@@ -858,7 +870,7 @@ cdef class FixedJoint(Joint): FixedJoint(world, jointgroup=None) """ @@ -688,7 +673,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -893,7 +905,7 @@ +@@ -893,7 +905,7 @@ cdef class ContactJoint(Joint): ContactJoint(world, jointgroup, contact) """ @@ -697,7 +682,7 @@ cdef JointGroup jg cdef dJointGroupID jgid jgid=NULL -@@ -916,7 +928,7 @@ +@@ -916,7 +928,7 @@ cdef class AMotor(Joint): AMotor(world, jointgroup=None) """ @@ -706,7 +691,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -1089,7 +1101,7 @@ +@@ -1089,7 +1101,7 @@ cdef class LMotor(Joint): LMotor(world, jointgroup=None) """ @@ -715,7 +700,7 @@ cdef JointGroup jg cdef dJointGroupID jgid -@@ -1178,7 +1190,7 @@ +@@ -1178,7 +1190,7 @@ cdef class Plane2DJoint(Joint): Plane2DJoint(world, jointgroup=None) """ @@ -724,10 +709,9 @@ cdef JointGroup jg cdef dJointGroupID jgid -diff -urNad pyode-1.2.0~/src/mass.pyx pyode-1.2.0/src/mass.pyx ---- pyode-1.2.0~/src/mass.pyx 2006-05-30 10:23:44.000000000 -0400 -+++ pyode-1.2.0/src/mass.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -40,7 +40,7 @@ +--- a/src/mass.pyx ++++ b/src/mass.pyx +@@ -40,7 +40,7 @@ cdef class Mass: """ cdef dMass _mass @@ -736,10 +720,9 @@ dMassSetZero(&self._mass) def setZero(self): -diff -urNad pyode-1.2.0~/src/ode.pyx pyode-1.2.0/src/ode.pyx ---- pyode-1.2.0~/src/ode.pyx 2006-11-10 05:53:40.000000000 -0500 -+++ pyode-1.2.0/src/ode.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -151,7 +151,10 @@ +--- a/src/ode.pyx ++++ b/src/ode.pyx +@@ -151,7 +151,10 @@ Infinity = dInfinity ###################################################################### # Lookup table for geom objects: C ptr -> Python object @@ -751,7 +734,7 @@ # Mass include "mass.pyx" -@@ -182,6 +185,8 @@ +@@ -182,6 +185,8 @@ include "geoms.pyx" # (trimesh_dummy.pyx) if trimesh support is not available/desired. include "_trimesh_switch.pyx" @@ -760,7 +743,7 @@ def collide(geom1, geom2): """collide(geom1, geom2) -> contacts -@@ -286,7 +291,15 @@ +@@ -286,7 +291,15 @@ def CloseODE(): """ dCloseODE() @@ -776,10 +759,9 @@ #environment = Body(None) environment = None +InitODE() -diff -urNad pyode-1.2.0~/src/space.pyx pyode-1.2.0/src/space.pyx ---- pyode-1.2.0~/src/space.pyx 2006-04-13 09:09:58.000000000 -0400 -+++ pyode-1.2.0/src/space.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -66,7 +66,7 @@ +--- a/src/space.pyx ++++ b/src/space.pyx +@@ -66,7 +66,7 @@ cdef class SpaceBase(GeomObject): # is the geom object (Python wrapper). This is used in collide_callback() # cdef object geom_dict @@ -788,7 +770,7 @@ pass def __init__(self, *a, **kw): -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ cdef class SimpleSpace(SpaceBase): problems with the collision system. """ @@ -797,7 +779,7 @@ cdef SpaceBase sp cdef dSpaceID parentid -@@ -263,7 +263,7 @@ +@@ -263,7 +263,7 @@ cdef class HashSpace(SpaceBase): can be quickly paired with the objects around it. """ @@ -806,7 +788,7 @@ cdef SpaceBase sp cdef dSpaceID parentid -@@ -322,7 +322,7 @@ +@@ -322,7 +322,7 @@ cdef class QuadTreeSpace(SpaceBase): Currently getGeom() is not implemented for the quadtree space. """ @@ -815,7 +797,7 @@ cdef SpaceBase sp cdef dSpaceID parentid cdef dVector3 c -@@ -351,22 +351,22 @@ +@@ -351,22 +351,22 @@ cdef class QuadTreeSpace(SpaceBase): pass @@ -846,10 +828,9 @@ - + raise ValueError, "Unknown space type (%d)"%space_type + -diff -urNad pyode-1.2.0~/src/trimesh.pyx pyode-1.2.0/src/trimesh.pyx ---- pyode-1.2.0~/src/trimesh.pyx 2004-11-15 15:16:03.000000000 -0500 -+++ pyode-1.2.0/src/trimesh.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -38,7 +38,7 @@ +--- a/src/trimesh.pyx ++++ b/src/trimesh.pyx +@@ -38,7 +38,7 @@ cdef class GeomTriMesh(GeomObject): # Keep a reference to the data cdef TriMeshData data @@ -858,7 +839,7 @@ cdef SpaceBase sp cdef dSpaceID sid -@@ -91,4 +91,10 @@ +@@ -91,4 +91,10 @@ cdef class GeomTriMesh(GeomObject): dGeomTriMeshGetTriangle(self.gid, idx, vp0, vp1, vp2) return ((v0[0],v0[1],v0[2]), (v1[0],v1[1],v1[2]), (v2[0],v2[1],v2[2])) @@ -869,10 +850,9 @@ + + return dGeomTriMeshGetTriangleCount(self.gid) -diff -urNad pyode-1.2.0~/src/trimeshdata.pyx pyode-1.2.0/src/trimeshdata.pyx ---- pyode-1.2.0~/src/trimeshdata.pyx 2004-11-15 15:16:04.000000000 -0500 -+++ pyode-1.2.0/src/trimeshdata.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -27,7 +27,7 @@ +--- a/src/trimeshdata.pyx ++++ b/src/trimeshdata.pyx +@@ -27,7 +27,7 @@ cdef class TriMeshData: cdef dReal* vertex_buffer cdef int* face_buffer @@ -881,10 +861,9 @@ self.tmdid = dGeomTriMeshDataCreate() self.vertex_buffer = NULL self.face_buffer = NULL -diff -urNad pyode-1.2.0~/src/world.pyx pyode-1.2.0/src/world.pyx ---- pyode-1.2.0~/src/world.pyx 2004-11-15 15:16:04.000000000 -0500 -+++ pyode-1.2.0/src/world.pyx 2009-03-20 12:06:16.000000000 -0400 -@@ -33,7 +33,7 @@ +--- a/src/world.pyx ++++ b/src/world.pyx +@@ -33,7 +33,7 @@ cdef class World: cdef dWorldID wid @@ -893,7 +872,7 @@ self.wid = dWorldCreate() def __dealloc__(self): -@@ -323,6 +323,44 @@ +@@ -323,6 +323,44 @@ cdef class World: """ return dWorldGetAutoDisableTime(self.wid) diff -Nru pyode-1.2.0/debian/patches/01_ode_notrimesh.dpatch pyode-1.2.0/debian/patches/01_ode_notrimesh.dpatch --- pyode-1.2.0/debian/patches/01_ode_notrimesh.dpatch 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/patches/01_ode_notrimesh.dpatch 2018-04-18 08:05:36.000000000 +0000 @@ -1,8 +1,5 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ode_notrimesh.dpatch by Yaroslav Halchenko -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +Author: Yaroslav Halchenko +Description: Patch without description is not mentioned in series file @DPATCH@ diff -urNad pyode-1.2.0.obsolete.0.0752626925977928~/setup.py pyode-1.2.0.obsolete.0.0752626925977928/setup.py diff -Nru pyode-1.2.0/debian/patches/series pyode-1.2.0/debian/patches/series --- pyode-1.2.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pyode-1.2.0/debian/patches/series 2018-04-18 08:05:36.000000000 +0000 @@ -0,0 +1 @@ +00_upstream_1.2.0-now.dpatch diff -Nru pyode-1.2.0/debian/rules pyode-1.2.0/debian/rules --- pyode-1.2.0/debian/rules 2018-05-05 13:06:04.000000000 +0000 +++ pyode-1.2.0/debian/rules 2018-04-18 08:05:36.000000000 +0000 @@ -1,122 +1,20 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. # -# This file was originally written by Joey Hess and Craig Small. -# build-arch and build-indep targets by Bill Allombert 2001 -# Changes for python-pyepl and for python-pyode by Yaroslav Halchenko - # 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 - -# no parallel execution -- required for dpatch -.NOTPARALLEL: - -PYVERS := $(shell pyversions -vs) -PYVER := $(shell pyversions -vd) - -PYNAME=pyode -BASE=$(CURDIR)/debian -PYPACKAGE=python-$(PYNAME) -BASE=$(CURDIR)/debian - -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -include /usr/share/dpatch/dpatch.make - -#Architecture -build: debian/control patch build-arch build-indep - -debian/control: debian/control.in - sed -e "/#include \"description.in\"/r debian/description.in" -e "/#.*/d" $^ >| $@ - -#Architecture -build: debian/control patch build-arch build-indep -build-arch: build-arch-stamp -build-arch-stamp: $(PYVERS:%=build-arch-python%) - touch $@ - -build-arch-python%: - python$* setup.py build_ext - touch $@ - -build-indep: build-indep-stamp -build-indep-stamp: -# $(MAKE) -C code/documentation/ - touch build-indep-stamp - -clean: clean-patched unpatch -clean-patched: debian/control - dh_testdir - dh_testroot - rm -f build-arch-stamp build-arch-python* build-indep-stamp - rm -rf build - dh_clean - -pre-install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -install: build pre-install install-indep install-arch - -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - - # Add here commands to install the indep part of the package into - # debian/-doc. - # might be deployed later - #INSTALLDOC# - - dh_install -i - -install-python%: - python$* setup.py install --root $(BASE)/$(PYPACKAGE) --no-compile - python$* setup.py clean - -install-arch: pre-install $(PYVERS:%=install-python%) - dh_install -s - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs AUTHORS README - dh_installexamples - dh_link - - dh_strip - dh_compress -X.py - dh_fixperms - - dh_python2 - - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common +export PYBUILD_NAME=pyode -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common +%: + dh $@ --with python2 --buildsystem=pybuild -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch +# save *.c files from modifications when cleaning up +override_dh_auto_clean: + mkdir -p tmp_backup_c + cp -a *.c tmp_backup_c + dh_auto_clean + mv tmp_backup_c/*.c . + rmdir tmp_backup_c diff -Nru pyode-1.2.0/debian/source/format pyode-1.2.0/debian/source/format --- pyode-1.2.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ pyode-1.2.0/debian/source/format 2018-04-18 08:05:36.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)