r46335 - in /packages/openigtlink/trunk/debian: changelog control patches/install_path.patch rules

domibel at users.alioth.debian.org domibel at users.alioth.debian.org
Mon Oct 7 00:36:09 UTC 2013 

Author: domibel
Date: Mon Oct  7 00:36:08 2013
New Revision: 46335

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46335
Log:
use build indep target install/openigtlink-doc:: to build documentation

Modified:
    packages/openigtlink/trunk/debian/changelog
    packages/openigtlink/trunk/debian/control
    packages/openigtlink/trunk/debian/patches/install_path.patch
    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=46335&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/changelog	(original)
+++ packages/openigtlink/trunk/debian/changelog	Mon Oct  7 00:36:08 2013
@@ -1,3 +1,10 @@
+openigtlink (1.9.8~git20130725+bacab6f8b1-2) experimental; urgency=low
+
+  * use build indep target install/openigtlink-doc:: to build documentation
+  * removed DM-Upload-Allowed field
+
+ -- Dominique Belhachemi <domibel at debian.org>  Sun, 18 Aug 2013 02:48:09 -0400
+
 openigtlink (1.9.8~git20130725+bacab6f8b1-1) experimental; urgency=low
 
   * switch to new upstream repository on github

Modified: packages/openigtlink/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/control?rev=46335&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/control	(original)
+++ packages/openigtlink/trunk/debian/control	Mon Oct  7 00:36:08 2013
@@ -1,7 +1,6 @@
 Source: openigtlink
 Priority: optional
 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 (>= 9), cmake, cdbs, quilt
 Build-Depends-Indep: doxygen-latex

Modified: packages/openigtlink/trunk/debian/patches/install_path.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/install_path.patch?rev=46335&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/install_path.patch	(original)
+++ packages/openigtlink/trunk/debian/patches/install_path.patch	Mon Oct  7 00:36:08 2013
@@ -1,7 +1,7 @@
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Testing/CMakeLists.txt	2013-08-18 02:17:42.337970186 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/CMakeLists.txt	2013-08-18 02:17:42.000000000 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Testing/CMakeLists.txt	2013-08-18 20:30:55.743412522 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/CMakeLists.txt	2013-08-18 20:30:56.000000000 -0400
 @@ -1,7 +1,7 @@
  ADD_SUBDIRECTORY( igtlutil )
  
@@ -14,8 +14,8 @@
  ADD_EXECUTABLE(igtlMultiThreaderTest1   igtlMultiThreaderTest1.cxx)
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/OpenIGTLinkConfig.cmake.in
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/OpenIGTLinkConfig.cmake.in	2013-08-18 02:17:42.233968389 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/OpenIGTLinkConfig.cmake.in	2013-08-18 02:17:42.000000000 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/OpenIGTLinkConfig.cmake.in	2013-08-18 20:30:55.639410678 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/OpenIGTLinkConfig.cmake.in	2013-08-18 20:30:56.000000000 -0400
 @@ -7,10 +7,10 @@
  @OpenIGTLink_CONFIG_CODE@
  
@@ -44,8 +44,8 @@
  SET(OpenIGTLink_LIBRARY_DEPENDS_FILE "@OpenIGTLink_LIBRARY_DEPENDS_FILE@")
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/CMakeLists.txt	2013-08-18 02:17:42.393971155 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/CMakeLists.txt	2013-08-18 02:17:42.000000000 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/CMakeLists.txt	2013-08-18 20:30:55.795413445 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/CMakeLists.txt	2013-08-18 20:32:54.073511770 -0400
 @@ -74,24 +74,34 @@
  # OpenIGTLink_INSTALL_NO_DOCUMENTATION - do not install documentation files
  
@@ -95,10 +95,25 @@
    ${OpenIGTLink_BINARY_DIR}/UseOpenIGTLink.cmake
    ${OpenIGTLink_BINARY_DIR}/Utilities/OpenIGTLinkConfig.cmake
    DESTINATION ${OpenIGTLink_INSTALL_PACKAGE_DIR}
+@@ -287,8 +298,12 @@
+ 
+ IF(BUILD_DOCUMENTATION)
+ 
+-  ADD_SUBDIRECTORY( Documents/Doxygen )
+-               
++  CONFIGURE_FILE(${OpenIGTLink_SOURCE_DIR}/Utilities/Doxygen/doxygen.config.in
++               ${OpenIGTLink_BINARY_DIR}/Utilities/Doxygen/doxygen.config)
++
++  CONFIGURE_FILE(${OpenIGTLink_SOURCE_DIR}/Utilities/Doxygen/igtldoxygen.pl.in
++               ${OpenIGTLink_BINARY_DIR}/Utilities/Doxygen/igtldoxygen.pl)
++
+ ENDIF(BUILD_DOCUMENTATION)
+ 
+ 
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/Source/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Source/CMakeLists.txt	2013-08-18 02:17:42.285969289 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/Source/CMakeLists.txt	2013-08-18 02:18:11.498473970 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Source/CMakeLists.txt	2013-08-18 20:30:55.687411529 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/Source/CMakeLists.txt	2013-08-18 20:30:56.000000000 -0400
 @@ -170,7 +170,7 @@
  
  SET_TARGET_PROPERTIES(OpenIGTLink PROPERTIES
@@ -110,8 +125,8 @@
  #FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/Source/igtlutil/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Source/igtlutil/CMakeLists.txt	2013-08-18 02:17:42.313969773 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/Source/igtlutil/CMakeLists.txt	2013-08-18 02:18:31.790824611 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Source/igtlutil/CMakeLists.txt	2013-08-18 20:30:55.719412097 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/Source/igtlutil/CMakeLists.txt	2013-08-18 20:30:56.000000000 -0400
 @@ -74,7 +74,7 @@
  
  SET_TARGET_PROPERTIES(igtlutil PROPERTIES
@@ -123,8 +138,8 @@
  #TARGET_LINK_LIBRARIES(igtlutil
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/igtlutil/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Testing/igtlutil/CMakeLists.txt	2013-08-18 02:17:42.365970671 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/igtlutil/CMakeLists.txt	2013-08-18 02:17:42.000000000 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Testing/igtlutil/CMakeLists.txt	2013-08-18 20:30:55.771413020 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/Testing/igtlutil/CMakeLists.txt	2013-08-18 20:30:56.000000000 -0400
 @@ -1,5 +1,5 @@
 -find_package(OpenIGTLink REQUIRED)
 -include(${OpenIGTLink_USE_FILE})
@@ -135,8 +150,8 @@
  ADD_EXECUTABLE(igtl_header_test igtl_header_test.c)
 Index: openigtlink-1.9.8~git20130725+bacab6f8b1/Examples/CMakeLists.txt
 ===================================================================
---- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Examples/CMakeLists.txt	2013-08-18 02:17:42.261968874 -0400
-+++ openigtlink-1.9.8~git20130725+bacab6f8b1/Examples/CMakeLists.txt	2013-08-18 02:17:42.000000000 -0400
+--- openigtlink-1.9.8~git20130725+bacab6f8b1.orig/Examples/CMakeLists.txt	2013-08-18 20:30:55.663411103 -0400
++++ openigtlink-1.9.8~git20130725+bacab6f8b1/Examples/CMakeLists.txt	2013-08-18 20:30:56.000000000 -0400
 @@ -4,6 +4,8 @@
  # Examples
  #

Modified: packages/openigtlink/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/rules?rev=46335&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/rules	(original)
+++ packages/openigtlink/trunk/debian/rules	Mon Oct  7 00:36:08 2013
@@ -32,9 +32,10 @@
 install/openigtlink-examples::
 	dh_installexamples -popenigtlink-examples Examples/*
 
-# the first two lines have been moved from build/openigtlink-doc:: because of build errors on all architectures
+# the first two lines have been moved from target "build/openigtlink-doc::" because of build errors on all architectures
 # e.g. https://buildd.debian.org/fetch.cgi?pkg=openigtlink&arch=armel&ver=1.9.2~svn7380-1&stamp=1303034727&file=log
 install/openigtlink-doc::
+	mkdir -p $(DEB_BUILDDIR)/Documents/Doxygen
 	doxygen -u $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
 	doxygen $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
 	dh_install -popenigtlink-doc       $(DEB_BUILDDIR)/Documents/Doxygen/html   usr/share/doc/openigtlink-doc

More information about the debian-science-commits mailing list