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

[Steven Michael Robbins]

Author: smr
Date: 2011-09-10 19:41:44 +0000 (Sat, 10 Sep 2011)
New Revision: 7719

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Remove definition of unsupported option ITK_USE_SYSTEM_JPEG.  Follow upstream to install python wrapping into /usr/lib/InsightToolkit.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-10 02:11:10 UTC (rev 7718)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-10 19:41:44 UTC (rev 7719)
@@ -1,10 +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.
+  * rules: Follow upstream to install python wrapping into
+    /usr/lib/InsightToolkit, with WrapITK.pth in dist-packages.  Switch to
+    dh_python2.
 
- -- Steve M. Robbins <smr at debian.org>  Wed, 07 Sep 2011 21:18:26 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 10 Sep 2011 14:41:32 -0500
 
 insighttoolkit (3.20.0-13) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-10 02:11:10 UTC (rev 7718)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-10 19:41:44 UTC (rev 7719)
@@ -60,7 +60,6 @@
 	-DITK_USE_OPTIMIZED_REGISTRATION_METHODS:BOOL=ON \
 	-DITK_USE_TRANSFORM_IO_FACTORIES:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
-	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 	-DITK_USE_SYSTEM_PNG:BOOL=ON \
 	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
@@ -137,10 +136,11 @@
 	dh_install -p$(pkg_jni)           debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/libSwigRuntimeJava.so* usr/lib
 
 install/$(pkg_python)::
-	dh_install -p$(pkg_python) -XlibSwig debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*Python.so* $(PYEXTDIR)
-	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_install -p$(pkg_python) -XlibSwig --autodest usr/lib/InsightToolkit/WrapITK/lib/*Python.so*
+	dh_install -p$(pkg_python)           usr/lib/InsightToolkit/WrapITK/lib/libSwigRuntimePython.so* usr/lib
+	dh_install -p$(pkg_python)           --autodest usr/lib/python*/dist-packages
+	dh_install -p$(pkg_python)           --autodest usr/lib/InsightToolkit/WrapITK/Python
+	dh_install -p$(pkg_python)           --autodest usr/lib/InsightToolkit/WrapITK/lib/*.py
 	dh_python2 -p$(pkg_python)
 
 install/$(pkg_tcl)::