[med-svn] r15496 - trunk/packages/igstk/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-11 10:22:44 +0000 (Wed, 11 Dec 2013)
New Revision: 15496

Modified:
   trunk/packages/igstk/trunk/debian/changelog
   trunk/packages/igstk/trunk/debian/control
   trunk/packages/igstk/trunk/debian/rules
Log:
Use dh instead of cdbs


Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog	2013-12-11 08:33:46 UTC (rev 15495)
+++ trunk/packages/igstk/trunk/debian/changelog	2013-12-11 10:22:44 UTC (rev 15496)
@@ -10,6 +10,7 @@
   * debian/watch: Adapt to new download page
   * debian/get-orig-source: There is no point in just repackaging upstream
     download tarball
+  * debian/rules: use dh
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Dec 2013 09:01:23 +0100
 

Modified: trunk/packages/igstk/trunk/debian/control
===================================================================
--- trunk/packages/igstk/trunk/debian/control	2013-12-11 08:33:46 UTC (rev 15495)
+++ trunk/packages/igstk/trunk/debian/control	2013-12-11 10:22:44 UTC (rev 15496)
@@ -6,8 +6,6 @@
 Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
-               quilt,
                cmake,
                libinsighttoolkit3-dev (>= 3.20),
                libvtk5-dev,

Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules	2013-12-11 08:33:46 UTC (rev 15495)
+++ trunk/packages/igstk/trunk/debian/rules	2013-12-11 10:22:44 UTC (rev 15496)
@@ -3,16 +3,10 @@
 # Set this value to 0/1 to turn off/on verbose mode.
 export DH_VERBOSE=0
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
 ABI_VERSION := 4
 
-DEB_DH_STRIP_ARGS := --dbg-package=libigstk${ABI_VERSION}-dbg
+DEB_BUILDDIR := obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_BUILD_PARALLEL := true
-
 DEB_CMAKE_EXTRA_FLAGS = \
               -DCMAKE_INSTALL_PREFIX:PATH=/usr \
               -DCMAKE_BUILD_TYPE:STRING=Release \
@@ -36,7 +30,6 @@
               -DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \
               -DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \
               -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake
-              
 
 # if using precompiled static library provided by Claron Tech.:
 #              -DIGSTK_USE_MicronTracker:BOOL=ON \
@@ -44,41 +37,45 @@
 #              -DMTC_LIBRARY:PATH=/tmp/MTC/Dist \ 
 # TODO: /usr/bin/ld: cannot find -lMTC \
 
+%:
+	dh $@ --parallel
 
-build/igstk-doc::
-        # debug - this should not show up on buildd's
-	echo build igstk-doc
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
 
-install/libigstk${ABI_VERSION}-dev::
+override_dh_auto_build-indep:
+	mkdir -p $(DEB_BUILDDIR)/Utilities/Doxygen/doc/html
+	$(MAKE) Documentation -C $(DEB_BUILDDIR)
+
+override_dh_install-arch:
+	dh_install
+	## libigstk${ABI_VERSION}-dev ##
 	dh_install -plibigstk${ABI_VERSION}-dev    debian/tmp/usr/include/IGSTK/*                       usr/include/IGSTK
 #	dh_install -plibigstk${ABI_VERSION}-dev    ../../Utilities/SceneGraphVisualization/igstk*.h     usr/include/IGSTK
-
+	#
 	# install libs and *cmake files
 	dh_install -plibigstk${ABI_VERSION}-dev    debian/tmp/usr/lib/IGSTK/*.so                        usr/lib
 	dh_install -plibigstk${ABI_VERSION}-dev    debian/tmp/usr/lib/IGSTK/*.cmake                     usr/lib/IGSTK
-
-install/libigstk${ABI_VERSION}::
+	#
+	## libigstk${ABI_VERSION} ##
 	dh_install -plibigstk${ABI_VERSION}        debian/tmp/usr/lib/IGSTK/*.so.*                      usr/lib
 
-        # perform tests ('-' ignores return values)
-	- cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH /usr/bin/xvfb-run -a /usr/bin/ctest -VV
-
-
-install/igstk-doc::
-	mkdir -p $(DEB_BUILDDIR)/Utilities/Doxygen/doc/html
-	$(MAKE) $(JOBS) Documentation -C $(DEB_BUILDDIR)
-
+override_dh_install-indep:
         # remove zero byte files
 	find $(DEB_BUILDDIR)/Utilities/Doxygen/doc/ -depth -empty | xargs rm -rf
-
-
+	#
 	dh_install -pigstk-doc      $(DEB_BUILDDIR)/Utilities/Doxygen/doc/html       usr/share/doc/igstk-doc
-	dh_installexamples -pigstk-examples Examples/*
 
+override_dh_installexamples:
+	dh_installexamples -pigstk-examples Examples/*
 	# remove executable file mode bit
 	find debian/igstk-examples/usr/share/doc/igstk-examples/examples \
             -type f -print0 | xargs -0 chmod 644
 
+override_dh_auto_test:
+	# perform tests ('-' ignores return values)
+	- cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH /usr/bin/xvfb-run -a /usr/bin/ctest -VV
 
-#	dh_compress -X"igstk-examples/examples"
+override_dh_strip:
+	dh_strip --dbg-package=libigstk${ABI_VERSION}-dbg