[vmtk] 01/06: Imported Debian patch 1.3-2

Mattia Rizzolo mattia at debian.org
Mon Apr 18 15:00:27 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 360ddaa4477875c678fa848aaf81cd01fbc0280a
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Sun Apr 17 10:28:43 2016 +0200

    Imported Debian patch 1.3-2
---
 debian/changelog                     |  13 +++++
 debian/control                       |   2 +-
 debian/libvmtk-dev.lintian-overrides |   1 -
 debian/libvmtk1.0.lintian-overrides  |  33 ------------
 debian/python-vmtk.lintian-overrides |  59 ---------------------
 debian/rules                         | 100 ++++++++++++-----------------------
 debian/vmtk.install                  |   1 +
 debian/vmtk.lintian-overrides        |   2 -
 debian/vmtk.manpages                 |   1 +
 9 files changed, 51 insertions(+), 161 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3fbe85..ff7181d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vmtk (1.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix install of hardcoded stuff (Closes: #821298).
+  * Use plain dh calls.
+  * Drop cdbs
+  * Use install files instead of hacky rules.
+  * Enable hardening
+  * use wl-asneeded to avoid overlinking.
+  * Drop lintian overrides.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sun, 17 Apr 2016 10:28:43 +0200
+
 vmtk (1.3-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index b8b32d9..43dd4ae 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: non-free/science
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Johannes Ring <johannr at simula.no>
-Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 9), cmake,
+Build-Depends: debhelper (>= 9), cmake,
  dh-python, python-dev (>= 2.6.6-3~), libvtk6-dev, python-vtk6,
  libinsighttoolkit4-dev, libjpeg-dev, libtiff-dev,
  libfreetype6-dev, libxext-dev, libpng-dev, libexpat1-dev, uuid-dev,
diff --git a/debian/libvmtk-dev.lintian-overrides b/debian/libvmtk-dev.lintian-overrides
deleted file mode 100644
index 6257a02..0000000
--- a/debian/libvmtk-dev.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libvmtk-dev: no-upstream-changelog
diff --git a/debian/libvmtk1.0.lintian-overrides b/debian/libvmtk1.0.lintian-overrides
deleted file mode 100644
index 10a0205..0000000
--- a/debian/libvmtk1.0.lintian-overrides
+++ /dev/null
@@ -1,33 +0,0 @@
-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/python-vmtk.lintian-overrides b/debian/python-vmtk.lintian-overrides
deleted file mode 100644
index 79b44bb..0000000
--- a/debian/python-vmtk.lintian-overrides
+++ /dev/null
@@ -1,59 +0,0 @@
-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: 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 b3179b6..157f256 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,71 +1,41 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-
 PYVER = $(shell pyversions -dv)
+PYDIR = "lib/python$(PYVER)/dist-packages/vmtk"
 
-CFLAGS=-g -Wall -fPIC
-CXXFLAGS=-g -Wall -fPIC
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-CXXFLAGS += -O0
-else
-CFLAGS += -O2
-CXXFLAGS += -O2
-endif
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DEB_CMAKE_EXTRA_FLAGS= \
-	-D VMTK_MINIMAL_INSTALL:BOOL=ON \
-	-D VMTK_WITH_LIBRARY_VERSION:BOOL=ON \
-	-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.8 \
-	-D ITK_DIR:PATH=/usr/lib/InsightToolkit \
-	-D GDCM_DIR:PATH=/usr/lib/gdcm-2.2 \
-	-D VTK_VMTK_WRAP_PYTHON:BOOL=ON \
-	-D VTK_VMTK_WRAP_TCL:BOOL=OFF \
-	-D VTK_VMTK_BUILD_TETGEN:BOOL=ON \
-	-D BUILD_DOCUMENTATION:BOOL=OFF \
-	-D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-	-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/libvmtk1.0::
-	dh_install -p$(cdbs_curpkg) \
-	  `find debian/tmp/usr/lib/vmtk/ -name "lib*.so.*" | grep -v -E "(Python|TCL)"` usr/lib
-
-install/libvmtk-dev::
-	dh_install -p$(cdbs_curpkg) debian/tmp/usr/include/vmtk usr/include
-	dh_install -p$(cdbs_curpkg) \
-	  `find debian/tmp/usr/lib/vmtk/ -name "lib*.so" | grep -v -E "(Python|TCL)"` usr/lib
-
-install/python-vmtk::
-	dh_install -p$(cdbs_curpkg) debian/tmp/usr/lib/vmtk/*PythonD.* usr/lib
-	if [ $(PYVER) = "2.6" -o $(PYVER) = "2.7" ]; then \
-	  dh_install -p$(cdbs_curpkg) -X.pyc \
-	    debian/tmp/usr/lib/vmtk/vmtk usr/lib/python$(PYVER)/dist-packages; \
-	else \
-	  dh_install -p$(cdbs_curpkg) -X.pyc \
-	    debian/tmp/usr/lib/vmtk/vmtk usr/lib/python$(PYVER)/site-packages; \
-	fi
-	dh_python2 -p$(cdbs_curpkg)
-
-install/vmtk::
-	dh_install -p$(cdbs_curpkg) debian/tmp/usr/bin/vmtk usr/bin
-	dh_installman -p$(cdbs_curpkg) debian/vmtk.1
-
-USCAN_DESTDIR := $(CURDIR)
-
-get-orig-source:
-	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \
-	 --download-version $(DEB_UPSTREAM_VERSION) \
-	 --upstream-version $(DEB_UPSTREAM_VERSION)
+	-DVMTK_MINIMAL_INSTALL:BOOL=ON \
+	-DVMTK_WITH_LIBRARY_VERSION:BOOL=ON \
+	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DVTK_VMTK_WRAP_PYTHON:BOOL=ON \
+	-DVTK_VMTK_WRAP_TCL:BOOL=OFF \
+	-DVTK_VMTK_BUILD_TETGEN:BOOL=ON \
+	-DBUILD_DOCUMENTATION:BOOL=OFF \
+	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+	-DVTK_VMTK_CONTRIB:BOOL=ON \
+	-DVMTK_CONTRIB_SCRIPTS:BOOL=ON \
+	-DUSE_SYSTEM_ITK:BOOL=ON \
+	-DUSE_SYSTEM_VTK:BOOL=ON \
+	-DVMTK_USE_SUPERBUILD:BOOL=OFF \
+	-DVMTK_SCRIPTS_ENABLED:BOOL=ON \
+	-DVMTK_MODULE_INSTALL_LIB_DIR:PATH=$(PYDIR)
+
+%:
+	dh $@ --parallel --with python2
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+
+override_dh_install:
+	dh_install -pvmtk		usr/bin
+	dh_install -ppython-vmtk	usr/lib/python*
+	dh_install -ppython-vmtk	usr/lib/*Python*.so*
+	dh_install -plibvmtk-dev	usr/include
+	dh_install -plibvmtk-dev	usr/lib/*.so 	-X"Python"
+	dh_install -plibvmtk1.0		usr/lib/*.so.*	-X"Python"
diff --git a/debian/vmtk.install b/debian/vmtk.install
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/vmtk.install
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/vmtk.lintian-overrides b/debian/vmtk.lintian-overrides
deleted file mode 100644
index 6684cb5..0000000
--- a/debian/vmtk.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-vmtk: no-upstream-changelog
-vmtk: description-synopsis-starts-with-article
diff --git a/debian/vmtk.manpages b/debian/vmtk.manpages
new file mode 100644
index 0000000..0978ca7
--- /dev/null
+++ b/debian/vmtk.manpages
@@ -0,0 +1 @@
+debian/vmtk.1

-- 
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