[med-svn] r4331 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Thu Nov 12 17:21:56 UTC 2009
Author: malat-guest
Date: 2009-11-12 17:21:56 +0000 (Thu, 12 Nov 2009)
New Revision: 4331
Added:
trunk/packages/gdcm/trunk/debian/patches/poppler_breaks_api.patch
Removed:
trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch
trunk/packages/gdcm/trunk/debian/patches/lintian_dots.patch
trunk/packages/gdcm/trunk/debian/patches/soname.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/rules
Log:
prepare for next upload
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,3 +1,9 @@
+gdcm (2.0.14-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 12 Nov 2009 16:38:52 +0100
+
gdcm (2.0.13-2) unstable; urgency=low
* Fix SONAME for gdcmDict / gdcmcharls. Closes: #553410
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,3 +1,2 @@
-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
+usr/bin/gdcm-sharp.dll usr/lib/libgdcm-cil
+usr/bin/libgdcmsharpglue.so usr/lib/libgdcm-cil
Deleted: trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm_charls_jpeg.patch 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,62 +0,0 @@
-svn rev 6151
-svn rev 6152
-
---- trunk/Utilities/gdcmcharls/CMakeLists.txt (revision 6145)
-+++ trunk/Utilities/gdcmcharls/CMakeLists.txt (working copy)
-@@ -56,14 +56,13 @@
- RUNTIME DESTINATION ${CHARLS_INSTALL_BIN_DIR} COMPONENT Applications
- LIBRARY DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Libraries
- ARCHIVE DESTINATION ${CHARLS_INSTALL_LIB_DIR} COMPONENT Development
-- ${CPACK_NAMELINK_TYPE}
- )
- ENDIF(NOT CHARLS_INSTALL_NO_LIBRARIES)
-
- IF(NOT CHARLS_INSTALL_NO_DEVELOPMENT)
- FILE(GLOB header_files "*.h")
- INSTALL(FILES ${header_files}
-- DESTINATION ${CHARLS_INSTALL_INCLUDE_DIR} COMPONENT Headers
-+ DESTINATION ${CHARLS_INSTALL_INCLUDE_DIR}/gdcmcharls COMPONENT Headers
- )
- ENDIF(NOT CHARLS_INSTALL_NO_DEVELOPMENT)
- #add_executable(charlstest test/test.cpp test/time.cpp)
-
---- trunk/Utilities/gdcmjpeg/12/CMakeLists.txt (revision 6145)
-+++ trunk/Utilities/gdcmjpeg/12/CMakeLists.txt (working copy)
-@@ -19,6 +19,6 @@
- IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
- FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
- INSTALL(FILES ${header_files}
-- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/12 COMPONENT Development
-+ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/12 COMPONENT Development
- )
- ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
---- trunk/Utilities/gdcmjpeg/16/CMakeLists.txt (revision 6145)
-+++ trunk/Utilities/gdcmjpeg/16/CMakeLists.txt (working copy)
-@@ -19,6 +19,6 @@
- IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
- FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
- INSTALL(FILES ${header_files}
-- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/16 COMPONENT Development
-+ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/16 COMPONENT Development
- )
- ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
---- trunk/Utilities/gdcmjpeg/8/CMakeLists.txt (revision 6145)
-+++ trunk/Utilities/gdcmjpeg/8/CMakeLists.txt (working copy)
-@@ -19,6 +19,6 @@
- IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
- FILE(GLOB header_files "${CMAKE_CURRENT_BINARY_DIR}/*.h")
- INSTALL(FILES ${header_files}
-- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/8 COMPONENT Development
-+ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg/8 COMPONENT Development
- )
- ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
---- trunk/Utilities/gdcmjpeg/CMakeLists.txt (revision 6145)
-+++ trunk/Utilities/gdcmjpeg/CMakeLists.txt (working copy)
-@@ -166,6 +166,6 @@
- IF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
- FILE(GLOB header_files "*.h")
- INSTALL(FILES ${header_files}
-- DESTINATION ${JPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
-+ DESTINATION ${JPEG_INSTALL_INCLUDE_DIR}/gdcmjpeg COMPONENT Headers
- )
- ENDIF(NOT JPEG_INSTALL_NO_DEVELOPMENT)
Deleted: trunk/packages/gdcm/trunk/debian/patches/lintian_dots.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/lintian_dots.patch 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/patches/lintian_dots.patch 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,89 +0,0 @@
-Apply svn rev 6193
-Fix manpage-has-errors-from-man from lintian
-
-Index: trunk/Utilities/doxygen/man/gdcmconv.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmconv.man (revision 6192)
-+++ trunk/Utilities/doxygen/man/gdcmconv.man (working copy)
-@@ -128,7 +128,7 @@
- \li convert dual syntax file: implicit/explicit,
- \li convert Philips dual Little Endian/Big Endian file,
- \li convert GDCM 1.2.0 broken UN-2-bytes fields,
--\li ...
-+\li \&...
- \li All other broken files listed in the supported section.
-
- When no option other is used, only the dataset is inspected. So encapsulated Pixel Data, for instance, is not inspected for well known bugs.
-@@ -254,6 +254,7 @@
- When talking about lossless conversion, there is an ambiguity that need to be understood. To achieve higher compression ratio, the RGB color space is usually not used, in favor of a YBR one. Changing from one color space to the other is (bit level) not lossless.
-
- For more detail, see what are the true lossless transformations as described:
-+
- http://sourceforge.net/apps/mediawiki/gdcm/index.php?title=Color_Space_Transformations
-
- \section quality_control Quality Control
-Index: trunk/Utilities/doxygen/man/gdcmdump.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmdump.man (revision 6192)
-+++ trunk/Utilities/doxygen/man/gdcmdump.man (working copy)
-@@ -78,7 +78,7 @@
- \&...
- (0008,0000) ?? (UL) 434 # 4,1 Generic Group Length
- (0008,0005) ?? (CS) [ISO_IR 100] # 10,1-n Specific Character Set
--(0008,0008) ?? (CS) [ORIGINAL\PRIMARY\SINGLE PLANE ] # 30,2-n Image Type
-+(0008,0008) ?? (CS) [ORIGINAL\\PRIMARY\\SINGLE PLANE ] # 30,2-n Image Type
- (0008,0016) ?? (UI) [1.2.840.10008.5.1.4.1.1.12.1] # 28,1 SOP Class UID
- (0008,0018) ?? (UI) [1.2.840.113619.2.16.1.0.906539207.1.24207] # 42,1 SOP Instance UID
- (0008,0020) ?? (DA) [19980923] # 8,1 Study Date
-Index: trunk/Utilities/doxygen/man/gdcmtar.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmtar.man (revision 6192)
-+++ trunk/Utilities/doxygen/man/gdcmtar.man (working copy)
-@@ -61,7 +61,7 @@
- TransferSyntax is 1.2.840.10008.1.2.1 [Explicit VR Little Endian]
- NumberOfDimensions: 2
- Dimensions: (384,384,1)
--...
-+\&...
- \endverbatim
-
- \verbatim
-Index: trunk/Utilities/doxygen/man/gdcmraw.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmraw.man (revision 6192)
-+++ trunk/Utilities/doxygen/man/gdcmraw.man (working copy)
-@@ -162,7 +162,7 @@
- \endverbatim
-
- \verbatim
--...
-+\&...
- (7fe0,0010) OB # u/l,1 Pixel Data
- (fffe,e000) ?? 00\\00\\00\\00\\6b\\38\\01\\00\\10\\77\\02\\00\\37\\b6\\03\\00\\a7\\f4\\04\\00 # 20,1 Item
- (fffe,e000) ?? ff\\d8\\ff\\c3\\00\\0b\\08\\02\\00\\02\\00\\01\\00\\11\\00\\ff\\c4\\00\\1b\\00\\01\\01\\01\\01\\01\\01\\01\\01\\00\\00\\00\\00 # 79970,1 Item
-Index: trunk/Utilities/doxygen/man/gdcmtar.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmtar.man (revision 6193)
-+++ trunk/Utilities/doxygen/man/gdcmtar.man (working copy)
-@@ -113,7 +113,7 @@
- TransferSyntax is 1.2.840.10008.1.2.1 [Explicit VR Little Endian]
- NumberOfDimensions: 2
- Dimensions: (64,64,1)
--...
-+\&...
- \endverbatim
-
-
-Index: trunk/Utilities/doxygen/man/gdcmraw.man
-===================================================================
---- trunk/Utilities/doxygen/man/gdcmraw.man (revision 6193)
-+++ trunk/Utilities/doxygen/man/gdcmraw.man (working copy)
-@@ -91,7 +91,7 @@
- \endverbatim
-
- \verbatim
--...
-+\&...
- (7fe0,0010) OB # u/l,1 Pixel Data
- (fffe,e000) ?? [] # 0,1 Item
- (fffe,e000) ?? ff\\4f\\ff\\51\\00\\29\\00\\00\\00\\00\\02\\00\\00\\00\\02\\00\\00\\00\\00\\00\\00\\00\\00\\00\\00\\00\\02\\00\\00\\00\\02\\00 # 65536,1 Item
Added: trunk/packages/gdcm/trunk/debian/patches/poppler_breaks_api.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/poppler_breaks_api.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/poppler_breaks_api.patch 2009-11-12 17:21:56 UTC (rev 4331)
@@ -0,0 +1,67 @@
+Fix poppler in unstable
+
+--- trunk/Applications/Cxx/gdcminfo.cxx (revision 6252)
++++ trunk/Applications/Cxx/gdcminfo.cxx (revision 6255)
+@@ -442,7 +442,11 @@
+ std::string moddate;
+
+ UnicodeMap *uMap;
++#ifdef LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM
++ globalParams = new GlobalParams(0);
++#else
+ globalParams = new GlobalParams();
++#endif
+ uMap = globalParams->getTextEncoding();
+
+ Object info;
+@@ -477,7 +481,11 @@
+ const char *optimized = doc->isLinearized() ? "yes" : "no";
+
+ // print PDF version
++#ifdef LIBPOPPLER_PDFDOC_HAS_PDFVERSION
+ float pdfversion = doc->getPDFVersion();
++#else
++ float pdfversion = doc->getPDFMajorVersion() + 0.1 * doc->getPDFMinorVersion();
++#endif
+
+
+ // print page count
+--- trunk/Applications/Cxx/CMakeLists.txt (revision 6252)
++++ trunk/Applications/Cxx/CMakeLists.txt (revision 6255)
+@@ -43,6 +43,9 @@
+ gdcmtar
+ gdcminfo
+ )
++# poppler people have the worse API backward compatibility I know of.
++# there is absolutely no way to check the version of poppler
++# they change the API during a minor change of the version
+ IF(GDCM_USE_SYSTEM_POPPLER)
+ INCLUDE(CheckCXXSourceCompiles)
+ SET(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIRS})
+@@ -50,11 +53,24 @@
+ CHECK_CXX_SOURCE_COMPILES(
+ "\#include <poppler/GlobalParams.h>\nint main() { globalParams = new GlobalParams(0); return 0;}"
+ LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
++ set(libpoppler_flags)
+ IF(LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
++ list(APPEND libpoppler_flags -DLIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
++ ENDIF(LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
++ CHECK_CXX_SOURCE_COMPILES(
++ "\#include <poppler/PDFDoc.h>\nint main() { PDFDoc d((GooString*)NULL,(GooString*)NULL,(GooString*)NULL); d.getPDFVersion(); return 0;}"
++ LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
++ IF(LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
++ list(APPEND libpoppler_flags -DLIBPOPPLER_PDFDOC_HAS_PDFVERSION)
++ ENDIF(LIBPOPPLER_PDFDOC_HAS_PDFVERSION)
++ IF(libpoppler_flags)
+ SET_SOURCE_FILES_PROPERTIES(
++ ${CMAKE_CURRENT_SOURCE_DIR}/gdcminfo.cxx
++ PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
++ SET_SOURCE_FILES_PROPERTIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gdcmpdf.cxx
+- PROPERTIES COMPILE_FLAGS -DLIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
+- ENDIF(LIBPOPPLER_GLOBALPARAMS_CSTOR_HAS_PARAM)
++ PROPERTIES COMPILE_FLAGS ${libpoppler_flags})
++ endif(libpoppler_flags)
+ INCLUDE_DIRECTORIES(${POPPLER_INCLUDE_DIRS})
+ SET(GDCM_EXECUTABLE_NAME
+ ${GDCM_EXECUTABLE_NAME}
Property changes on: trunk/packages/gdcm/trunk/debian/patches/poppler_breaks_api.patch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,3 +1 @@
-gdcm_charls_jpeg.patch
-soname.patch
-lintian_dots.patch
+poppler_breaks_api.patch
Deleted: trunk/packages/gdcm/trunk/debian/patches/soname.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/soname.patch 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/patches/soname.patch 2009-11-12 17:21:56 UTC (rev 4331)
@@ -1,27 +0,0 @@
-revision 6186
-
-Index: trunk/Source/DataDictionary/CMakeLists.txt
-===================================================================
---- trunk/Source/DataDictionary/CMakeLists.txt (revision 6185)
-+++ trunk/Source/DataDictionary/CMakeLists.txt (working copy)
-@@ -96,6 +96,7 @@
-
- #MESSAGE( ${DICT_SRCS} )
- ADD_LIBRARY(gdcmDICT ${DICT_SRCS})
-+SET_TARGET_PROPERTIES(gdcmDICT PROPERTIES ${GDCM_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
- TARGET_LINK_LIBRARIES(gdcmDICT gdcmDSED gdcmIOD)
- #SET_TARGET_PROPERTIES(gdcmDICT PROPERTIES ${GDCM_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "gdcmDICT;gdcmIOD")
- IF(NOT GDCM_INSTALL_NO_LIBRARIES)
-Index: trunk/Utilities/gdcmcharls/CMakeLists.txt
-===================================================================
---- trunk/Utilities/gdcmcharls/CMakeLists.txt (revision 6185)
-+++ trunk/Utilities/gdcmcharls/CMakeLists.txt (working copy)
-@@ -49,6 +49,7 @@
- add_library(${CHARLS_LIBRARY_NAME} header.cpp interface.cpp jpegls.cpp
- stdafx.cpp
- )
-+SET_TARGET_PROPERTIES(${CHARLS_LIBRARY_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
-
- # Install library
- IF(NOT CHARLS_INSTALL_NO_LIBRARIES)
-
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2009-11-11 17:50:47 UTC (rev 4330)
+++ trunk/packages/gdcm/trunk/debian/rules 2009-11-12 17:21:56 UTC (rev 4331)
@@ -12,7 +12,7 @@
VER_MAJOR = 2
VER_MINOR = 0
-VER_PATCH = 13
+VER_PATCH = 14
VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
SOVERSION = $(VER_MAJOR).$(VER_MINOR)
@@ -201,8 +201,6 @@
binary-%: install
make -f $(SRC)/debian/rules binary-common DH_OPTIONS=-p$*
-#get-orig-source:
-# uscan --force-download --verbose
$(UPSTREAM_SRC).tar.gz:
wget http://voxel.dl.sourceforge.net/sourceforge/gdcm/$@
@@ -211,6 +209,5 @@
GZIP=-9 tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
rm -rf $(DEBIAN_SRC_DIR)
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary-common binary install install-common
More information about the debian-med-commit
mailing list