[med-svn] r10736 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon May 7 16:55:04 UTC 2012
Author: malat
Date: 2012-05-07 16:55:04 +0000 (Mon, 07 May 2012)
New Revision: 10736
Added:
trunk/packages/gdcm/trunk/debian/gdcm-doc.dirs
trunk/packages/gdcm/trunk/debian/gdcm-doc.install
Modified:
trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
trunk/packages/gdcm/trunk/debian/rules
Log:
doc cleanups
Added: trunk/packages/gdcm/trunk/debian/gdcm-doc.dirs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.dirs (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.dirs 2012-05-07 16:55:04 UTC (rev 10736)
@@ -0,0 +1 @@
+usr/share/doc/gdcm-doc
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2012-05-07 16:36:57 UTC (rev 10735)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2012-05-07 16:55:04 UTC (rev 10736)
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/gdcm-*/html/
-debian/tmp/usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
+usr/share/doc/gdcm-*/html/
+usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
Copied: trunk/packages/gdcm/trunk/debian/gdcm-doc.install (from rev 10733, trunk/packages/gdcm/trunk/debian/gdcm-doc.docs)
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.install 2012-05-07 16:55:04 UTC (rev 10736)
@@ -0,0 +1,2 @@
+usr/share/doc/gdcm-*/html
+usr/share/doc/gdcm-*/gdcm-2.2.0.pdf
Modified: trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch 2012-05-07 16:36:57 UTC (rev 10735)
+++ trunk/packages/gdcm/trunk/debian/patches/csharpfixes.patch 2012-05-07 16:55:04 UTC (rev 10736)
@@ -159,7 +159,7 @@
+ # do not set the version on the Python module:
SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME})
-+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARIES})
++ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
ENDFOREACH(c)
Modified: trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch 2012-05-07 16:36:57 UTC (rev 10735)
+++ trunk/packages/gdcm/trunk/debian/patches/fixdoxygeninstall.patch 2012-05-07 16:55:04 UTC (rev 10736)
@@ -26,9 +26,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt
-+++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt
-@@ -186,6 +186,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/latex/Makefi
+Index: gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/doxygen/CMakeLists.txt 2012-05-07 16:49:21.791034990 +0000
++++ gdcm-2.2.0/Utilities/doxygen/CMakeLists.txt 2012-05-07 16:49:24.535034891 +0000
+@@ -186,6 +186,14 @@
${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmviewer.1
DESTINATION ${GDCM_INSTALL_MAN_DIR}/man1 COMPONENT Development
)
@@ -43,3 +45,33 @@
# http://lists.debian.org/debian-italian/2006/12/msg00878.html
# man2txt : man man | col -b | less
+Index: gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/doxygen/vtk/CMakeLists.txt 2012-05-07 16:49:21.791034990 +0000
++++ gdcm-2.2.0/Utilities/doxygen/vtk/CMakeLists.txt 2012-05-07 16:49:24.535034891 +0000
+@@ -103,7 +103,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
+
+ ADD_CUSTOM_TARGET(${DOXYGEN_PROJECT_NAME}DoxygenDoc
+- #ALL
++ ALL
+ ${BASH}
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
+
+Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-05-07 16:49:17.563035143 +0000
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-05-07 16:49:24.535034891 +0000
+@@ -699,10 +699,10 @@
+ ADD_LIBRARY(${VTKGDCM_NAME}PythonD ${vtkgdcmPYTHON_SRCS})
+ # this is a library set the version:
+ # do not set the version on the Python module:
+- #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
++ SET_TARGET_PROPERTIES(${VTKGDCM_NAME}PythonD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+ ADD_LIBRARY(${VTKGDCM_NAME}Python MODULE ${VTKGDCM_NAME}PythonInit.cxx)
+ # do not set the version on the Python module:
+- SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
++ #SET_TARGET_PROPERTIES(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
+ FOREACH(c ${vtkgdcm_LIBS} vtkFiltering)
+ TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2012-05-07 16:36:57 UTC (rev 10735)
+++ trunk/packages/gdcm/trunk/debian/rules 2012-05-07 16:55:04 UTC (rev 10736)
@@ -1,14 +1,12 @@
#!/usr/bin/make -f
# export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-export LDFLAGS=-Wl,--as-needed
# to please dpkg-shlibdeps and java private libs in /usr/lib/jni
LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni
-# warning: couldn't find library ../../bin/libvtkgdcmPythonD.so
-#LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib
# PHP5 extensions dir:
PHP_EX=$(shell /usr/bin/php-config5 --extension-dir)
@@ -49,6 +47,7 @@
-DGDCM_BUILD_APPLICATIONS=ON \
-DGDCM_DOCUMENTATION:BOOL=ON \
-DGDCM_VTK_DOCUMENTATION:BOOL=$(BUILDDOC) \
+ -DDOCUMENTATION_DOWNLOAD_VTK_TAGFILE:BOOL=OFF \
-DGDCM_PDF_DOCUMENTATION:BOOL=$(BUILDDOC) \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
@@ -111,7 +110,8 @@
pkg_doc = gdcm-doc
pkg_exa = gdcm-examples
-override_dh_install-indep:
+override_dh_compress:
+ # do not compress .map file for doxygen graph
dh_compress -X.map -X.pdf
# TODO I cannot set documentation to separate build target as man page
More information about the debian-med-commit
mailing list