[med-svn] r8273 - trunk/packages/vtkedge/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-25 16:31:02 +0000 (Tue, 25 Oct 2011)
New Revision: 8273

Modified:
   trunk/packages/vtkedge/trunk/debian/changelog
   trunk/packages/vtkedge/trunk/debian/rules
Log:
cleanup d/rules and use hardening flags.

Modified: trunk/packages/vtkedge/trunk/debian/changelog
===================================================================
--- trunk/packages/vtkedge/trunk/debian/changelog	2011-10-25 16:21:08 UTC (rev 8272)
+++ trunk/packages/vtkedge/trunk/debian/changelog	2011-10-25 16:31:02 UTC (rev 8273)
@@ -4,6 +4,7 @@
   * Remove references to old GPL license. Closes: #634739
   * Install *.txx file. Closes: #632861
   * Bump Standard Revision to 3.9.2, no changes needed
+  * use hardening compilation flags
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 19 Aug 2011 17:12:42 +0200
 

Modified: trunk/packages/vtkedge/trunk/debian/rules
===================================================================
--- trunk/packages/vtkedge/trunk/debian/rules	2011-10-25 16:21:08 UTC (rev 8272)
+++ trunk/packages/vtkedge/trunk/debian/rules	2011-10-25 16:31:02 UTC (rev 8273)
@@ -1,16 +1,27 @@
 #!/usr/bin/make -f
+# export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
 # /usr/bin/kwProcessXML: error while loading shared libraries: libvtkCommon.so.pv3.10: cannot open shared object file: No such file or directory
 export LD_LIBRARY_PATH+=:/usr/lib/paraview/
 
 %:
-	dh $@ --parallel --with quilt --buildsystem=cmake
+	dh $@ --parallel
 
-override_dh_auto_configure:
-	# testing does not work as we deactivate rpath during conf time
-	dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DVTK_DATA_ROOT:PATH=/usr/share/VTKData -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_TESTING:BOOL=OFF -DVTKEdge_BUILD_PARAVIEW_PLUGINS:BOOL=ON -DVTKEdge_USE_ITK:BOOL=ON
+# testing does not work as we deactivate rpath during conf time
+CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
+	-DVTK_DATA_ROOT:PATH=/usr/share/VTKData \
+	-DCMAKE_SKIP_RPATH:BOOL=YES \
+	-DBUILD_TESTING:BOOL=OFF \
+	-DVTKEdge_BUILD_PARAVIEW_PLUGINS:BOOL=ON \
+	-DVTKEdge_USE_ITK:BOOL=ON
 	# if anyone has an nvidia card...
-	#dh_auto_configure -- -DVTK_DATA_ROOT:PATH=/usr/share/VTKData -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_BUILD_TYPE:STRING=Release -DVTKEdge_USE_CUDA:BOOL=ON -DVTKEdge_USE_NVCONTROL:BOOL=ON
+	# -DVTKEdge_USE_CUDA:BOOL=ON -DVTKEdge_USE_NVCONTROL:BOOL=ON
 
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
+
 get-orig-source:
 	./debian/get-orig-source