[med-svn] r8410 - trunk/packages/ctk/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-11-04 14:34:43 +0000 (Fri, 04 Nov 2011)
New Revision: 8410

Modified:
   trunk/packages/ctk/trunk/debian/changelog
   trunk/packages/ctk/trunk/debian/get-orig-source
   trunk/packages/ctk/trunk/debian/rules
Log:
Cant use git numbering since not lexicographic

Modified: trunk/packages/ctk/trunk/debian/changelog
===================================================================
--- trunk/packages/ctk/trunk/debian/changelog	2011-11-04 14:20:40 UTC (rev 8409)
+++ trunk/packages/ctk/trunk/debian/changelog	2011-11-04 14:34:43 UTC (rev 8410)
@@ -1,4 +1,4 @@
-ctk (0.1.0~git622a40d-1) unstable; urgency=low
+ctk (0.1.0~git20111103-1) experimental; urgency=low
 
   * Use newer git commit, to allow building with DCMTK 3.6.0
     - Build CTK/DICOM module

Modified: trunk/packages/ctk/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/ctk/trunk/debian/get-orig-source	2011-11-04 14:20:40 UTC (rev 8409)
+++ trunk/packages/ctk/trunk/debian/get-orig-source	2011-11-04 14:34:43 UTC (rev 8410)
@@ -11,6 +11,9 @@
 fi
 
 REVISION=`echo $VERSION | sed -e 's/^.*git//g'`
+#Date:   Thu Nov 3 09:17:34 2011 -0400
+#    Merge branch 'ctkvtkvolumepropertywidget-update-range'
+REVISION=764eebaf9683c102aab062b824323d0b962f1c64
 
 if [ -z ${TARFILE}]; then
 TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz

Modified: trunk/packages/ctk/trunk/debian/rules
===================================================================
--- trunk/packages/ctk/trunk/debian/rules	2011-11-04 14:20:40 UTC (rev 8409)
+++ trunk/packages/ctk/trunk/debian/rules	2011-11-04 14:34:43 UTC (rev 8410)
@@ -1,38 +1,30 @@
 #!/usr/bin/make -f
+#DH_VERBOSE=0
 
-DH_VERBOSE=0
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-
-DEB_CMAKE_EXTRA_FLAGS = \
+CMAKE_FLAGS = \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-        -DCMAKE_BUILD_TYPE:STRING=Debug \
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-        -DCMAKE_SKIP_RPATH:BOOL=ON \
-        -DBUILD_TESTING:BOOL=ON \
-        -DCTK_APP_ctkCLIPluginExplorer:BOOL=ON \
-        -DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
-        -DCTK_LIB_DICOM/Core:BOOL=ON \
-        -DCTK_LIB_Widgets:BOOL=ON \
-        -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
-        -DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
-        -DCTK_SUPERBUILD:BOOL=OFF \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DBUILD_TESTING:BOOL=ON \
+	-DCTK_APP_ctkCLIPluginExplorer:BOOL=ON \
+	-DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
+	-DCTK_LIB_DICOM/Core:BOOL=ON \
+	-DCTK_LIB_Widgets:BOOL=ON \
+	-DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
+	-DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
+	-DCTK_SUPERBUILD:BOOL=OFF \
 
+pkg_run = libctk0.1
+pkg_dev = libctk-dev
 
-build/libctk0.1::
-	- cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH ctest -VV
+%:
+	dh $@ --parallel
 
-install/libctk0.1::
-	dh_install -plibctk0.1      debian/tmp/usr/lib/*.so.*                        usr/lib
-	dh_install -plibctk0.1      debian/tmp/usr/lib/*.a                           usr/lib
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_FLAGS)
 
-
-install/libctk-dev::
-	dh_install -plibctk-dev   debian/tmp/usr/include/ctk-0.1/*                   usr/include/ctk
-	dh_install -plibctk-dev   debian/tmp/usr/lib/*.so                            usr/lib
-#	dh_install -plibctk-dev   debian/tmp/usr/lib/ctk-0.1/*.cmake                 usr/lib/ctk-0.1
-
 #install/ctk-examples::
 #	dh_installexamples -popenigtlink-examples Examples/
 
@@ -41,5 +33,14 @@
 #	doxygen $(DEB_BUILDDIR)/doxygen.config
 #	dh_install -plibctk-doc       $(DEB_BUILDDIR)/Documents/Doxygen/html         usr/share/doc/ctk-doc
 
+override_dh_install:
+	# Runtime Package
+	dh_install -p$(pkg_run) usr/lib/*.so.*
+	dh_install -p$(pkg_run) usr/lib/*.a
+	# Development Package
+	dh_install -p$(pkg_dev) usr/include
+	dh_install -p$(pkg_dev) usr/lib/lib*.so
+#	dh_install -plibctk-dev   debian/tmp/usr/lib/ctk-0.1/*.cmake                 usr/lib/ctk-0.1
+
 get-orig-source:
-	/bin/sh $(CURDIR)/debian/get-orig-source
+	./debian/get-orig-source