[med-svn] r3530 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Jun 23 12:10:29 UTC 2009
Author: malat-guest
Date: 2009-06-23 12:10:28 +0000 (Tue, 23 Jun 2009)
New Revision: 3530
Added:
trunk/packages/gdcm/trunk/debian/patches/share_man.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libgdcm-java.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/rules
Log:
update for #534297.
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-06-23 12:10:28 UTC (rev 3530)
@@ -7,6 +7,7 @@
binding to VTK/GDCM.
* New cmd line tools: gdcmanon, gdcmpdf and gdcmgendir
* Adding man pages for all tools
+ * Transition of Mono 2.0. Closes: #534297
-- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 15 Jun 2009 16:56:43 +0200
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-06-23 12:10:28 UTC (rev 3530)
@@ -1,3 +1,3 @@
-usr/lib/libgdcm-cil/gdcm-sharp.dll
-usr/lib/libgdcm-cil/gdcm-sharp.dll.config
-usr/lib/libgdcm-cil/libgdcmsharpglue.so
+usr/lib/gdcm-sharp.dll usr/lib/libgdcm-cil
+usr/lib/gdcm-sharp.dll.config usr/lib/libgdcm-cil
+usr/lib/libgdcmsharpglue.so usr/lib/libgdcm-cil
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-java.install 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-java.install 2009-06-23 12:10:28 UTC (rev 3530)
@@ -1,2 +1,2 @@
-usr/share/java/gdcm.jar
-usr/lib/jni/libgdcmjni.so
+usr/lib/gdcm.jar usr/share/java
+usr/lib/libgdcmjni.so usr/lib/jni/
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2009-06-23 12:10:28 UTC (rev 3530)
@@ -1,3 +1,3 @@
-usr/lib/libvtkgdcm-cil/vtkgdcm-sharp.dll
-usr/lib/libvtkgdcm-cil/vtkgdcm-sharp.dll.config
-usr/lib/libvtkgdcm-cil/libvtkgdcmsharpglue.so
+usr/lib/vtkgdcm-sharp.dll usr/lib/libvtkgdcm-cil
+usr/lib/vtkgdcm-sharp.dll.config usr/lib/libvtkgdcm-cil
+usr/lib/libvtkgdcmsharpglue.so usr/lib/libvtkgdcm-cil
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install 2009-06-23 12:10:28 UTC (rev 3530)
@@ -1,2 +1,2 @@
-usr/share/java/vtkgdcm.jar
-usr/lib/jni/libvtkgdcmJava.so
+usr/lib/vtkgdcm.jar usr/share/java
+usr/lib/libvtkgdcmJava.so usr/lib/jni
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2009-06-23 12:10:28 UTC (rev 3530)
@@ -1,2 +1,3 @@
gdcmjpeg-versioning.patch
vtk_jar.patch
+share_man.patch
Added: trunk/packages/gdcm/trunk/debian/patches/share_man.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/share_man.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/share_man.patch 2009-06-23 12:10:28 UTC (rev 3530)
@@ -0,0 +1,11 @@
+--- gdcm-2.0.10.orig/CMakeLists.txt (revision 5851)
++++ gdcm-2.0.10/CMakeLists.txt (working copy)
+@@ -215,7 +215,7 @@
+ ENDIF(NOT GDCM_INSTALL_DOC_DIR)
+
+ IF(NOT GDCM_INSTALL_MAN_DIR)
+- SET(GDCM_INSTALL_MAN_DIR "man")
++ SET(GDCM_INSTALL_MAN_DIR "share/man")
+ ENDIF(NOT GDCM_INSTALL_MAN_DIR)
+
+ IF(NOT GDCM_INSTALL_PACKAGE_DIR)
Property changes on: trunk/packages/gdcm/trunk/debian/patches/share_man.patch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2009-06-23 09:37:08 UTC (rev 3529)
+++ trunk/packages/gdcm/trunk/debian/rules 2009-06-23 12:10:28 UTC (rev 3530)
@@ -17,12 +17,15 @@
export DH_OPTIONS
# Debian CLI Policy §4.3 [0]
+# -include /usr/share/cli-common/cli.make
export MONO_DISABLE_SHM=1
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
CFLAGS = -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -32,11 +35,20 @@
endif
export CFLAGS
+# Mono architectures:
+# Mono is not available for all Debian architectures. It supports all except:
+# m68k, hppa and alpha.
+DEB_WRAP_CSHARP = 1
+ifneq (,$(filter m68k alpha hppa ,$(DEB_BUILD_ARCH)))
+ DEB_WRAP_CSHARP = 0
+endif
+
# set the number of build jobs
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
+# FIXME
export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-4.3-1.5.0.0/
SRC := $(CURDIR)
@@ -61,9 +73,10 @@
-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
-DGDCM_BUILD_SHARED_LIBS=ON \
-DGDCM_WRAP_PYTHON=ON \
- -DGDCM_WRAP_CSHARP=ON \
+ -DGDCM_WRAP_CSHARP=$(DEB_WRAP_CSHARP) \
-DGDCM_WRAP_JAVA=ON \
- -DMCS_EXECUTABLE:FILEPATH=/usr/bin/gmcs \
+ -DMCS_EXECUTABLE:FILEPATH=/usr/bin/csc \
+ -DDESIRED_CSHARP_COMPILER_VERSION=2 \
-DGDCM_BUILD_TESTING:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
@@ -109,21 +122,21 @@
mv $(TARGET)/usr/lib/python $(TARGET)/$(PYMODDIR)
# correct location of libgdcm-cil files
- cd $(TARGET)/usr/lib && mkdir libgdcm-cil
- cd $(TARGET)/usr/lib && mv gdcm-sharp.dll gdcm-sharp.dll.config libgdcmsharpglue.so libgdcm-cil
+ #cd $(TARGET)/usr/lib && mkdir libgdcm-cil
+ #cd $(TARGET)/usr/lib && mv gdcm-sharp.dll gdcm-sharp.dll.config libgdcmsharpglue.so libgdcm-cil
# correct location of libvtkgdcm-cil files
- cd $(TARGET)/usr/lib && mkdir libvtkgdcm-cil
- cd $(TARGET)/usr/lib && mv vtkgdcm-sharp.dll vtkgdcm-sharp.dll.config libvtkgdcmsharpglue.so libvtkgdcm-cil
+ #cd $(TARGET)/usr/lib && mkdir libvtkgdcm-cil
+ #cd $(TARGET)/usr/lib && mv vtkgdcm-sharp.dll vtkgdcm-sharp.dll.config libvtkgdcmsharpglue.so libvtkgdcm-cil
# correct location of libgdcm-java
- cd $(TARGET)/usr/share && mkdir java
- cd $(TARGET)/usr && mv lib/gdcm.jar share/java
- cd $(TARGET)/usr/lib && mkdir jni
- cd $(TARGET)/usr/lib && mv libgdcmjni.so jni
+ #cd $(TARGET)/usr/share && mkdir java
+ #cd $(TARGET)/usr && mv lib/gdcm.jar share/java
+ #cd $(TARGET)/usr/lib && mkdir jni
+ #cd $(TARGET)/usr/lib && mv libgdcmjni.so jni
# correct location of libvtkgdcm-java
- cd $(TARGET)/usr && mv lib/vtkgdcm.jar share/java
- cd $(TARGET)/usr/lib && mv libvtkgdcmJava.so jni
+ #cd $(TARGET)/usr && mv lib/vtkgdcm.jar share/java
+ #cd $(TARGET)/usr/lib && mv libvtkgdcmJava.so jni
# correct location of libvtkgdcm-java
- cd $(TARGET)/usr && mv man share
+ #cd $(TARGET)/usr && mv man share
# This single target is used to build all the packages, all at once, or
# one at a time. So keep in mind: any options passed to commands here will
@@ -153,7 +166,7 @@
dh_fixperms
# dh_perl
dh_pysupport
-# dh_makeclilibs
+ dh_makeclilibs
dh_makeshlibs -Xformats -V
dh_installdeb
dh_shlibdeps
More information about the debian-med-commit
mailing list