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

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-04-30 10:34:25 +0000 (Fri, 30 Apr 2010)
New Revision: 4761

Added:
   trunk/packages/gdcm/trunk/debian/patches/embedded-libjpeg.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/rules
Log:
Quick for for bug 579642 + lintian error

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2010-04-29 09:27:39 UTC (rev 4760)
+++ trunk/packages/gdcm/trunk/debian/changelog	2010-04-30 10:34:25 UTC (rev 4761)
@@ -1,3 +1,10 @@
+gdcm (2.0.14-5) unstable; urgency=low
+
+  * Fix a lintian issue about embedded-libjpeg
+  * Fix CMake viral dependency propagation . Closes: #579642
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 30 Apr 2010 12:43:35 +0200
+
 gdcm (2.0.14-4) unstable; urgency=low
 
   * Fix more lintian issue about debhelper-but-no-misc-depends

Added: trunk/packages/gdcm/trunk/debian/patches/embedded-libjpeg.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/embedded-libjpeg.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/embedded-libjpeg.patch	2010-04-30 10:34:25 UTC (rev 4761)
@@ -0,0 +1,13 @@
+Index: trunk/Utilities/gdcmjpeg/jerror.h
+===================================================================
+--- trunk/Utilities/gdcmjpeg/jerror.h	(revision 6650)
++++ trunk/Utilities/gdcmjpeg/jerror.h	(working copy)
+@@ -131,7 +131,7 @@
+ JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
+ JMESSAGE(JMSG_VERSION, JVERSION)
+ JMESSAGE(JTRC_16BIT_TABLES,
+-	 "Caution: quantization tables are too coarse for baseline JPEG")
++	 "CAUTION: quantization tables are too coarse for baseline JPEG")
+ JMESSAGE(JTRC_ADOBE,
+ 	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
+ JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")


Property changes on: trunk/packages/gdcm/trunk/debian/patches/embedded-libjpeg.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	2010-04-29 09:27:39 UTC (rev 4760)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2010-04-30 10:34:25 UTC (rev 4761)
@@ -1,3 +1,4 @@
 poppler_breaks_api.patch
 cmake28_namelink.patch
 libvtk-java_jni.patch
+embedded-libjpeg.patch

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2010-04-29 09:27:39 UTC (rev 4760)
+++ trunk/packages/gdcm/trunk/debian/rules	2010-04-30 10:34:25 UTC (rev 4761)
@@ -134,22 +134,8 @@
 	# correct location of python-gdcm files
 	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
-	# 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
-	# 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
-	# correct location of libvtkgdcm-java
-	#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
+	# bug #579642 CMake puts in too many depend libraries
+	sed -i -e 's at general;/usr/lib/libcrypto.so;@@' -e 's at general;/usr/lib/libssl.so;@@' $(TARGET)/usr/lib/gdcm-2.0/GDCMLibraryDepends.cmake
 
 # 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