[med-svn] r7707 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2011-09-08 02:28:01 +0000 (Thu, 08 Sep 2011)
New Revision: 7707

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Build using dh_python2

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-08 01:43:53 UTC (rev 7706)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-08 02:28:01 UTC (rev 7707)
@@ -1,3 +1,11 @@
+insighttoolkit (3.20.0-14) UNRELEASED; urgency=low
+
+  * control.in:
+  * rules: Build using dh_python2.  Install into dist-packages, not
+    site-packages.  Part of Matthias Klose's patch for #640667.
+
+ -- Steve M. Robbins <smr at debian.org>  Wed, 07 Sep 2011 21:18:26 -0500
+
 insighttoolkit (3.20.0-13) unstable; urgency=low
 
   * Remove absolute paths to required libraries from

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2011-09-08 01:43:53 UTC (rev 7706)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2011-09-08 02:28:01 UTC (rev 7707)
@@ -7,11 +7,11 @@
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), 
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev,
- python-support (>= 0.6.4), python-dev, python-numpy, libfftw3-dev,
+ python-support (>= 0.6.4), python-dev, libfftw3-dev,
  tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev,
  default-jdk, javahelper (>= 0.18),
  libvtk5-dev, python-vtk
-XS-Python-Version: current
+XS-Python-Version: 2.7
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-08 01:43:53 UTC (rev 7706)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-08 02:28:01 UTC (rev 7707)
@@ -4,16 +4,15 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7), 
- cmake, cableswig (>= 0.1.0+cvs20100501), gccxml (>= 0.9.0+cvs20100501-2),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3),
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), 
+ cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
+ zlib1g-dev (>= 1.2.2), libpng12-dev,
  python-support (>= 0.6.4), python-dev, libfftw3-dev,
- tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev, libjpeg62-dev,
- libfreetype6-dev, libopenjpeg-dev, graphviz,
- libxext-dev, libxss-dev, libxft-dev, libpoppler-dev, libssl-dev,
- default-jdk, javahelper (>= 0.18)
-XS-Python-Version: current
-Standards-Version: 3.8.4
+ tcl8.5-dev, tk8.5-dev, uuid-dev, libgdcm2-dev,
+ default-jdk, javahelper (>= 0.18),
+ libvtk5-dev, python-vtk
+XS-Python-Version: 2.7
+Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/
 

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-08 01:43:53 UTC (rev 7706)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-08 02:28:01 UTC (rev 7707)
@@ -40,7 +40,7 @@
 JAVA_HOME = /usr/lib/jvm/default-java
 JAVA_JNIDIR = /usr/lib/jni
 
-PYMODDIR = usr/lib/$(PYVERS)/site-packages
+PYMODDIR = usr/lib/$(PYVERS)/dist-packages
 PYEXTDIR = $(PYMODDIR)
 
 TCLMODDIR = usr/share/tcltk/tcl$(TCLVERS)/insighttoolkit$(VER_MAJOR)
@@ -141,7 +141,7 @@
 	dh_install -p$(pkg_python)           debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/libSwigRuntimePython.so* usr/lib
 	dh_install -p$(pkg_python)           debian/tmp/usr/lib/InsightToolkit/WrapITK/Python/* $(PYMODDIR)
 	dh_install -p$(pkg_python)           debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*.py $(PYMODDIR)
-	dh_pysupport -p$(pkg_python)
+	dh_python2 -p$(pkg_python)
 
 install/$(pkg_tcl)::
 	dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/bin/itkwish usr/bin