[med-svn] r8538 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Dominique Belhachemi]

Author: domibel
Date: 2011-11-12 05:17:01 +0000 (Sat, 12 Nov 2011)
New Revision: 8538

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/vtkversion.patch
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
   trunk/packages/ginkgocadx/trunk/debian/patches/series
   trunk/packages/ginkgocadx/trunk/debian/rules
Log:
removed hardcoded vtk version number - allow to link against vtk-5.8
removed chrpath package dependency - instead use -DCMAKE_SKIP_RPATH:BOOL=ON



Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2011-11-11 17:41:11 UTC (rev 8537)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2011-11-12 05:17:01 UTC (rev 8538)
@@ -1,3 +1,10 @@
+ginkgocadx (2.6.0.0~rc-2) UNRELEASED; urgency=low
+
+  * removed hardcoded vtk version number - allow to link against vtk-5.8
+  * removed chrpath package dependency - instead use -DCMAKE_SKIP_RPATH:BOOL=ON
+
+ -- Dominique Belhachemi <domibel at debian.org>  Fri, 11 Nov 2011 21:33:50 -0500
+
 ginkgocadx (2.6.0.0~rc-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2011-11-11 17:41:11 UTC (rev 8537)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2011-11-12 05:17:01 UTC (rev 8538)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 8), cmake (>= 2.8), libgtk2.0-dev, libxml2-dev, libssl-dev, libwrap0-dev,
  libwxgtk2.8-dev (>= 2.8.10), libvtk5-dev (>= 5.6.0), libinsighttoolkit3-dev (>= 3.20.0),
  libdcmtk2-dev (>= 3.6.0), libcairo2-dev (>= 1.8.10), 
- libgdcm2-dev, libwrap0, libfftw3-dev, chrpath, libsqlite3-dev,
+ libgdcm2-dev, libwrap0, libfftw3-dev, libsqlite3-dev,
  libmysqlclient16 (>= 5.1.57)
 Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ginkgocadx/trunk/

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-11-11 17:41:11 UTC (rev 8537)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2011-11-12 05:17:01 UTC (rev 8538)
@@ -1 +1,2 @@
 fixwhatis.patch
+vtkversion.patch

Added: trunk/packages/ginkgocadx/trunk/debian/patches/vtkversion.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/vtkversion.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/vtkversion.patch	2011-11-12 05:17:01 UTC (rev 8538)
@@ -0,0 +1,11 @@
+--- ginkgocadx-2.6.0.0~rc.orig/src/CMakeLists.txt
++++ ginkgocadx-2.6.0.0~rc/src/CMakeLists.txt
+@@ -68,7 +68,7 @@ ENDIF()
+ 
+ IF(NOT USE_CUSTOM_VTK)
+ 	MESSAGE("Using system VTK")
+-	FIND_PACKAGE(VTK 5.6.1 REQUIRED)
++	FIND_PACKAGE(VTK REQUIRED)
+ ELSE()
+ 	MESSAGE("Using custom VTK")
+ 	SET_CUSTOM_VTK_PACKAGE()

Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules	2011-11-11 17:41:11 UTC (rev 8537)
+++ trunk/packages/ginkgocadx/trunk/debian/rules	2011-11-12 05:17:01 UTC (rev 8538)
@@ -10,10 +10,15 @@
 
 pkg=ginkgocadx
 
-override_dh_auto_install:
-	dh_auto_install
-	# Hack around useless rpath definitions
-	/usr/bin/chrpath -r /usr/lib/ginkgocadx debian/$(pkg)/usr/bin/$(pkg)
+DEB_CMAKE_EXTRA_FLAGS += \
+	-DCMAKE_BUILD_TYPE:STRING=RELEASE \
+	-DCMAKE_SKIP_RPATH:BOOL=ON
 
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) 
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l $(CURDIR)/debian/ginkgocadx/usr/lib/ginkgocadx
+
 get-orig-source:
 	uscan --verbose --force-download --repack