[DebianGIS-dev] r2116 - packages/thuban/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-03-31 08:44:47 +0000 (Tue, 31 Mar 2009)
New Revision: 2116

Removed:
   packages/thuban/trunk/debian/pyversions
Modified:
   packages/thuban/trunk/debian/changelog
   packages/thuban/trunk/debian/rules
Log:
Fixed python dependencies


Modified: packages/thuban/trunk/debian/changelog
===================================================================
--- packages/thuban/trunk/debian/changelog	2009-03-31 07:54:36 UTC (rev 2115)
+++ packages/thuban/trunk/debian/changelog	2009-03-31 08:44:47 UTC (rev 2116)
@@ -6,18 +6,23 @@
 
   [ Francesco Paolo Lovergine ]
 
-  * New upstream release.
+  * New upstream release. Still better using wxwidget 2.6.
+    (closes: #352844)
   * Policy bumped to 3.8.1.
   * Removed Silke among Uploaders.
     (closes: #519385)
   * Changed build-dep: proj -> libproj-dev
   * Fixed watch file.
-  * Added wxpython patch to select 2.8 version.
-  * Added gdal patch to use osgeo namespace for gdal/ogr.
+  * Added wxpython patch to select explicitly 2.6 version at run-time.
+  * Added gdal patch to use osgeo namespace for gdal/ogr. Still one
+    warning is issued anyway at run-time.
   * Added recommended: python-mapscript for mapserver extension.
   * Debhelper level set to 7.
+  * Revised against python policy: now supports only private modules
+    for the default python version at build-time.
+    (closes: #520573) 
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 30 Mar 2009 23:06:10 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 31 Mar 2009 10:04:59 +0200
 
 thuban (1.2.0-2) unstable; urgency=low
 

Deleted: packages/thuban/trunk/debian/pyversions
===================================================================
--- packages/thuban/trunk/debian/pyversions	2009-03-31 07:54:36 UTC (rev 2115)
+++ packages/thuban/trunk/debian/pyversions	2009-03-31 08:44:47 UTC (rev 2116)
@@ -1 +0,0 @@
-2.4-

Modified: packages/thuban/trunk/debian/rules
===================================================================
--- packages/thuban/trunk/debian/rules	2009-03-31 07:54:36 UTC (rev 2115)
+++ packages/thuban/trunk/debian/rules	2009-03-31 08:44:47 UTC (rev 2116)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PYDEF=$(shell pyversions -d)
+PYDEFVER=$(shell pyversions -d -v)
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
@@ -31,14 +33,16 @@
 	rm -f build-stamp 
 	rm -rf build Doc/manual/thuban-manual Doc/manual/thuban-manual-de
 	dh_clean
+	rm -f debian/pyversions
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean 
 	dh_installdirs
-
+	
 	python setup.py install --prefix=/usr --no-compile --root=$(CURDIR)/debian/thuban
+	echo $(PYDEFVER) >$(CURDIR)/debian/pyversions
 
 binary-arch: build install
 	dh_testdir
@@ -53,7 +57,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_pysupport
+	dh_pysupport 
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol