r38395 - in /packages/openigtlink/trunk/debian: changelog compat control get-orig-source patches/debian-changes-1.9.1~svn7162-1 patches/debian-changes-1.9.2~svn7380-1 patches/series rules

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Sun Apr 17 05:10:18 UTC 2011


Author: domibel-guest
Date: Sun Apr 17 05:10:00 2011
New Revision: 38395

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38395
Log:
  * New upstream version 1.9.2
  * Added debug package libopenigtlink1.9-dbg
  * Use CDBS
  * Bump compat level to 8


Added:
    packages/openigtlink/trunk/debian/patches/debian-changes-1.9.2~svn7380-1
Modified:
    packages/openigtlink/trunk/debian/changelog
    packages/openigtlink/trunk/debian/compat
    packages/openigtlink/trunk/debian/control
    packages/openigtlink/trunk/debian/get-orig-source
    packages/openigtlink/trunk/debian/patches/debian-changes-1.9.1~svn7162-1
    packages/openigtlink/trunk/debian/patches/series
    packages/openigtlink/trunk/debian/rules

Modified: packages/openigtlink/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/changelog?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/changelog (original)
+++ packages/openigtlink/trunk/debian/changelog Sun Apr 17 05:10:00 2011
@@ -1,13 +1,23 @@
+openigtlink (1.9.2~svn7380-1) unstable; urgency=low
+
+  * New upstream version 1.9.2
+  * Added debug package libopenigtlink1.9-dbg
+  * Use CDBS
+  * Bump compat level to 8
+
+ -- Dominique Belhachemi <domibel at debian.org>  Sat, 02 Apr 2011 23:34:10 -0400
+
 openigtlink (1.9.1~svn7162-1) unstable; urgency=low
 
   * new upstream snapshot
+  * removed non-free Documents
   * bump Standard-Version to 3.9.1 (no changes required)
   * build-depend on doxygen-latex (Closes: #616272)
   * Bump SONAME to 1.9
   * removed quilt's patch/unpatch logic
   * removed debian/README.source
 
- -- Dominique Belhachemi <domibel at debian.org>  Sun, 06 Mar 2011 14:43:09 -0500
+ -- Dominique Belhachemi <domibel at debian.org>  Thu, 10 Mar 2011 07:58:53 -0500
 
 openigtlink (1.0.0~svn6270-1) unstable; urgency=low
 

Modified: packages/openigtlink/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/compat?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/compat (original)
+++ packages/openigtlink/trunk/debian/compat Sun Apr 17 05:10:00 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/openigtlink/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/control?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/control (original)
+++ packages/openigtlink/trunk/debian/control Sun Apr 17 05:10:00 2011
@@ -3,7 +3,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at debian.org>
-Build-Depends: debhelper (>= 7), cmake
+Build-Depends: debhelper (>= 8), cmake, cdbs, quilt
 Build-Depends-Indep: doxygen-latex
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/?rev=0&sc=0
@@ -35,6 +35,19 @@
  .
  This package contains library files for OpenIGTLink.
  
+Package: libopenigtlink1.9-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+    libopenigtlink1.9 (= ${binary:Version}),
+    ${misc:Depends}
+Description: debugging symbols for libopenigtlink1.9
+ Open IGT Link is a simple network protocol intended for trackers,
+ robots and other devices to send data to the main application.
+ Some devices might also accept commands.
+ .
+ This package contains the debugging symbols for libopenigtlink1.9.
 
 Package: openigtlink-doc
 Section: doc

Modified: packages/openigtlink/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/get-orig-source?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/get-orig-source (original)
+++ packages/openigtlink/trunk/debian/get-orig-source Sun Apr 17 05:10:00 2011
@@ -20,5 +20,9 @@
 
 svn export --quiet --revision ${REVISION} http://svn.na-mic.org/NAMICSandBox/trunk/OpenIGTLink ${FOLDER}
 
+rm ${FOLDER}/Documents/CMakeLists.txt
+rm -rf ${FOLDER}/Documents/Papers/
+rm -rf ${FOLDER}/Documents/Protocol/
+
 GZIP=-9 tar czf ${TARFILE} ${FOLDER}
 rm -rf ${FOLDER}

Modified: packages/openigtlink/trunk/debian/patches/debian-changes-1.9.1~svn7162-1
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/debian-changes-1.9.1%7Esvn7162-1?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/debian-changes-1.9.1~svn7162-1 (original)
+++ packages/openigtlink/trunk/debian/patches/debian-changes-1.9.1~svn7162-1 Sun Apr 17 05:10:00 2011
@@ -6,6 +6,7 @@
  openigtlink (1.9.1~svn7162-1) unstable; urgency=low
  .
    * new upstream snapshot
+   * removed non-free Documents
    * bump Standard-Version to 3.9.1 (no changes required)
    * build-depend on doxygen-latex (Closes: #616272)
    * Bump SONAME to 1.9
@@ -29,8 +30,10 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- openigtlink-1.9.1~svn7162.orig/OpenIGTLinkConfig.cmake.in
-+++ openigtlink-1.9.1~svn7162/OpenIGTLinkConfig.cmake.in
+Index: openigtlink-1.9.2~svn7380/OpenIGTLinkConfig.cmake.in
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/OpenIGTLinkConfig.cmake.in	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/OpenIGTLinkConfig.cmake.in	2011-04-17 00:34:11.000000000 -0400
 @@ -7,10 +7,10 @@
  @OpenIGTLink_CONFIG_CODE@
  
@@ -44,7 +47,7 @@
  
  # The C and C++ flags added by OpenIGTLink to the cmake-configured flags.
  SET(OpenIGTLink_REQUIRED_C_FLAGS "@OpenIGTLink_REQUIRED_C_FLAGS@")
-@@ -26,10 +26,10 @@ SET(OpenIGTLink_VERSION_PATCH "@OpenIGTL
+@@ -26,10 +26,10 @@
  SET(OpenIGTLink_PROTOCOL_VERSION "@OpenIGTLink_PROTOCOL_VERSION@")
  
  # The location of the UseOpenIGTLink.cmake file.
@@ -57,9 +60,11 @@
  
  # The library dependencies file.
  SET(OpenIGTLink_LIBRARY_DEPENDS_FILE "@OpenIGTLink_LIBRARY_DEPENDS_FILE@")
---- openigtlink-1.9.1~svn7162.orig/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/CMakeLists.txt
-@@ -72,24 +72,34 @@ SET(CMAKE_MODULE_PATH "${OpenIGTLink_SOU
+Index: openigtlink-1.9.2~svn7380/CMakeLists.txt
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
+@@ -72,24 +72,34 @@
  # OpenIGTLink_INSTALL_NO_DOCUMENTATION - do not install documentation files
  
  IF(NOT OpenIGTLink_INSTALL_BIN_DIR)
@@ -100,7 +105,7 @@
  ENDIF(NOT OpenIGTLink_INSTALL_PACKAGE_DIR)
  
  IF(NOT OpenIGTLink_INSTALL_NO_DOCUMENTATION)
-@@ -219,6 +229,7 @@ CMAKE_EXPORT_BUILD_SETTINGS(${OpenIGTLin
+@@ -227,6 +237,7 @@
  INSTALL(FILES
    ${OpenIGTLink_BINARY_DIR}/OpenIGTLinkBuildSettings.cmake
  #  ${OpenIGTLink_BINARY_DIR}/OpenIGTLinkLibraryDepends.cmake
@@ -108,9 +113,11 @@
    ${OpenIGTLink_BINARY_DIR}/UseOpenIGTLink.cmake
    ${OpenIGTLink_BINARY_DIR}/Utilities/OpenIGTLinkConfig.cmake
    DESTINATION ${OpenIGTLink_INSTALL_PACKAGE_DIR}
---- openigtlink-1.9.1~svn7162.orig/Source/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/Source/CMakeLists.txt
-@@ -138,7 +138,7 @@ TARGET_LINK_LIBRARIES(OpenIGTLink
+Index: openigtlink-1.9.2~svn7380/Source/CMakeLists.txt
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/Source/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/Source/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
+@@ -160,7 +160,7 @@
  
  SET_TARGET_PROPERTIES(OpenIGTLink PROPERTIES
    VERSION ${OpenIGTLink_VERSION_MAJOR}.${OpenIGTLink_VERSION_MINOR}.${OpenIGTLink_VERSION_PATCH}
@@ -119,9 +126,11 @@
  )
  
  #FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
---- openigtlink-1.9.1~svn7162.orig/Source/igtlutil/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/Source/igtlutil/CMakeLists.txt
-@@ -56,7 +56,7 @@ ADD_LIBRARY(igtlutil
+Index: openigtlink-1.9.2~svn7380/Source/igtlutil/CMakeLists.txt
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/Source/igtlutil/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/Source/igtlutil/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
+@@ -70,7 +70,7 @@
  
  SET_TARGET_PROPERTIES(igtlutil PROPERTIES
    VERSION ${OpenIGTLink_VERSION_MAJOR}.${OpenIGTLink_VERSION_MINOR}.${OpenIGTLink_VERSION_PATCH}
@@ -130,20 +139,10 @@
  )
  
  #TARGET_LINK_LIBRARIES(igtlutil
---- openigtlink-1.9.1~svn7162.orig/Testing/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/Testing/CMakeLists.txt
-@@ -1,7 +1,7 @@
- ADD_SUBDIRECTORY( igtlutil )
- 
--find_package(OpenIGTLink REQUIRED)
--include(${OpenIGTLink_USE_FILE})
-+#find_package(OpenIGTLink REQUIRED)
-+#include(${OpenIGTLink_USE_FILE})
- 
- ADD_EXECUTABLE(igtlSocketTest   igtlSocketTest.cxx)
- ADD_EXECUTABLE(igtlMultiThreaderTest1   igtlMultiThreaderTest1.cxx)
---- openigtlink-1.9.1~svn7162.orig/Testing/igtlutil/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/Testing/igtlutil/CMakeLists.txt
+Index: openigtlink-1.9.2~svn7380/Testing/igtlutil/CMakeLists.txt
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/Testing/igtlutil/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/Testing/igtlutil/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
 @@ -1,5 +1,5 @@
 -find_package(OpenIGTLink REQUIRED)
 -include(${OpenIGTLink_USE_FILE})
@@ -152,8 +151,10 @@
  
  ADD_EXECUTABLE(igtl_image_test igtl_image_test.c)
  ADD_EXECUTABLE(igtl_header_test igtl_header_test.c)
---- openigtlink-1.9.1~svn7162.orig/Utilities/Doxygen/doxygen.config.in
-+++ openigtlink-1.9.1~svn7162/Utilities/Doxygen/doxygen.config.in
+Index: openigtlink-1.9.2~svn7380/Utilities/Doxygen/doxygen.config.in
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/Utilities/Doxygen/doxygen.config.in	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/Utilities/Doxygen/doxygen.config.in	2011-04-17 00:34:11.000000000 -0400
 @@ -1,481 +1,98 @@
 -# Doxyfile 1.4.3-20050530
 -
@@ -667,7 +668,7 @@
  EXCLUDE                = "@OpenIGTLink_SOURCE_DIR@/Code/Common/itkPixelTraits.h" \
                           "@OpenIGTLink_SOURCE_DIR@/Code/Common/itkNumericTraits.h" \
                           "@OpenIGTLink_SOURCE_DIR@/Code/Common/itkNumericTraitsRGB.h" \
-@@ -484,867 +101,237 @@ EXCLUDE                = "@OpenIGTLink_S
+@@ -484,867 +101,237 @@
                           "@OpenIGTLink_SOURCE_DIR@/Code/Common/itkNumericTraitsCovariantVectorPixel.h" \
                           "@OpenIGTLink_SOURCE_DIR@/Code/Common/itkNumericTraitsVariableLengthVectorPixel.h" \
                           "@OpenIGTLink_SOURCE_DIR@/Code/IO/itkPixelData.h" \
@@ -1656,9 +1657,11 @@
 -# used. If set to NO the values of all tags below this one will be ignored.
 -
 -SEARCHENGINE           = NO
---- openigtlink-1.9.1~svn7162.orig/Examples/CMakeLists.txt
-+++ openigtlink-1.9.1~svn7162/Examples/CMakeLists.txt
-@@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 2.4)
+Index: openigtlink-1.9.2~svn7380/Examples/CMakeLists.txt
+===================================================================
+--- openigtlink-1.9.2~svn7380.orig/Examples/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
++++ openigtlink-1.9.2~svn7380/Examples/CMakeLists.txt	2011-04-17 00:34:11.000000000 -0400
+@@ -4,6 +4,8 @@
  # Examples
  #
  

Added: packages/openigtlink/trunk/debian/patches/debian-changes-1.9.2~svn7380-1
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/debian-changes-1.9.2%7Esvn7380-1?rev=38395&op=file
==============================================================================
--- packages/openigtlink/trunk/debian/patches/debian-changes-1.9.2~svn7380-1 (added)
+++ packages/openigtlink/trunk/debian/patches/debian-changes-1.9.2~svn7380-1 Sun Apr 17 05:10:00 2011
@@ -1,0 +1,40 @@
+Description: Upstream changes introduced in version 1.9.2~svn7380-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ openigtlink (1.9.2~svn7380-1) unstable; urgency=low
+ .
+   * New upstream version 1.9.2
+   * Added debug package libopenigtlink1.9-dbg
+   * Use CDBS
+   * Bump compat level to 8
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Dominique Belhachemi <domibel at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openigtlink-1.9.2~svn7380.orig/Testing/CMakeLists.txt
++++ openigtlink-1.9.2~svn7380/Testing/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ADD_SUBDIRECTORY( igtlutil )
+ 
+-find_package(OpenIGTLink REQUIRED)
+-include(${OpenIGTLink_USE_FILE})
++#find_package(OpenIGTLink REQUIRED)
++include(${OpenIGTLink_BINARY_DIR}/UseOpenIGTLink.cmake)
+ 
+ ADD_EXECUTABLE(igtlSocketTest   igtlSocketTest.cxx)
+ ADD_EXECUTABLE(igtlMultiThreaderTest1   igtlMultiThreaderTest1.cxx)

Modified: packages/openigtlink/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/series?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/series (original)
+++ packages/openigtlink/trunk/debian/patches/series Sun Apr 17 05:10:00 2011
@@ -1,1 +1,2 @@
 debian-changes-1.9.1~svn7162-1
+debian-changes-1.9.2~svn7380-1

Modified: packages/openigtlink/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/rules?rev=38395&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/rules (original)
+++ packages/openigtlink/trunk/debian/rules Sun Apr 17 05:10:00 2011
@@ -1,175 +1,51 @@
 #!/usr/bin/make -f
 
-PACKAGE=openigtlink
+DH_VERBOSE=1
 
-DEB_SOURCE_PACKAGE:=$(PACKAGE)
+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
 
-# set the number of build jobs
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_ARCH_OS  := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# Set this value to 0/1 to turn off/on verbose mode.
-export DH_VERBOSE=0
-
-STATIC_BUILD_PATH = DEB_build_static
-SHARED_BUILD_PATH = DEB_build_shared
-
-CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-              -DCMAKE_BUILD_TYPE:STRING=Release \
-              -DCMAKE_CXX_FLAGS="-Wno-deprecated" \
-              -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
-              -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-              -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
-              -DCMAKE_SKIP_RPATH:BOOL=ON \
-              -DBUILD_DOCUMENTATION:BOOL=ON \
-              -DBUILD_TESTING:BOOL=ON \
-              -DBUILD_EXAMPLES:BOOL=OFF \
-              -DOpenIGTLink_PROTOCOL_VERSION_2:BOOL=OFF \
-
+DEB_DH_STRIP_ARGS := --dbg-package=libopenigtlink1.9-dbg
 
 get-orig-source:
 	/bin/sh $(CURDIR)/debian/get-orig-source
 
-configure: configure-stamp
-
-configure-stamp:
-	dh_testdir
-
-        # Add here commands to configure the package.
-	echo DEB_HOST_ARCH_CPU = ${DEB_HOST_ARCH_CPU}
-	echo DEB_HOST_ARCH_OS  = ${DEB_HOST_ARCH_OS}
-	echo DEB_HOST_ARCH     = ${DEB_HOST_ARCH}
+DEB_CMAKE_EXTRA_FLAGS = \
+        -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DCMAKE_BUILD_TYPE:STRING=Release \
+        -DCMAKE_SKIP_RPATH:BOOL=ON \
+        -DBUILD_SHARED_LIBS:BOOL=ON \
+        -DBUILD_DOCUMENTATION:BOOL=ON \
+        -DBUILD_TESTING:BOOL=ON \
+        -DBUILD_EXAMPLES:BOOL=OFF \
+        -DOpenIGTLink_PROTOCOL_VERSION_2:BOOL=OFF \
+        -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
 
 
-	if [ ! -d $(STATIC_BUILD_PATH) ]; then mkdir $(STATIC_BUILD_PATH); fi
+#        -DCMAKE_CXX_FLAGS="-Wno-deprecated" \
+#        -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
+#        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+#        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
 
-	cd $(STATIC_BUILD_PATH) \
-            && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=OFF
+build/openigtlink-doc::
+##	$(MAKE) $(JOBS) DoxygenDoc -C $(DEB_BUILDDIR)
+	doxygen -u $(DEB_BUILDDIR)/doxygen.config
+	doxygen $(DEB_BUILDDIR)/doxygen.config
 
+build/libopenigtlink1.9::
+	- cd $(DEB_BUILDDIR) && LD_LIBRARY_PATH=`pwd`/bin:$$LD_LIBRARY_PATH ctest -D ExperimentalTest
 
-	if [ ! -d $(SHARED_BUILD_PATH) ]; then mkdir $(SHARED_BUILD_PATH); fi
+install/libopenigtlink1.9::
+	dh_install -plibopenigtlink1.9     debian/tmp/usr/lib/*.so.*                usr/lib
 
-	cd $(SHARED_BUILD_PATH) \
-            && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
-
-	touch $@
-
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	dh_testdir
-
-	# Add here commands to compile the package.
-
-        # build static libs
-	$(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
-
-	# perform tests ('-' ignores return values)
-	- cd $(STATIC_BUILD_PATH) && ctest -VV
-
-	# build shared libs and binaries
-	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
-
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-	dh_testdir
-
-#	$(MAKE) $(JOBS) DoxygenDoc -C $(STATIC_BUILD_PATH)
-	doxygen -u $(STATIC_BUILD_PATH)/doxygen.config
-	doxygen $(STATIC_BUILD_PATH)/doxygen.config
-
-	touch $@
-
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	# Add here commands to clean up after the build process.
-	rm -rf $(STATIC_BUILD_PATH)
-	rm -rf $(SHARED_BUILD_PATH)
-
-	dh_clean
-
-install: install-indep install-arch
-
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	
-	# install binaries and shared libs
-	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-        # install static libs
-	cd $(STATIC_BUILD_PATH)/bin/ \
-                && cp lib*.a $(CURDIR)/debian/tmp/usr/lib/
-
-
-	# install development files
-	dh_install -plibopenigtlink1-dev   debian/tmp/usr/include/openigtlink/*            usr/include/openigtlink
-
-
-	# install libs and *cmake files
-	dh_install -plibopenigtlink1-dev   debian/tmp/usr/lib/*.a                   usr/lib
+install/libopenigtlink1-dev::
+	dh_install -plibopenigtlink1-dev   debian/tmp/usr/include/openigtlink/*     usr/include/openigtlink
 	dh_install -plibopenigtlink1-dev   debian/tmp/usr/lib/*.so                  usr/lib
 	dh_install -plibopenigtlink1-dev   debian/tmp/usr/lib/openigtlink/*.cmake   usr/lib/openigtlink
 
-	dh_install -plibopenigtlink1.9     debian/tmp/usr/lib/*.so.*                usr/lib
-
-
-
-install-indep: build-indep
-	dh_install -popenigtlink-doc       $(STATIC_BUILD_PATH)/Documents/Doxygen/html    usr/share/doc/openigtlink-doc
+install/openigtlink-examples::
 	dh_installexamples -popenigtlink-examples Examples/*
 
-
-
-# Build architecture-dependent files here.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=$(CURDIR)/debian/tmp
-#	dh_install
-#	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress -X"openigtlink-examples/examples"
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+install/openigtlink-doc::
+	dh_install -popenigtlink-doc       $(DEB_BUILDDIR)/Documents/Doxygen/html   usr/share/doc/openigtlink-doc




More information about the debian-science-commits mailing list