[med-svn] r21561 - in trunk/packages/camitk/trunk/debian: . patches

Tue Mar 22 17:54:55 UTC 2016

Author: promayon-guest
Date: 2016-03-22 17:54:55 +0000 (Tue, 22 Mar 2016)
New Revision: 21561

Added:
   trunk/packages/camitk/trunk/debian/patches/reproducible-build-bug-794740.diff
Removed:
   trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig
   trunk/packages/camitk/trunk/debian/patches/remove-doxygen-timestamp
Modified:
   trunk/packages/camitk/trunk/debian/changelog
   trunk/packages/camitk/trunk/debian/patches/series
   trunk/packages/camitk/trunk/debian/rules
Log:
just backing up some work done with last upstream before moving to git for next upstream


Modified: trunk/packages/camitk/trunk/debian/changelog
===================================================================

--- trunk/packages/camitk/trunk/debian/changelog	2016-03-22 17:45:03 UTC (rev 21560)
+++ trunk/packages/camitk/trunk/debian/changelog	2016-03-22 17:54:55 UTC (rev 21561)
@@ -1,3 +1,11 @@
+camitk (3.5.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * make the build reproducible (patch reproducible-build-bug-794740.diff)
+    Closes: #794740
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at imag.fr>  Sun, 13 Mar 2016 10:14:33 +0100
+
 camitk (3.4.0-2) unstable; urgency=low
 
   * Fix cmake missing path to ITKConfig (patch force-path-to-itkconfig)

Deleted: trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig	2016-03-22 17:45:03 UTC (rev 21560)
+++ trunk/packages/camitk/trunk/debian/patches/force-path-to-itkconfig	2016-03-22 17:54:55 UTC (rev 21561)
@@ -1,20 +0,0 @@
-Description: Fix cmake missing path to ITKConfig
-    the newer cmake version (>=3.1), has removed the FindITK.cmake file 
-    (insight toolkit library cmake configuration file) from its configuration
-    database. This patc just add a PATHS directive to the find_package in 
-    order to tell cmake where to look for the ITKConfig.cmake 
-Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
-Last-Update: 2015-06-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sdk/cmake/modules/macros/CamiTKExtension.cmake
-+++ b/sdk/cmake/modules/macros/CamiTKExtension.cmake
-@@ -202,7 +202,7 @@
-         # Looking for ITK
-         set(ITK_LIBRARIES "")
-         if(${EXTENSION_NAME_CMAKE}_NEEDS_ITK)
--            find_package(ITK REQUIRED)
-+            find_package(ITK REQUIRED PATHS /usr/lib/InsightToolkit)
-             if(ITK_FOUND)
-                 include(${ITK_USE_FILE})
-                 set(ITK_VERSION ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}) #ITK_VERSION is not always set

Deleted: trunk/packages/camitk/trunk/debian/patches/remove-doxygen-timestamp
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/remove-doxygen-timestamp	2016-03-22 17:45:03 UTC (rev 21560)
+++ trunk/packages/camitk/trunk/debian/patches/remove-doxygen-timestamp	2016-03-22 17:54:55 UTC (rev 21561)
@@ -1,18 +0,0 @@
-Description: Remove doxygen timestamp
-    Fixes timestamps_in_documentation_generated_by_doxygen 
-    (improve building reproducibility, patch remove-doxygen-timestamp)
-Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
-Last-Update: 2015-06-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sdk/cmake/modules/doxygen.conf.in
-+++ b/sdk/cmake/modules/doxygen.conf.in
-@@ -141,7 +141,7 @@
- HTML_COLORSTYLE_HUE    = 216
- HTML_COLORSTYLE_SAT    = 91
- HTML_COLORSTYLE_GAMMA  = 73
--HTML_TIMESTAMP         = YES
-+HTML_TIMESTAMP         = NO
- #obsolete HTML_ALIGN_MEMBERS     = YES
- HTML_DYNAMIC_SECTIONS  = YES
- GENERATE_DOCSET        = NO

Added: trunk/packages/camitk/trunk/debian/patches/reproducible-build-bug-794740.diff
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/reproducible-build-bug-794740.diff	                        (rev 0)
+++ trunk/packages/camitk/trunk/debian/patches/reproducible-build-bug-794740.diff	2016-03-22 17:54:55 UTC (rev 21561)
@@ -0,0 +1,32 @@
+Description: make the build reproducible (timestamps)
+ applying patch suggested by akira, see bug #794740
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794740
+Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
+Origin: other
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sdk/cmake/modules/CamiTKConfig.cmake.in
++++ b/sdk/cmake/modules/CamiTKConfig.cmake.in
+@@ -228,10 +228,18 @@
+ # additional unix system resources
+ if (UNIX)
+     # only possible on unix
+-    execute_process(COMMAND "date" "+%Y-%m-%d"
+-                    OUTPUT_VARIABLE CURRENT_DATE
+-                    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
++    if(DEFINED ENV{SOURCE_DATE_EPOCH})
++        # to enable reproducible builds, see debian bug #794740
++        execute_process(COMMAND "date" "-u" "+%Y-%m-%d" "--date=@$ENV{SOURCE_DATE_EPOCH}"
++                        OUTPUT_VARIABLE CURRENT_DATE
++                        OUTPUT_STRIP_TRAILING_WHITESPACE
++        )
++    else()
++        execute_process(COMMAND "date" "+%Y-%m-%d"
++                        OUTPUT_VARIABLE CURRENT_DATE
++                        OUTPUT_STRIP_TRAILING_WHITESPACE
++        )
++    endif()
+     # Application man pages (always in section 1, this is an application...)
+     set(CAMITK_APPLICATION_MAN_INSTALL_DIR "share/man/man1") 
+     # Desktop file always in share/applications (freedesktop standard)

Modified: trunk/packages/camitk/trunk/debian/patches/series
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/series	2016-03-22 17:45:03 UTC (rev 21560)
+++ trunk/packages/camitk/trunk/debian/patches/series	2016-03-22 17:54:55 UTC (rev 21561)
@@ -1,2 +1 @@
-remove-doxygen-timestamp
-force-path-to-itkconfig
+reproducible-build-bug-794740.diff

Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules	2016-03-22 17:45:03 UTC (rev 21560)
+++ trunk/packages/camitk/trunk/debian/rules	2016-03-22 17:54:55 UTC (rev 21561)
@@ -43,7 +43,6 @@
 # Notes:
 # - if you would like a more verbose camitk at run-time, 
 #   you can add -DCAMITK_LOG_LEVEL=2
-# - translation is not ready yet, so disable for now
 CMAKE_EXTRA_FLAGS = \
 	-DCMAKE_SKIP_RPATH:BOOL=TRUE \
 	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE \
@@ -52,16 +51,15 @@
 	-DCEP_IMAGING:BOOL=TRUE \
 	-DCEP_MODELING:BOOL=TRUE \
 	\
-	-DAPIDOC_SDK:BOOL=TRUE \
-	-DCAMITK_DISABLE_TRANSLATION=TRUE
+	-DAPIDOC_SDK:BOOL=TRUE 
 
 %:
 	# For debian build, do not authorize parallel build (too much RAM 
 	# needed for Imaging CEP on arch that have small memory size)
-	dh $@ --builddirectory=camitk-build
+	#dh $@ --builddirectory=camitk-build
 	# For local personal build, parallel is ok as there is enough RAM
 	# for heavy-templated Imaging CEP (uncomment for local fast rebuild)
-	#dh $@ --parallel --builddirectory=camitk-build  
+	dh $@ --parallel --builddirectory=camitk-build  
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)


