[Python-modules-commits] r4723 - in packages/pycg/trunk/debian (5 files)

[morph-guest at users.alioth.debian.org]

    Date: Monday, March 3, 2008 @ 21:48:25
  Author: morph-guest
Revision: 4723

move to numpy + dbg pkg

Added:
  packages/pycg/trunk/debian/patches/30_move_from_numeric_to_numpy.dpatch
Modified:
  packages/pycg/trunk/debian/changelog
  packages/pycg/trunk/debian/control
  packages/pycg/trunk/debian/patches/00list
  packages/pycg/trunk/debian/rules

Modified: packages/pycg/trunk/debian/changelog
===================================================================
--- packages/pycg/trunk/debian/changelog	2008-03-03 20:11:49 UTC (rev 4722)
+++ packages/pycg/trunk/debian/changelog	2008-03-03 21:48:25 UTC (rev 4723)
@@ -5,5 +5,7 @@
     - converge upstream build system into Makefile
   * debian/patches/02_fix_setup.py.dpatch
     - fix setup.py file to let the package build on a Debian box
+  * debian/patches/30_move_from_numeric_to_numpy.dpatch
+    - added to remove python-numeric dep and move to python-numpy
 
  -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 13 Feb 2008 21:20:08 +0100

Modified: packages/pycg/trunk/debian/control
===================================================================
--- packages/pycg/trunk/debian/control	2008-03-03 20:11:49 UTC (rev 4722)
+++ packages/pycg/trunk/debian/control	2008-03-03 21:48:25 UTC (rev 4723)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <matrixhasu at gmail.com>
-Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), python, dpatch, python-all-dev, python-all-dbg, swig, nvidia-cg-toolkit, python-numpy, mesa-common-dev, libgl1-mesa-dev
+Build-Depends: debhelper (>= 5), python-central (>= 0.5.6), python, dpatch, python-all-dev, python-all-dbg, swig, nvidia-cg-toolkit, python-numpy, mesa-common-dev, libgl1-mesa-dev, python-numpy-dbg
 Standards-Version: 3.7.3
 Homepage: http://www.cs.lth.se/home/Calle_Lejdfors/pygpu/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycg/trunk/

Modified: packages/pycg/trunk/debian/patches/00list
===================================================================
--- packages/pycg/trunk/debian/patches/00list	2008-03-03 20:11:49 UTC (rev 4722)
+++ packages/pycg/trunk/debian/patches/00list	2008-03-03 21:48:25 UTC (rev 4723)
@@ -1,2 +1,3 @@
 01_fix_makefile
 02_fix_setup.py
+30_move_from_numeric_to_numpy

Added: packages/pycg/trunk/debian/patches/30_move_from_numeric_to_numpy.dpatch
===================================================================
--- packages/pycg/trunk/debian/patches/30_move_from_numeric_to_numpy.dpatch	                        (rev 0)
+++ packages/pycg/trunk/debian/patches/30_move_from_numeric_to_numpy.dpatch	2008-03-03 21:48:25 UTC (rev 4723)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_move_from_numeric_to_numpy.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pycg~/Makefile pycg/Makefile
+--- pycg~/Makefile	2008-03-03 22:47:28.376313001 +0100
++++ pycg/Makefile	2008-03-03 22:47:28.460317785 +0100
+@@ -1,6 +1,6 @@
+ #include $(shell uname -s).conf
+ 
+-INCLUDES=-I/usr/include/$(PYTHON) -Iinclude -I.
++INCLUDES=-I/usr/include/$(PYTHON_I) -Iinclude -I. -Inumpy
+ SWIG=swig
+ LIBS=-lCgGL -lCg -lGL -l$(PYTHON)
+ SOEXT=so
+diff -urNad pycg~/cg.i pycg/cg.i
+--- pycg~/cg.i	2007-11-26 10:34:30.000000000 +0100
++++ pycg/cg.i	2008-03-03 22:47:38.864910711 +0100
+@@ -2,7 +2,7 @@
+ %{
+ #include "Cg/cg.h"
+ #include "Cg/cgGL.h"
+-#include <Numeric/arrayobject.h>
++#include <numpy/arrayobject.h>
+ %}
+ 
+ %init %{


Property changes on: packages/pycg/trunk/debian/patches/30_move_from_numeric_to_numpy.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/pycg/trunk/debian/rules
===================================================================
--- packages/pycg/trunk/debian/rules	2008-03-03 20:11:49 UTC (rev 4722)
+++ packages/pycg/trunk/debian/rules	2008-03-03 21:48:25 UTC (rev 4723)
@@ -25,8 +25,8 @@
 	[ ! -d build ] || rm -rf build
 	mkdir -p debian/python-cg/usr/lib/python$*/site-packages/
 
-	$(MAKE) PYTHON=python$* clean
-	$(MAKE) PYTHON=python$*
+	$(MAKE) PYTHON_I=python$* PYTHON=python$* clean
+	$(MAKE) PYTHON_I=python$* PYTHON=python$*
 	dh_install _Cg.so /usr/lib/python$*/site-packages/
 
 	# workaround to let think libpython<VER> is local, so that dh_shlibdebs does not generate
@@ -37,11 +37,11 @@
 build-debug-python%:
 	dh_testdir
 	[ ! -d build ] || rm -rf build
-	mkdir -p debian/python-cg/usr/lib/python$*_d/site-packages/
+	mkdir -p debian/python-cg-dbg/usr/lib/python$*_d/site-packages/
 
-	$(MAKE) PYTHON=python$*_d clean
-	$(MAKE) PYTHON=python$*_d
-	dh_install _Cg.so /usr/lib/python$*_d/site-packages/
+	$(MAKE) PYTHON_I=python$*_d PYTHON=python$* clean
+	$(MAKE) PYTHON_I=python$*_d PYTHON=python$*
+	dh_install -ppython-cg-dbg _Cg.so /usr/lib/python$*_d/site-packages/
 
 clean: unpatch
 	dh_testdir