diff -u vtk-5.0.4/debian/rules vtk-5.0.4/debian/rules --- vtk-5.0.4/debian/rules +++ vtk-5.0.4/debian/rules @@ -235,9 +235,9 @@ # 1. Install libvtk*Python.so into /usr/lib/ mv debian/tmp/usr/lib/*Python*.so* debian/python-vtk/usr/lib/ # 2. Install all the stuff in Wrapping/Python into - # /usr/lib/$(PYVERS)/site-packages/vtk_python + # /usr/lib/$(PYVERS)/dist-packages/vtk_python mv debian/tmp/usr/lib/$(PYVERS) $(CURDIR)/debian/python-vtk/usr/lib/ - find $(CURDIR)/debian/python-vtk/usr/lib/$(PYVERS)/site-packages -name \*.pyc -exec rm \{\} \; + find $(CURDIR)/debian/python-vtk/usr/lib/$(PYVERS)/dist-packages -name \*.pyc -exec rm \{\} \; mv debian/tmp/usr/lib/*.5.0* debian/libvtk5/usr/lib/ mv debian/tmp/usr/lib/vtk-5.0/CMake/*.so debian/libvtk5/usr/lib/vtk-5.0/CMake/ diff -u vtk-5.0.4/debian/python-vtk.postinst vtk-5.0.4/debian/python-vtk.postinst --- vtk-5.0.4/debian/python-vtk.postinst +++ vtk-5.0.4/debian/python-vtk.postinst @@ -11,7 +11,7 @@ PYVERS=`pyversions -d` PACKAGE=`basename $0 .postinst` -DIRLIST="/usr/lib/$PYVERS/site-packages/vtk" +DIRLIST="/usr/lib/$PYVERS/dist-packages/vtk" case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) diff -u vtk-5.0.4/debian/control vtk-5.0.4/debian/control --- vtk-5.0.4/debian/control +++ vtk-5.0.4/debian/control @@ -1,7 +1,8 @@ Source: vtk Section: graphics Priority: optional -Maintainer: A. Maitland Bottoms +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: A. Maitland Bottoms Build-Depends: debhelper (>> 4.0.0), xlibmesa-gl-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libx11-dev, libxt-dev, xvfb, x11proto-core-dev, tcl8.4-dev, tk8.4-dev, python-dev, cmake (>> 2.0.4), libexpat1-dev, libjpeg62-dev, libpng12-0-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libfreetype6-dev, ftgl-dev, libqt3-mt-dev, libqt4-dev, python-support (>= 0.4) Build-Depends-Indep: libdigest-md5-perl, doxygen, graphviz XS-Python-Version: current diff -u vtk-5.0.4/debian/changelog vtk-5.0.4/debian/changelog --- vtk-5.0.4/debian/changelog +++ vtk-5.0.4/debian/changelog @@ -1,3 +1,13 @@ +vtk (5.0.4-1.1ubuntu1) jaunty; urgency=low + + * Rebuild for the Python 2.6 transition. + - Make Wrapping/Python/vtkPythonAppInit.cxx also search in dist-packages + for the library. + - The postinst should now compile what is in dist-packages, not site-packages. + - debian/rules should also remove .pyc files from dist-packages. + + -- James Westby Sun, 01 Mar 2009 14:15:43 +0000 + vtk (5.0.4-1.1) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- vtk-5.0.4.orig/Wrapping/Python/vtkPythonAppInit.cxx +++ vtk-5.0.4/Wrapping/Python/vtkPythonAppInit.cxx @@ -243,6 +243,7 @@ // packages in sys.path himself/herself. const char* inst_dirs[] = { "/lib/python" VTK_PYTHON_VERSION "/site-packages/vtk", // UNIX --prefix + "/lib/python" VTK_PYTHON_VERSION "/dist-packages/vtk", // Debian package prefix "/lib/python/vtk", // UNIX --home "/Lib/site-packages/vtk", "/Lib/vtk", // Windows "/site-packages/vtk", "/vtk", // Windows