[med-svn] r7689 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-06 15:12:01 +0000 (Tue, 06 Sep 2011)
New Revision: 7689

Modified:
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/rules
Log:
revert doc from all. Fix issue with C#

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2011-09-06 14:03:41 UTC (rev 7688)
+++ trunk/packages/gdcm/trunk/debian/control	2011-09-06 15:12:01 UTC (rev 7689)
@@ -100,7 +100,7 @@
 Package: python-gdcm
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.0 (= ${binary:Version})
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Grassroots DICOM Python bindings
@@ -112,7 +112,7 @@
 
 Package: libvtkgdcm2.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
 Description: Grassroots DICOM VTK runtime libraries
  Grassroots DiCoM is a C++ library for DICOM medical files. It is
  automatically wrapped to python/C#/Java (using swig). It supports
@@ -161,7 +161,7 @@
 Package: python-vtkgdcm
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.0 (= ${binary:Version})
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Suggests: python-gdcm

Modified: trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch	2011-09-06 14:03:41 UTC (rev 7688)
+++ trunk/packages/gdcm/trunk/debian/patches/removedocfromall.patch	2011-09-06 15:12:01 UTC (rev 7689)
@@ -1,3 +1,5 @@
+This is a bad idea to remove doc from ALL as man page need doxygen step
+to be generated.
 Index: gdcm-2.0.18/Utilities/doxygen/CMakeLists.txt
 ===================================================================
 --- gdcm-2.0.18.orig/Utilities/doxygen/CMakeLists.txt	2011-09-06 15:47:50.000000000 +0200

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2011-09-06 14:03:41 UTC (rev 7688)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2011-09-06 15:12:01 UTC (rev 7689)
@@ -2,4 +2,4 @@
 addvtkgdcmjavaclasspath.patch
 fixsitepackage.patch
 toplevelskip.patch
-removedocfromall.patch
+#removedocfromall.patch

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2011-09-06 14:03:41 UTC (rev 7688)
+++ trunk/packages/gdcm/trunk/debian/rules	2011-09-06 15:12:01 UTC (rev 7689)
@@ -1,23 +1,24 @@
 #!/usr/bin/make -f
 
+# require to get dh_clideps
+include /usr/share/cli-common/cli.make
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with=python2
 
 # Mono is not available for all Debian architectures.
 DEB_WRAP_CSHARP = 1
 ifneq (,$(filter m68k alpha hppa mips mipsel ,$(DEB_BUILD_ARCH)))
   DEB_WRAP_CSHARP = 0
-  SKIP_ME = -Xsharp
 endif
 
-# export JAVA_HOME because upstream CMake uses it
-#export JAVA_HOME=/usr/lib/jvm/default-java
+PYVER 	 := $(shell pyversions -dv)
+PYMODDIR := /usr/lib/$(shell pyversions -r)
 
-PYVER = $(shell pyversions -dv)
-extra_flags += -DCMAKE_SKIP_RPATH=ON \
+CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 		-DGDCM_NO_EXECUTABLE_PROPERTIES=ON \
 		-DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
 		-DGDCM_BUILD_APPLICATIONS=ON \
@@ -44,10 +45,27 @@
 		-DGDCM_USE_VTK:BOOL=ON
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(extra_flags)
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
-build-indep:
-	$(MAKE) GDCMDoxygenDoc
+#override_dh_shlibdeps:
+#	# do nothing
 
-build-arch:
-	$(MAKE)
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
+
+override_dh_clideps:
+ifeq ($(DEB_WRAP_CSHARP), 1)
+	dh_clideps
+endif
+
+# i cannot set documentation to separate build target as man page
+# depends on doc, and bin tools depends on man page
+#build-indep:
+#	$(MAKE) GDCMDoxygenDoc
+#
+#build-arch:
+#	$(MAKE)