r35625 - in /packages/openigtlink/trunk/debian: changelog patches/10_all_changes.dpatch rules

[domibel-guest at users.alioth.debian.org]

Author: domibel-guest
Date: Sun Apr  5 04:06:27 2009
New Revision: 35625

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35625
Log:
CMake's find_package() should work now

Modified:
    packages/openigtlink/trunk/debian/changelog
    packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch
    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=35625&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/changelog (original)
+++ packages/openigtlink/trunk/debian/changelog Sun Apr  5 04:06:27 2009
@@ -3,6 +3,9 @@
   * new snapshot
   * fixed configure issue
   * added watch file (Closes: #520529)
+  * *.cmake files are going to be install into
+    /usr/lib/openigtlink/ instead of /usr/lib/igtl/ so that 
+    CMake's find_package() has a chance to find it in Config mode
 
  -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Thu, 26 Mar 2009 19:45:05 -0400
 

Modified: packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch?rev=35625&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch (original)
+++ packages/openigtlink/trunk/debian/patches/10_all_changes.dpatch Sun Apr  5 04:06:27 2009
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad openigtlink-1.0.0~svn3987~/CMakeLists.txt openigtlink-1.0.0~svn3987/CMakeLists.txt
---- openigtlink-1.0.0~svn3987~/CMakeLists.txt	2009-03-26 18:41:18.000000000 -0400
-+++ openigtlink-1.0.0~svn3987/CMakeLists.txt	2009-03-26 18:41:21.000000000 -0400
+--- openigtlink-1.0.0~svn3987~/CMakeLists.txt	2009-04-03 22:53:20.000000000 -0400
++++ openigtlink-1.0.0~svn3987/CMakeLists.txt	2009-04-03 22:55:28.000000000 -0400
 @@ -59,24 +59,34 @@
  # OpenIGTLink_INSTALL_NO_DOCUMENTATION - do not install documentation files
  
@@ -28,14 +28,14 @@
  IF(NOT OpenIGTLink_INSTALL_DATA_DIR)
 -  SET(OpenIGTLink_INSTALL_DATA_DIR "share/igtl")
 +   SET(OpenIGTLink_INSTALL_DATA_DIR
-+      ${CMAKE_INSTALL_PREFIX}/share/igtl
++      ${CMAKE_INSTALL_PREFIX}/share/openigtlink
 +   )
  ENDIF(NOT OpenIGTLink_INSTALL_DATA_DIR)
  
  IF(NOT OpenIGTLink_INSTALL_INCLUDE_DIR)
 -  SET(OpenIGTLink_INSTALL_INCLUDE_DIR "include/igtl")
 +   SET(OpenIGTLink_INSTALL_INCLUDE_DIR
-+      ${CMAKE_INSTALL_PREFIX}/include/igtl
++      ${CMAKE_INSTALL_PREFIX}/include/openigtlink
 +   )
  ENDIF(NOT OpenIGTLink_INSTALL_INCLUDE_DIR)
  
@@ -43,7 +43,7 @@
 -  SET(OpenIGTLink_INSTALL_PACKAGE_DIR ${OpenIGTLink_INSTALL_LIB_DIR}
 -    CACHE INTERNAL "")
 +   SET(OpenIGTLink_INSTALL_PACKAGE_DIR
-+      ${CMAKE_INSTALL_PREFIX}/lib/igtl
++      ${CMAKE_INSTALL_PREFIX}/lib/openigtlink
 +      CACHE INTERNAL ""
 +   )
  ENDIF(NOT OpenIGTLink_INSTALL_PACKAGE_DIR)
@@ -57,9 +57,15 @@
    ${OpenIGTLink_BINARY_DIR}/UseOpenIGTLink.cmake
    DESTINATION ${OpenIGTLink_INSTALL_PACKAGE_DIR}
    COMPONENT Development
+@@ -260,5 +271,3 @@
+   CONFIGURE_FILE(${OpenIGTLink_SOURCE_DIR}/Utilities/Doxygen/igtldoxygen.pl.in
+                ${OpenIGTLink_BINARY_DIR}/igtldoxygen.pl)
+ ENDIF(BUILD_DOCUMENTATION)
+-
+-
 diff -urNad openigtlink-1.0.0~svn3987~/OpenIGTLinkConfig.cmake.in openigtlink-1.0.0~svn3987/OpenIGTLinkConfig.cmake.in
---- openigtlink-1.0.0~svn3987~/OpenIGTLinkConfig.cmake.in	2009-03-26 18:41:18.000000000 -0400
-+++ openigtlink-1.0.0~svn3987/OpenIGTLinkConfig.cmake.in	2009-03-26 18:41:21.000000000 -0400
+--- openigtlink-1.0.0~svn3987~/OpenIGTLinkConfig.cmake.in	2009-04-03 22:53:20.000000000 -0400
++++ openigtlink-1.0.0~svn3987/OpenIGTLinkConfig.cmake.in	2009-04-03 22:55:04.000000000 -0400
 @@ -7,10 +7,10 @@
  @OpenIGTLink_CONFIG_CODE@
  

Modified: packages/openigtlink/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/rules?rev=35625&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/rules (original)
+++ packages/openigtlink/trunk/debian/rules Sun Apr  5 04:06:27 2009
@@ -89,7 +89,6 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	rm -rf $(STATIC_BUILD_PATH)
@@ -117,15 +116,15 @@
 
 
 	# install development files
-	dh_install -plibopenigtlink1-dev  debian/tmp/usr/include/igtl/*     usr/include/igtl
+	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
-	dh_install -plibopenigtlink1-dev  debian/tmp/usr/lib/*.so           usr/lib
-	dh_install -plibopenigtlink1-dev  debian/tmp/usr/lib/igtl/*.cmake   usr/lib/igtl
+	dh_install -plibopenigtlink1-dev  debian/tmp/usr/lib/*.a                   usr/lib
+	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      debian/tmp/usr/lib/*.so.*         usr/lib
+	dh_install -plibopenigtlink1      debian/tmp/usr/lib/*.so.*                usr/lib