[med-svn] r17388 - in trunk/packages/dcmtk/branches/experimental/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-07-01 13:31:54 +0000 (Tue, 01 Jul 2014)
New Revision: 17388

Added:
   trunk/packages/dcmtk/branches/experimental/debian/patches/sparc_align.patch
Modified:
   trunk/packages/dcmtk/branches/experimental/debian/changelog
   trunk/packages/dcmtk/branches/experimental/debian/patches/series
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
new upload

Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog	2014-07-01 07:15:40 UTC (rev 17387)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog	2014-07-01 13:31:54 UTC (rev 17388)
@@ -1,3 +1,10 @@
+dcmtk (3.6.1~20140617-2) experimental; urgency=low
+
+  * Fix SIGSEGV on sparc
+  * Fix removal of md5 files on buildds
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 01 Jul 2014 11:15:54 +0200
+
 dcmtk (3.6.1~20140617-1) experimental; urgency=low
 
   * New snapshot. Use ABI=4 as per upstream

Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series	2014-07-01 07:15:40 UTC (rev 17387)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series	2014-07-01 13:31:54 UTC (rev 17388)
@@ -8,3 +8,4 @@
 #spelling.patch
 #ofstd_markup_6.patch
 #warn_unused_result.patch
+sparc_align.patch

Added: trunk/packages/dcmtk/branches/experimental/debian/patches/sparc_align.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/sparc_align.patch	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/sparc_align.patch	2014-07-01 13:31:54 UTC (rev 17388)
@@ -0,0 +1,18 @@
+Description: Fix a SIGSEGV on sparc due to alignement issue
+Author: Jan Schlamelcher <dicom at offis.de>
+Origin: upstream
+Reviewed-By: Mathieu Malaterre <malat at debian.org>
+
+--- dcmtk-3.6.1~20140617.orig/ofstd/include/dcmtk/ofstd/ofoption.h
++++ dcmtk-3.6.1~20140617/ofstd/include/dcmtk/ofstd/ofoption.h
+@@ -770,8 +770,8 @@ private:
+     // optimize alignment and so on. Mutable, since the content
+     // itself can be modified even if it cant be (re-)assigned.
+     void* content() const { return m_Content; }
+-    Uint8& state() const { return m_Content[sizeof(T)]; }
+-    mutable Uint8 m_Content[sizeof(T)+1];
++    Uint64& state() const { return m_Content[sizeof(T)]; }
++    mutable Uint64 m_Content[sizeof(T)+1];
+ #endif // NOT DOXYGEN
+ };
+ 

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2014-07-01 07:15:40 UTC (rev 17387)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2014-07-01 13:31:54 UTC (rev 17388)
@@ -66,11 +66,11 @@
 	rm debian/tmp/usr/share/man/man1/_*.1
 
 override_dh_installdocs:
+	# remove md5:
+	find ./debian/tmp/usr/share/doc/dcmtk/html/ -name *.md5 -delete
 	dh_installdocs -pdcmtk-doc
 	# do the doxygen / jquery fix:
 	dh_link -pdcmtk-doc usr/share/javascript/jquery/jquery.js usr/share/doc/dcmtk-doc/html/jquery.js
-	# remove md5:
-	rm ./debian/tmp/usr/share/doc/dcmtk/html/*.md5
 
 override_dh_install-arch:
 	dh_install --list-missing