[med-svn] r21486 - in trunk/packages/elastix/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-03-07 13:32:21 +0000 (Mon, 07 Mar 2016)
New Revision: 21486

Modified:
   trunk/packages/elastix/trunk/debian/changelog
   trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch
   trunk/packages/elastix/trunk/debian/rules
Log:
Update date-time patch for reproducible builds, Closes:  #813345

Modified: trunk/packages/elastix/trunk/debian/changelog
===================================================================
--- trunk/packages/elastix/trunk/debian/changelog	2016-03-04 11:10:54 UTC (rev 21485)
+++ trunk/packages/elastix/trunk/debian/changelog	2016-03-07 13:32:21 UTC (rev 21486)
@@ -1,3 +1,9 @@
+elastix (4.8-4) UNRELEASED; urgency=medium
+
+  * Update date-time patch Closes: #813345
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 07 Mar 2016 13:30:50 +0000
+
 elastix (4.8-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch	2016-03-04 11:10:54 UTC (rev 21485)
+++ trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch	2016-03-07 13:32:21 UTC (rev 21486)
@@ -6,16 +6,18 @@
 the build should become reproducible.  
 
 
-diff -ru elastix-4.8/src/CMakeLists.txt elastix-4.8.new/src/CMakeLists.txt
---- elastix-4.8/src/CMakeLists.txt	2015-03-11 16:17:30.000000000 +0100
-+++ elastix-4.8.new/src/CMakeLists.txt	2015-10-13 13:01:16.383177679 +0200
-@@ -349,7 +349,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -349,7 +349,14 @@
  
    # Get date
    if( UNIX OR CYGWIN )
 -    exec_program( "date '+%d-%m-%Y'" OUTPUT_VARIABLE ELASTIX_DOXYGEN_DATE )
-+    if ( ${SOURCE_DATE_EPOCH} )
-+      SET(ELASTIX_DOXYGEN_DATE ${SOURCE_DATE_EPOCH})
++    if (DEFINED ENV{SOURCE_DATE_EPOCH})
++      execute_process(
++	COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%d-%m-%Y"
++	ELASTIX_DOXYGEN_DATE
++	OUTPUT_STRIP_TRAILING_WHITESPACE)
 +    else() 
 +      exec_program( "date '+%d-%m-%Y'" OUTPUT_VARIABLE ELASTIX_DOXYGEN_DATE )
 +    endif()

Modified: trunk/packages/elastix/trunk/debian/rules
===================================================================
--- trunk/packages/elastix/trunk/debian/rules	2016-03-04 11:10:54 UTC (rev 21485)
+++ trunk/packages/elastix/trunk/debian/rules	2016-03-07 13:32:21 UTC (rev 21486)
@@ -20,7 +20,6 @@
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=RELEASE \
 	-DCMAKE_SKIP_RPATH=ON \
-	-DSOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH \
 	-DELASTIX_USE_MEVISDICOMTIFF:BOOL=OFF \
 	-DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON