[med-svn] r20225 - in trunk/packages/elastix/trunk/debian: . patches
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Oct 13 13:35:29 UTC 2015
Author: gert-guest
Date: 2015-10-13 13:35:28 +0000 (Tue, 13 Oct 2015)
New Revision: 20225
Added:
trunk/packages/elastix/trunk/debian/elastix-doc.lintian-overrides
trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch
Removed:
trunk/packages/elastix/trunk/debian/patches/remove-google-analytics.patch
Modified:
trunk/packages/elastix/trunk/debian/changelog
trunk/packages/elastix/trunk/debian/patches/doxygen_cleanup.patch
trunk/packages/elastix/trunk/debian/patches/series
trunk/packages/elastix/trunk/debian/rules
Log:
Rework the Documentation creation (WIP)
* Unify the doxygen document patches
- remove Google analytics
- remove Google search
- properly link to home page (was local link)
- reintroduce jquery.js because the system version is not usable
Modified: trunk/packages/elastix/trunk/debian/changelog
===================================================================
--- trunk/packages/elastix/trunk/debian/changelog 2015-10-12 20:23:23 UTC (rev 20224)
+++ trunk/packages/elastix/trunk/debian/changelog 2015-10-13 13:35:28 UTC (rev 20225)
@@ -1,3 +1,20 @@
+elastix (4.8-2) UNRELEASED; urgency=medium
+
+ * d/rules: - Revert the change regarding jquery.js, the system
+ version is not usable
+ - Add SOURCE_DATE_EPOCH to the cmake call parameters
+ * d/ add override to elastix-doc for embedded jquery.js
+ * Add and unify patch for doxygen docu cleanup in
+ doxygen_cleanup.patch:
+ - Remove the google search and make local links point to the
+ remote elastix site like it is suppose to.
+ - Move the Google analytics patch into this patch
+ - Move the patch for PNG->SVG change into this patch
+ * Add patch doxygen_use_epoch...: Set the doxygen files data to
+ SOURCE_DATA_EPOCH if it is set with cmake.
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Tue, 13 Oct 2015 13:54:28 +0200
+
elastix (4.8-1) unstable; urgency=medium
* New upstram version
Added: trunk/packages/elastix/trunk/debian/elastix-doc.lintian-overrides
===================================================================
--- trunk/packages/elastix/trunk/debian/elastix-doc.lintian-overrides (rev 0)
+++ trunk/packages/elastix/trunk/debian/elastix-doc.lintian-overrides 2015-10-13 13:35:28 UTC (rev 20225)
@@ -0,0 +1,5 @@
+# The embedded jquery.js is generated by Doxygen and can not be replaced
+# by the one provided by libjs-jquery.
+# For a racionale please see src::Doxygen/debian/README.jquery.
+
+elastix-doc binary: embedded-javascript-library
Modified: trunk/packages/elastix/trunk/debian/patches/doxygen_cleanup.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/doxygen_cleanup.patch 2015-10-12 20:23:23 UTC (rev 20224)
+++ trunk/packages/elastix/trunk/debian/patches/doxygen_cleanup.patch 2015-10-13 13:35:28 UTC (rev 20225)
@@ -1,10 +1,21 @@
-Description: Change graphics format and remove time stamp
+Description: Cleanup of the Doxygen generated documentation
Author: Gert Wollny <gw.fossdev at gmail.com>
Forwarded: no
-Change the graphics format to svg in the class tree images to save
-space and remove the timestamp from the documentation for reproducible
-builds.
+Cleanup of the doxygen documentation:
+ [dox/doxygen/doxyfile.in]
+ * use svg instead of png for graphics to save space
+ * supress timestamps created by Doxygen
+ .
+ [doxygen/DoxygenFooter.html.in]
+ * remove Google analytics
+ * replace some local dangling links by absolute links
+ to the elastix home page
+ .
+ [dox/doxygen/DoxygenHeader.html]
+ * remove Google search
+ * replace some local dangling links by absolute links
+ to the elastix home page
diff -ru elastix-upstream/dox/doxygen/doxyfile.in elastix-upstream.new/dox/doxygen/doxyfile.in
--- elastix-upstream/dox/doxygen/doxyfile.in 2015-09-10 18:29:19.000000000 +0200
@@ -36,3 +47,63 @@
# The DOT_PATH tag can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
+Nur in elastix-upstream.new/dox/doxygen: doxyfile.in.rej.
+diff -ru elastix-upstream/dox/doxygen/DoxygenFooter.html.in elastix-upstream.new/dox/doxygen/DoxygenFooter.html.in
+--- elastix-upstream/dox/doxygen/DoxygenFooter.html.in 2015-09-10 18:29:19.000000000 +0200
++++ elastix-upstream.new/dox/doxygen/DoxygenFooter.html.in 2015-10-13 15:16:17.981269062 +0200
+@@ -7,21 +7,9 @@
+ <table width="100%">
+ <tr><td>
+ <small>Generated on @ELASTIX_DOXYGEN_DATE@ for elastix by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border=0 ></a> @ELASTIX_DOXYGEN_VERSION@ </small></td>
+-<td style="text-align:right"><a class="logo2" href="../index.php"><img src="../images/elastixLogo.gif" alt="elastix logo" height="40"></a>
++<td style="text-align:right"><a class="logo2" href="http://elastix.isi.uu.nl/index.php"><img src="http://elastix.isi.uu.nl/images/elastixLogo.gif" alt="elastix logo" height="40"></a>
+ </td></tr></table>
+
+-<!-- Start of Google Analytics -->
+-<script type="text/javascript">
+-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+-</script>
+-<script type="text/javascript">
+-var pageTracker = _gat._getTracker("UA-5189069-1");
+-pageTracker._initData();
+-pageTracker._trackPageview();
+-</script>
+-<!-- End of Google Analytics -->
+-
+ </body>
+ </html>
+
+diff -ru elastix-upstream/dox/doxygen/DoxygenHeader.html elastix-upstream.new/dox/doxygen/DoxygenHeader.html
+--- elastix-upstream/dox/doxygen/DoxygenHeader.html 2015-09-10 18:29:19.000000000 +0200
++++ elastix-upstream.new/dox/doxygen/DoxygenHeader.html 2015-10-13 15:14:09.110547084 +0200
+@@ -24,9 +24,9 @@
+ <div class="qindex">
+ <table width="100%">
+ <tr><td>
+-<a class="logo1" href="../index.php"><img src="../images/elastixLogo.gif" alt="go home" height="40"></a></td>
++<a class="logo1" href="http://elastix.isi.uu.nl/index.php"><img src="http://elastix.isi.uu.nl/images/elastixLogo.gif" alt="go home" height="40"></a></td>
+ <td style="text-align:center">
+- <a class="qindex" href="../index.php">Home</a> |
++ <a class="qindex" href="http://elastix.isi.uu.nl/index.php">Home</a> |
+ <a class="qindex" href="index.html">Main Page</a> |
+ <a class="qindex" href="modules.html">Modules</a> |
+ <a class="qindex" href="namespaces.html">Namespace List</a> |
+@@ -40,17 +40,3 @@
+ <a class="qindex" href="pages.html">Related Pages</a>
+ </td></tr></table></div>
+
+-<script>
+- (function() {
+- var cx = '014177235365818249935:2bt7h_7zxue';
+- var gcse = document.createElement('script');
+- gcse.type = 'text/javascript';
+- gcse.async = true;
+- gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+- '//www.google.com/cse/cse.js?cx=' + cx;
+- var s = document.getElementsByTagName('script')[0];
+- s.parentNode.insertBefore(gcse, s);
+- })();
+-</script>
+-<gcse:search></gcse:search>
+-
Added: 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 (rev 0)
+++ trunk/packages/elastix/trunk/debian/patches/doxygen_use_epoch_for_data_if_given.patch 2015-10-13 13:35:28 UTC (rev 20225)
@@ -0,0 +1,24 @@
+Description: Use SOURCE_DATE_EPOCH if available to set doc data
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: no
+
+By using the SOURCE_DATE_EPOCH for the actual date within the documentation
+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 @@
+
+ # 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})
++ else()
++ exec_program( "date '+%d-%m-%Y'" OUTPUT_VARIABLE ELASTIX_DOXYGEN_DATE )
++ endif()
+ endif()
+ if( WIN32 )
+ if( NOT CYGWIN )
Deleted: trunk/packages/elastix/trunk/debian/patches/remove-google-analytics.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/remove-google-analytics.patch 2015-10-12 20:23:23 UTC (rev 20224)
+++ trunk/packages/elastix/trunk/debian/patches/remove-google-analytics.patch 2015-10-13 13:35:28 UTC (rev 20225)
@@ -1,28 +0,0 @@
-Description: Remove Google adsense from the Doxygen documentation
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Forwarded: no
-
-eliminate privacy-breach-google-adsense lintian error from elastix-doc
-
-diff -ru Elastix-4.7.old/dox/doxygen/DoxygenFooter.html.in Elastix-4.7/dox/doxygen/DoxygenFooter.html.in
---- Elastix-4.7.old/dox/doxygen/DoxygenFooter.html.in 2014-03-11 11:35:24.642455256 +0100
-+++ Elastix-4.7/dox/doxygen/DoxygenFooter.html.in 2014-03-11 11:35:41.174345457 +0100
-@@ -10,18 +10,6 @@
- <td style="text-align:right"><a class="logo2" href="../index.php"><img src="../images/elastixLogo.gif" alt="elastix logo" height="40"></a>
- </td></tr></table>
-
--<!-- Start of Google Analytics -->
--<script type="text/javascript">
--var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
--document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
--</script>
--<script type="text/javascript">
--var pageTracker = _gat._getTracker("UA-5189069-1");
--pageTracker._initData();
--pageTracker._trackPageview();
--</script>
--<!-- End of Google Analytics -->
--
- </body>
- </html>
-
Modified: trunk/packages/elastix/trunk/debian/patches/series
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/series 2015-10-12 20:23:23 UTC (rev 20224)
+++ trunk/packages/elastix/trunk/debian/patches/series 2015-10-13 13:35:28 UTC (rev 20225)
@@ -1,3 +1,3 @@
build-static-ann.patch
-remove-google-analytics.patch
doxygen_cleanup.patch
+doxygen_use_epoch_for_data_if_given.patch
Modified: trunk/packages/elastix/trunk/debian/rules
===================================================================
--- trunk/packages/elastix/trunk/debian/rules 2015-10-12 20:23:23 UTC (rev 20224)
+++ trunk/packages/elastix/trunk/debian/rules 2015-10-13 13:35:28 UTC (rev 20225)
@@ -20,6 +20,7 @@
-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
@@ -38,7 +39,6 @@
help/html/index.html: help/doxyfile.out
doxygen $<
rm help/html/*.md5
- rm help/html/jquery.js
dox/manual/manual.pdf: dox/manual/manual.tex
cd dox/manual && latex manual && latex manual && dvipdf manual
More information about the debian-med-commit
mailing list