[med-svn] r8652 - trunk/packages/ginkgocadx/trunk/debian

[Dominique Belhachemi]

Author: domibel
Date: 2011-11-23 02:42:23 +0000 (Wed, 23 Nov 2011)
New Revision: 8652

Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
   trunk/packages/ginkgocadx/trunk/debian/rules
Log:
revert changes - now use chrpath again

Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2011-11-22 17:59:03 UTC (rev 8651)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2011-11-23 02:42:23 UTC (rev 8652)
@@ -1,7 +1,6 @@
-ginkgocadx (2.6.0.0~rc-2) UNRELEASED; urgency=low
+ginkgocadx (2.6.0.0~rc-2) unstable; 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
 

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2011-11-22 17:59:03 UTC (rev 8651)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2011-11-23 02:42:23 UTC (rev 8652)
@@ -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, libsqlite3-dev,
+ libgdcm2-dev, libwrap0, libfftw3-dev, chrpath, 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/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules	2011-11-22 17:59:03 UTC (rev 8651)
+++ trunk/packages/ginkgocadx/trunk/debian/rules	2011-11-23 02:42:23 UTC (rev 8652)
@@ -11,14 +11,15 @@
 pkg=ginkgocadx
 
 DEB_CMAKE_EXTRA_FLAGS += \
-	-DCMAKE_BUILD_TYPE:STRING=RELEASE \
-	-DCMAKE_SKIP_RPATH:BOOL=ON
+	-DCMAKE_BUILD_TYPE:STRING=RELEASE
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) 
 
-override_dh_shlibdeps:
-	dh_shlibdeps -l $(CURDIR)/debian/ginkgocadx/usr/lib/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)
 
 get-orig-source:
 	uscan --verbose --force-download --repack