[med-svn] r9390 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Jan 23 14:15:35 UTC 2012
Author: malat-guest
Date: 2012-01-23 14:15:34 +0000 (Mon, 23 Jan 2012)
New Revision: 9390
Added:
trunk/packages/gdcm/trunk/debian/libgdcm2.2.docs
trunk/packages/gdcm/trunk/debian/libgdcm2.2.install
trunk/packages/gdcm/trunk/debian/libgdcm2.2.lintian-overrides
trunk/packages/gdcm/trunk/debian/libvtkgdcm2.2.install
trunk/packages/gdcm/trunk/debian/patches/stableapi.patch
Removed:
trunk/packages/gdcm/trunk/debian/libgdcm2.0.docs
trunk/packages/gdcm/trunk/debian/libgdcm2.0.install
trunk/packages/gdcm/trunk/debian/libgdcm2.0.lintian-overrides
trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/control
trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.install
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/rules
Log:
Start working on 2.2
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/changelog 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,3 +1,10 @@
+gdcm (2.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream
+ - Adding DICOM Q/R tools
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 23 Jan 2012 10:24:47 +0100
+
gdcm (2.0.19-3) unstable; urgency=low
* Another attempt at fixing kFreeBSD:
Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/control 2012-01-23 14:15:34 UTC (rev 9390)
@@ -19,7 +19,7 @@
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gdcm/trunk/
Homepage: http://gdcm.sourceforge.net/
-Package: libgdcm2.0
+Package: libgdcm2.2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Grassroots DICOM runtime libraries
@@ -41,13 +41,14 @@
automatically wrapped to python/C#/Java (using swig). It supports
RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
.
- Install this package for the gdcmanon, gdcmconv, gdcmdump, gdcmgendir, gdcmimg,
- gdcminfo, gdcmpdf, gdcmraw, gdcmscanner, gdcmtar programs.
+ Install this package for the gdcmanon, gdcmconv, gdcmdiff, gdcmdump,
+ gdcmgendir, gdcmimg, gdcminfo, gdcmpdf, gdcmraw, gdcmscanner, gdcmscu, gdcmtar
+ programs.
Package: libgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libgdcm2.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.2 (= ${binary:Version}), ${misc:Depends}
Description: Grassroots DICOM development libraries and headers
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -57,11 +58,11 @@
GDCM, but are needed to build plugins or programs that link against
libgdcm.
-Package: libgdcm2.0-dbg
+Package: libgdcm2.2-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgdcm2.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.2 (= ${binary:Version}), ${misc:Depends}
Description: Grassroots DICOM runtime libraries, debug version
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -98,7 +99,7 @@
Package: python-gdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.2 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -107,7 +108,7 @@
.
Python bindings to the GDCM DICOM library.
-Package: libvtkgdcm2.0
+Package: libvtkgdcm2.2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
Description: Grassroots DICOM VTK runtime libraries
@@ -121,7 +122,7 @@
Package: libvtkgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libvtkgdcm2.0 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
+Depends: libvtkgdcm2.2 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
Description: Grassroots DICOM VTK development libraries and headers
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -134,7 +135,7 @@
Package: libvtkgdcm-cil
Section: cli-mono
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.2 (= ${binary:Version})
Suggests: libgdcm-cil
Description: Grassroots DICOM VTK CLI bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -146,7 +147,7 @@
Package: libvtkgdcm-java
Section: java
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.2 (= ${binary:Version})
Suggests: libgdcm-java
Description: Grassroots DICOM VTK Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -158,7 +159,7 @@
Package: python-vtkgdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.2 (= ${binary:Version})
Provides: ${python:Provides}
Suggests: python-gdcm
Description: Grassroots DICOM VTK/Python bindings
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,2 +1,2 @@
-usr/lib/gdcm-sharp.dll usr/lib/libgdcm-cil
-usr/lib/libgdcmsharpglue.so usr/lib/libgdcm-cil
+usr/lib/gdcm-sharp.dll usr/lib/cli/gdcm-sharp-2.2
+usr/lib/libgdcmsharpglue.so usr/lib/cli/gdcm-sharp-2.2
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-tools.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-tools.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -8,6 +8,9 @@
usr/bin/gdcmraw
usr/bin/gdcmscanner
usr/bin/gdcmtar
+usr/bin/gdcmscu
+#usr/bin/gdcmstream
+usr/bin/gdcmdiff
usr/share/man/man1/gdcmanon.1
usr/share/man/man1/gdcmconv.1
usr/share/man/man1/gdcmdump.1
@@ -18,3 +21,5 @@
usr/share/man/man1/gdcmraw.1
usr/share/man/man1/gdcmscanner.1
usr/share/man/man1/gdcmtar.1
+usr/share/man/man1/gdcmdiff.1
+usr/share/man/man1/gdcmscu.1
Modified: trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2-dev.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -6,6 +6,8 @@
usr/lib/libgdcmjpeg12.so
usr/lib/libgdcmjpeg16.so
usr/lib/libgdcmjpeg8.so
+usr/lib/libgdcmMEXD.so
+usr/lib/libsocketxx.so
usr/lib/gdcm-2.*/*.cmake
usr/include/gdcm-2.*/gdcm*
usr/include/gdcm-2.*/zip*
@@ -13,3 +15,4 @@
usr/include/gdcm-2.*/gdcmjpeg/16/*
usr/include/gdcm-2.*/gdcmjpeg/8/*
usr/include/gdcm-2.*/gdcmjpeg/j*.h
+usr/include/gdcm-2.*/socketxx
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.0.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.0.docs 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.0.docs 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1 +0,0 @@
-README.txt
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.0.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.0.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.0.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,2 +0,0 @@
-usr/lib/libgdcm*.so.*
-usr/share/gdcm-2.*/XML
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.0.lintian-overrides
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.0.lintian-overrides 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.0.lintian-overrides 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,2 +0,0 @@
-# W: libgdcm2.0: package-name-doesnt-match-sonames libgdcmCommon2.0 libgdcmDICT2.0 libgdcmDSED2.0 libgdcmIOD2.0 libgdcmMSFF2.0 libgdcmjpeg12-2.0 libgdcmjpeg16-2.0 libgdcmjpeg8-2.0
-libgdcm2.0 binary: package-name-doesnt-match-sonames
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.2.docs (from rev 9385, trunk/packages/gdcm/trunk/debian/libgdcm2.0.docs)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.2.docs (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.2.docs 2012-01-23 14:15:34 UTC (rev 9390)
@@ -0,0 +1 @@
+README.txt
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.2.install (from rev 9385, trunk/packages/gdcm/trunk/debian/libgdcm2.0.install)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.2.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.2.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -0,0 +1,3 @@
+usr/lib/libgdcm*.so.*
+usr/lib/libsocketxx*.so.*
+usr/share/gdcm-2.*/XML
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.2.lintian-overrides (from rev 9385, trunk/packages/gdcm/trunk/debian/libgdcm2.0.lintian-overrides)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.2.lintian-overrides (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.2.lintian-overrides 2012-01-23 14:15:34 UTC (rev 9390)
@@ -0,0 +1,2 @@
+# W: libgdcm2.0: package-name-doesnt-match-sonames libgdcmCommon2.0 libgdcmDICT2.0 libgdcmDSED2.0 libgdcmIOD2.0 libgdcmMSFF2.0 libgdcmjpeg12-2.0 libgdcmjpeg16-2.0 libgdcmjpeg8-2.0
+libgdcm2.0 binary: package-name-doesnt-match-sonames
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,2 +1,2 @@
-usr/lib/vtkgdcm-sharp.dll usr/lib/libvtkgdcm-cil
-usr/lib/libvtkgdcmsharpglue.so usr/lib/libvtkgdcm-cil
+usr/lib/vtkgdcm-sharp.dll usr/lib/cli/vtkgdcm-sharp-2.2
+usr/lib/libvtkgdcmsharpglue.so usr/lib/cli/vtkgdcm-sharp-2.2
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1,4 +1,6 @@
usr/bin/gdcmviewer
usr/bin/gdcm2vtk
+usr/bin/gdcm2pnm
usr/share/man/man1/gdcmviewer.1
usr/share/man/man1/gdcm2vtk.1
+usr/share/man/man1/gdcm2pnm.1
Deleted: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -1 +0,0 @@
-usr/lib/libvtkgdcm.so.*
Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.2.install (from rev 9385, trunk/packages/gdcm/trunk/debian/libvtkgdcm2.0.install)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.2.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.2.install 2012-01-23 14:15:34 UTC (rev 9390)
@@ -0,0 +1 @@
+usr/lib/libvtkgdcm.so.*
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2012-01-23 14:15:34 UTC (rev 9390)
@@ -3,3 +3,4 @@
fixgcj.patch
fixgcj2.patch
doxygen_svg.patch
+stableapi.patch
Added: trunk/packages/gdcm/trunk/debian/patches/stableapi.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/stableapi.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/stableapi.patch 2012-01-23 14:15:34 UTC (rev 9390)
@@ -0,0 +1,62 @@
+Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-01-23 11:24:31.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-01-23 11:24:33.000000000 +0100
+@@ -287,6 +287,10 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+ @ONLY)
++ CONFIGURE_FILE(
++ ${GDCM_SOURCE_DIR}/Wrapping/Csharp/key.snk
++ ${CMAKE_CURRENT_BINARY_DIR}/key.snk
++ COPYONLY)
+ IF(GDCM_USE_ACTIVIZ)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
+Index: gdcm-2.2.0/Wrapping/Csharp/AssemblyInfo.cs.in
+===================================================================
+--- gdcm-2.2.0.orig/Wrapping/Csharp/AssemblyInfo.cs.in 2012-01-23 11:24:31.000000000 +0100
++++ gdcm-2.2.0/Wrapping/Csharp/AssemblyInfo.cs.in 2012-01-23 11:24:33.000000000 +0100
+@@ -68,9 +68,9 @@
+ // The following attributes specify the key for the sign of your assembly. See the
+ // .NET Framework documentation for more information about signing.
+ // This is not required, if you don't want signing let these attributes like they're.
+-[assembly: AssemblyDelaySign(false)]
++//[assembly: AssemblyDelaySign(false)]
+ // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
+-//[assembly: AssemblyKeyFile("key.snk")]
+-[assembly: AssemblyKeyFile("")]
++[assembly: AssemblyKeyFile("key.snk")]
++//[assembly: AssemblyKeyFile("")]
+ //[assembly: AssemblyKeyName("GDCM Key")]
+-[assembly: AssemblyKeyName("")]
++//[assembly: AssemblyKeyName("")]
+Index: gdcm-2.2.0/Utilities/VTK/AssemblyInfo.cs.in
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/VTK/AssemblyInfo.cs.in 2012-01-23 11:24:31.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/AssemblyInfo.cs.in 2012-01-23 11:24:33.000000000 +0100
+@@ -68,6 +68,6 @@
+ // The following attributes specify the key for the sign of your assembly. See the
+ // .NET Framework documentation for more information about signing.
+ // This is not required, if you don't want signing let these attributes like they're.
+-[assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("")]
+-[assembly: AssemblyKeyName("")]
++//[assembly: AssemblyDelaySign(false)]
++[assembly: AssemblyKeyFile("key.snk")]
++//[assembly: AssemblyKeyName("")]
+Index: gdcm-2.2.0/Wrapping/Csharp/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Wrapping/Csharp/CMakeLists.txt 2012-01-23 11:24:40.000000000 +0100
++++ gdcm-2.2.0/Wrapping/Csharp/CMakeLists.txt 2012-01-23 11:24:46.000000000 +0100
+@@ -135,6 +135,10 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+ @ONLY)
++ CONFIGURE_FILE(
++ ${CMAKE_CURRENT_SOURCE_DIR}/key.snk
++ ${CMAKE_CURRENT_BINARY_DIR}/key.snk
++ COPYONLY)
+
+ # From Mirco Bauer on debian-cli
+ # Hm? You wrote the C# binding for gdcm? Using C# in the lib name is
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2012-01-23 11:20:26 UTC (rev 9389)
+++ trunk/packages/gdcm/trunk/debian/rules 2012-01-23 14:15:34 UTC (rev 9390)
@@ -5,6 +5,7 @@
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
export LD_LIBRARY_PATH+=:/usr/lib/jni
@@ -45,6 +46,7 @@
-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON \
-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \
-DGDCM_USE_PARAVIEW:BOOL=OFF \
+ -DGDCM_USE_ACTIVIZ:BOOL=ON \
-DGDCM_USE_VTK:BOOL=ON
override_dh_auto_configure:
@@ -59,7 +61,7 @@
mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
override_dh_strip:
- dh_strip --dbg-package=libgdcm2.0-dbg
+ dh_strip --dbg-package=libgdcm2.2-dbg
override_dh_clideps:
ifeq ($(DEB_WRAP_CSHARP), 1)
@@ -72,3 +74,6 @@
# $(MAKE) GDCMDoxygenDoc
#build-arch:
# $(MAKE)
+
+get-orig-source:
+ uscan --verbose --force-download
More information about the debian-med-commit
mailing list