[vmtk] 11/17: Work on 1.0.1 release.

Mattia Rizzolo mattia at debian.org
Sun Apr 17 14:34:47 UTC 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository vmtk.

commit daa24157249f80b8eeacaf88c02fe7b34004986b
Author: Johannes Ring <johannr at simula.no>
Date:   Thu May 31 12:24:30 2012 +0000

    Work on 1.0.1 release.
---
 debian/changelog                             | 13 +++++
 debian/control                               |  6 +--
 debian/libvmtk0.9.lintian-overrides          | 11 ----
 debian/libvmtk1.0.lintian-overrides          | 33 ++++++++++++
 debian/patches/series                        |  1 -
 debian/patches/vtk-python-include-path.patch | 12 -----
 debian/python-vmtk.lintian-overrides         | 75 +++++++++++++++++++++-------
 debian/rules                                 |  8 ++-
 8 files changed, 113 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72df4b2..5d7fc98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vmtk (1.0.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Replace libvmtk0.9 with libvmtk1.0.
+  * debian/rules:
+    - Update VTK_DIR to vtk 5.8.
+    - Turn on USE_SYSTEM_{VTK,ITK} since default is now to download these.
+    - Rename install/libvmtk0.9 target to install/libvtmk1.0.
+  * Remove patch (fixed upstream).
+  * Update lintian overrides.
+
+ -- Johannes Ring <johannr at simula.no>  Thu, 31 May 2012 14:24:12 +0200
+
 vmtk (0.9.0-7) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 80cb251..19362a3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/vmtk/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/vmtk/trunk/
 XS-Autobuild: yes
 
-Package: libvmtk0.9
+Package: libvmtk1.0
 Section: non-free/libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -32,7 +32,7 @@ Description: runtime libraries for vmtk
 Package: python-vmtk
 Section: non-free/python
 Architecture: any
-Depends: libvmtk0.9 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libvmtk1.0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Python interface for vmtk
  The Vascular Modeling Toolkit is a collection of libraries and tools for
@@ -44,7 +44,7 @@ Description: Python interface for vmtk
 Package: libvmtk-dev
 Section: non-free/libdevel
 Architecture: any
-Depends: libvmtk0.9 (= ${binary:Version}), ${misc:Depends}
+Depends: libvmtk1.0 (= ${binary:Version}), ${misc:Depends}
 Description: shared links and header files for vmtk
  The Vascular Modeling Toolkit is a collection of libraries and tools for
  3D reconstruction, geometric analysis, mesh generation and surface data
diff --git a/debian/libvmtk0.9.lintian-overrides b/debian/libvmtk0.9.lintian-overrides
deleted file mode 100644
index 11ce75a..0000000
--- a/debian/libvmtk0.9.lintian-overrides
+++ /dev/null
@@ -1,11 +0,0 @@
-libvmtk0.9: package-name-doesnt-match-sonames libvtkvmtkCommon0.9 libvtkvmtkComputationalGeometry0.9 libvtkvmtkContrib0.9 libvtkvmtkDifferentialGeometry0.9 libvtkvmtkIO0.9 libvtkvmtkITK0.9 libvtkvmtkMisc0.9 libvtkvmtkSegmentation0.9
-libvmtk0.9: spelling-error-in-binary usr/lib/libvtkvmtkComputationalGeometry.so.0.9.0 YuR Your
-libvmtk0.9: no-upstream-changelog
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkMisc.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkCommon.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkSegmentation.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkContrib.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkComputationalGeometry.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkITK.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkIO.so.0.9.0
-libvmtk0.9: no-symbols-control-file usr/lib/libvtkvmtkDifferentialGeometry.so.0.9.0
diff --git a/debian/libvmtk1.0.lintian-overrides b/debian/libvmtk1.0.lintian-overrides
new file mode 100644
index 0000000..10a0205
--- /dev/null
+++ b/debian/libvmtk1.0.lintian-overrides
@@ -0,0 +1,33 @@
+libvmtk1.0: package-name-doesnt-match-sonames libvtkvmtkCommon1.0 libvtkvmtkComputationalGeometry1.0 libvtkvmtkContrib1.0 libvtkvmtkDifferentialGeometry1.0 libvtkvmtkIO1.0 libvtkvmtkITK1.0 libvtkvmtkMisc1.0 libvtkvmtkRendering1.0 libvtkvmtkSegmentation1.0
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkCommon.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkCommon.so.1.0.1
+libvmtk1.0: spelling-error-in-binary usr/lib/libvtkvmtkComputationalGeometry.so.1.0.1 YuR Your
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkComputationalGeometry.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkComputationalGeometry.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkContrib.so.1.0.1
+libvmtk1.0: hardening-no-fortify-functions usr/lib/libvtkvmtkContrib.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkContrib.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkDifferentialGeometry.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkDifferentialGeometry.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkIO.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkIO.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkITK.so.1.0.1
+libvmtk1.0: hardening-no-fortify-functions usr/lib/libvtkvmtkITK.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkITK.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkMisc.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkMisc.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkRendering.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkRendering.so.1.0.1
+libvmtk1.0: hardening-no-stackprotector usr/lib/libvtkvmtkSegmentation.so.1.0.1
+libvmtk1.0: hardening-no-fortify-functions usr/lib/libvtkvmtkSegmentation.so.1.0.1
+libvmtk1.0: hardening-no-relro usr/lib/libvtkvmtkSegmentation.so.1.0.1
+libvmtk1.0: no-upstream-changelog
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkRendering.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkMisc.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkSegmentation.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkDifferentialGeometry.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkITK.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkCommon.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkIO.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkComputationalGeometry.so.1.0.1
+libvmtk1.0: no-symbols-control-file usr/lib/libvtkvmtkContrib.so.1.0.1
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a13aeec..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-vtk-python-include-path.patch
diff --git a/debian/patches/vtk-python-include-path.patch b/debian/patches/vtk-python-include-path.patch
deleted file mode 100644
index 507adf1..0000000
--- a/debian/patches/vtk-python-include-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix problem with Python.h not found when building against newer VTK.
-
---- vmtk-0.9.0.orig/vtkVmtk/CMakeLists.txt
-+++ vmtk-0.9.0/vtkVmtk/CMakeLists.txt
-@@ -76,6 +76,7 @@ INSTALL(FILES ${files}
-   COMPONENT Development)
- 
- IF (VTK_WRAP_PYTHON AND VTK_VMTK_WRAP_PYTHON)
-+  INCLUDE_DIRECTORIES(${VTK_PYTHON_INCLUDE_DIR})
-   CONFIGURE_FILE(${VTK_VMTK_SOURCE_DIR}/vtkvmtk.py ${VTK_VMTK_BINARY_DIR}/vtkvmtk.py COPYONLY)
-   #INSTALL_FILES(${VTK_VMTK_MODULE_INSTALL_LIB_DIR} FILES ${VTK_VMTK_BINARY_DIR}/vtkvmtk.py)
-   INSTALL(FILES ${VTK_VMTK_BINARY_DIR}/vtkvmtk.py
diff --git a/debian/python-vmtk.lintian-overrides b/debian/python-vmtk.lintian-overrides
index 720a083..79b44bb 100644
--- a/debian/python-vmtk.lintian-overrides
+++ b/debian/python-vmtk.lintian-overrides
@@ -1,18 +1,59 @@
-python-vmtk: package-name-doesnt-match-sonames libvtkvmtkCommonPythonD0.9 libvtkvmtkComputationalGeometryPythonD0.9 libvtkvmtkContribPythonD0.9 libvtkvmtkDifferentialGeometryPythonD0.9 libvtkvmtkIOPythonD0.9 libvtkvmtkITKPythonD0.9 libvtkvmtkMiscPythonD0.9 libvtkvmtkSegmentationPythonD0.9
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkCommonPythonD.so.0.9.0 usr/lib/libvtkvmtkCommonPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkITKPythonD.so.0.9.0 usr/lib/libvtkvmtkITKPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkMiscPythonD.so.0.9.0 usr/lib/libvtkvmtkMiscPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkIOPythonD.so.0.9.0 usr/lib/libvtkvmtkIOPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkComputationalGeometryPythonD.so.0.9.0 usr/lib/libvtkvmtkComputationalGeometryPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.0.9.0 usr/lib/libvtkvmtkDifferentialGeometryPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkSegmentationPythonD.so.0.9.0 usr/lib/libvtkvmtkSegmentationPythonD.so
-python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkContribPythonD.so.0.9.0 usr/lib/libvtkvmtkContribPythonD.so
+python-vmtk: package-name-doesnt-match-sonames libvtkvmtkCommonPythonD1.0 libvtkvmtkComputationalGeometryPythonD1.0 libvtkvmtkContribPythonD1.0 libvtkvmtkDifferentialGeometryPythonD1.0 libvtkvmtkIOPythonD1.0 libvtkvmtkITKPythonD1.0 libvtkvmtkMiscPythonD1.0 libvtkvmtkRenderingPythonD1.0 libvtkvmtkSegmentationPythonD1.0
 python-vmtk: no-upstream-changelog
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkCommonPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkMiscPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkIOPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkComputationalGeometryPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkITKPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkContribPythonD.so.0.9.0
-python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkSegmentationPythonD.so.0.9.0
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkCommonPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkCommonPythonD.so.1.0.1
+python-vmtk: spelling-error-in-binary usr/lib/libvtkvmtkComputationalGeometryPythonD.so.1.0.1 specifed specified
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkComputationalGeometryPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkComputationalGeometryPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkContribPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkContribPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkIOPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkIOPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkITKPythonD.so.1.0.1
+python-vmtk: hardening-no-fortify-functions usr/lib/libvtkvmtkITKPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkITKPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkMiscPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkMiscPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkRenderingPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkRenderingPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/libvtkvmtkSegmentationPythonD.so.1.0.1
+python-vmtk: hardening-no-fortify-functions usr/lib/libvtkvmtkSegmentationPythonD.so.1.0.1
+python-vmtk: hardening-no-relro usr/lib/libvtkvmtkSegmentationPythonD.so.1.0.1
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkCommonPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkCommonPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkComputationalGeometryPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkComputationalGeometryPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkContribPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkContribPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkDifferentialGeometryPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkDifferentialGeometryPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkIOPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkIOPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkITKPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkITKPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkMiscPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkMiscPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkRenderingPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkRenderingPython.so
+python-vmtk: hardening-no-stackprotector usr/lib/pyshared/python2.7/vmtk/libvtkvmtkSegmentationPython.so
+python-vmtk: hardening-no-relro usr/lib/pyshared/python2.7/vmtk/libvtkvmtkSegmentationPython.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkMiscPythonD.so.1.0.1 usr/lib/libvtkvmtkMiscPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.1.0.1 usr/lib/libvtkvmtkDifferentialGeometryPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkITKPythonD.so.1.0.1 usr/lib/libvtkvmtkITKPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkCommonPythonD.so.1.0.1 usr/lib/libvtkvmtkCommonPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkRenderingPythonD.so.1.0.1 usr/lib/libvtkvmtkRenderingPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkIOPythonD.so.1.0.1 usr/lib/libvtkvmtkIOPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkComputationalGeometryPythonD.so.1.0.1 usr/lib/libvtkvmtkComputationalGeometryPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkSegmentationPythonD.so.1.0.1 usr/lib/libvtkvmtkSegmentationPythonD.so
+python-vmtk: non-dev-pkg-with-shlib-symlink usr/lib/libvtkvmtkContribPythonD.so.1.0.1 usr/lib/libvtkvmtkContribPythonD.so
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkMiscPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkDifferentialGeometryPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkITKPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkCommonPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkRenderingPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkIOPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkComputationalGeometryPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkSegmentationPythonD.so.1.0.1
+python-vmtk: no-symbols-control-file usr/lib/libvtkvmtkContribPythonD.so.1.0.1
diff --git a/debian/rules b/debian/rules
index b0400e3..52ef38a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ DEB_CMAKE_EXTRA_FLAGS= \
 	-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-D BUILD_SHARED_LIBS:BOOL=ON \
 	-D CMAKE_SKIP_RPATH:BOOL=ON \
-	-D VTK_DIR:PATH=/usr/lib/vtk-5.6 \
+	-D VTK_DIR:PATH=/usr/lib/vtk-5.8 \
 	-D ITK_DIR:PATH=/usr/lib/InsightToolkit \
 	-D GDCM_DIR:PATH=/usr/lib/gdcm-2.2 \
 	-D VTK_VMTK_WRAP_PYTHON:BOOL=ON \
@@ -33,9 +33,13 @@ DEB_CMAKE_EXTRA_FLAGS= \
 	-D CMAKE_INSTALL_PREFIX:PATH=/usr \
 	-D VTK_VMTK_CONTRIB:BOOL=ON \
 	-D VMTK_CONTRIB_SCRIPTS:BOOL=ON \
+	-D USE_SYSTEM_ITK:BOOL=ON \
+	-D USE_SYSTEM_VTK:BOOL=ON \
+	-D VMTK_USE_SUPERBUILD:BOOL=OFF \
+	-D VMTK_SCRIPTS_ENABLED:BOOL=ON \
 	..
 
-install/libvmtk0.9::
+install/libvmtk1.0::
 	dh_install -p$(cdbs_curpkg) \
 	  `find debian/tmp/usr/lib/vmtk/ -name "lib*.so.*" | grep -v -E "(Python|TCL)"` usr/lib
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vmtk.git



More information about the debian-science-commits mailing list