[Python-modules-commits] r8733 - in packages/pycg/trunk/debian (7 files)

morph at users.alioth.debian.org morph at users.alioth.debian.org
Sat Jun 6 09:15:59 UTC 2009 

    Date: Saturday, June 6, 2009 @ 09:15:56
  Author: morph
Revision: 8733

* debian/{control, rules}
  - prepare for the upcoming Python 2.6 transition
    + versioned depend on python to have functions we need
    + include python.mk and uses its macro for options and locations
* debian/copyright
  - updated my email address
  - clarified packaging is licensed under the same terms as upstream
  - fixed packaging copyright notice
* debian/patches/40_no_link_to_python.dpatch
  - renamed from 99_test
  - added description

Added:
  packages/pycg/trunk/debian/patches/40_no_link_to_python.dpatch
    (from rev 8731, packages/pycg/trunk/debian/patches/99_test.dpatch)
Modified:
  packages/pycg/trunk/debian/changelog
  packages/pycg/trunk/debian/control
  packages/pycg/trunk/debian/copyright
  packages/pycg/trunk/debian/patches/00list
  packages/pycg/trunk/debian/rules
Deleted:
  packages/pycg/trunk/debian/patches/99_test.dpatch

Modified: packages/pycg/trunk/debian/changelog
===================================================================
--- packages/pycg/trunk/debian/changelog	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/changelog	2009-06-06 09:15:56 UTC (rev 8733)
@@ -5,8 +5,19 @@
     - updated my email address
     - bump Standards-Version to 3.8.1
       + added debian/README.source
+  * debian/{control, rules}
+    - prepare for the upcoming Python 2.6 transition
+      + versioned depend on python to have functions we need
+      + include python.mk and uses its macro for options and locations
+  * debian/copyright
+    - updated my email address
+    - clarified packaging is licensed under the same terms as upstream
+    - fixed packaging copyright notice
+  * debian/patches/40_no_link_to_python.dpatch
+    - renamed from 99_test
+    - added description
 
- -- Sandro Tosi <morph at debian.org>  Sat, 06 Jun 2009 08:53:53 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 06 Jun 2009 11:15:30 +0200
 
 pycg (0.14.1-1) unstable; urgency=low
 

Modified: packages/pycg/trunk/debian/control
===================================================================
--- packages/pycg/trunk/debian/control	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/control	2009-06-06 09:15:56 UTC (rev 8733)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 5), python-central (>= 0.6), python, dpatch, python-all-dev, swig, nvidia-cg-toolkit, python-numpy, mesa-common-dev, libgl1-mesa-dev, python-numpy-dbg
+Build-Depends: debhelper (>= 5), python-central (>= 0.6), python (>= 2.5.4-1~), dpatch, python-all-dev, swig, nvidia-cg-toolkit, python-numpy, mesa-common-dev, libgl1-mesa-dev, python-numpy-dbg
 Standards-Version: 3.8.1
 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/copyright
===================================================================
--- packages/pycg/trunk/debian/copyright	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/copyright	2009-06-06 09:15:56 UTC (rev 8733)
@@ -1,4 +1,4 @@
-This package was debianized by Sandro Tosi <matrixhasu at gmail.com> on
+This package was debianized by Sandro Tosi <morph at debian.org> on
 Mon, 29 Oct 2007 23:30:27 +0100.
 
 It was downloaded from http://www.cs.lth.se/home/Calle_Lejdfors/pygpu/
@@ -31,8 +31,8 @@
 On a Debian system the complete text of the GNU General Public License
 can be found in the file `/usr/share/common-licenses/GPL-2'
 
-The Debian packaging is (C) 2007, Sandro Tosi <matrixhasu at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007-2009, Sandro Tosi <morph at debian.org>
+and is licensed under the same terms a upstream code.
 
 From an upstream note:
 Although a little confused with licensing for the software, I did

Modified: packages/pycg/trunk/debian/patches/00list
===================================================================
--- packages/pycg/trunk/debian/patches/00list	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/patches/00list	2009-06-06 09:15:56 UTC (rev 8733)
@@ -1,4 +1,4 @@
 01_fix_makefile
 02_fix_setup.py
 30_move_from_numeric_to_numpy
-99_test
+40_no_link_to_python

Copied: packages/pycg/trunk/debian/patches/40_no_link_to_python.dpatch (from rev 8731, packages/pycg/trunk/debian/patches/99_test.dpatch)
===================================================================
--- packages/pycg/trunk/debian/patches/40_no_link_to_python.dpatch	                        (rev 0)
+++ packages/pycg/trunk/debian/patches/40_no_link_to_python.dpatch	2009-06-06 09:15:56 UTC (rev 8733)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_test.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't link against Python lib
+
+ at DPATCH@
+diff -urNad pycg~/Makefile pycg/Makefile
+--- pycg~/Makefile	2008-03-03 23:51:57.696813009 +0100
++++ pycg/Makefile	2008-03-03 23:52:15.341818542 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES=-I/usr/include/$(PYTHON_I) -Iinclude -I. -Inumpy
+ SWIG=swig
+-LIBS=-lCgGL -lCg -lGL -l$(PYTHON)
++LIBS=-lCgGL -lCg -lGL
+ SOEXT=so
+ COMPILE=gcc -fpic -g -Wall 
+ LINK=gcc -fpic -g -Wall -shared

Deleted: packages/pycg/trunk/debian/patches/99_test.dpatch
===================================================================
--- packages/pycg/trunk/debian/patches/99_test.dpatch	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/patches/99_test.dpatch	2009-06-06 09:15:56 UTC (rev 8733)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_test.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 23:51:57.696813009 +0100
-+++ pycg/Makefile	2008-03-03 23:52:15.341818542 +0100
-@@ -2,7 +2,7 @@
- 
- INCLUDES=-I/usr/include/$(PYTHON_I) -Iinclude -I. -Inumpy
- SWIG=swig
--LIBS=-lCgGL -lCg -lGL -l$(PYTHON)
-+LIBS=-lCgGL -lCg -lGL
- SOEXT=so
- COMPILE=gcc -fpic -g -Wall 
- LINK=gcc -fpic -g -Wall -shared

Modified: packages/pycg/trunk/debian/rules
===================================================================
--- packages/pycg/trunk/debian/rules	2009-06-06 06:54:09 UTC (rev 8732)
+++ packages/pycg/trunk/debian/rules	2009-06-06 09:15:56 UTC (rev 8733)
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
 include /usr/share/dpatch/dpatch.make
 
 PYVERS=$(shell pyversions -vr)
@@ -23,11 +24,11 @@
 build-python%:
 	dh_testdir
 	[ ! -d build ] || rm -rf build
-	mkdir -p debian/python-cg/usr/lib/python$*/site-packages/
+	mkdir -p debian/python-cg/usr/lib/python$*/$(call py_sitename, $*)/
 
 	$(MAKE) PYTHON_I=python$* PYTHON=python$* clean
 	$(MAKE) PYTHON_I=python$* PYTHON=python$*
-	dh_install _Cg.so /usr/lib/python$*/site-packages/
+	dh_install _Cg.so /usr/lib/python$*/$(call py_sitename, $*)/
 
 	# workaround to let think libpython<VER> is local, so that dh_shlibdebs does not generate
 	# dependencies on them, but only ${python:Depends} will
@@ -53,7 +54,7 @@
 	mkdir Cg
 	cp Cg.py Cg/__init__.py
 
-	python setup.py install --root=$(CURDIR)/debian/python-cg
+	python setup.py install --root=$(CURDIR)/debian/python-cg $(py_setup_install_args)
 
 # Build architecture-independent files here.
 binary-indep:

More information about the Python-modules-commits mailing list