[med-svn] [Git][med-team/elastix][master] 2 commits: Unapply patches
Gert Wollny
gitlab at salsa.debian.org
Sun Dec 23 18:04:48 GMT 2018
Gert Wollny pushed to branch master at Debian Med / elastix
Commits:
bfbf7b2c by Gert Wollny at 2018-12-23T18:00:06Z
Unapply patches
- - - - -
4abcce59 by Gert Wollny at 2018-12-23T18:03:44Z
d/p: Re-add patch to make libANN static
- - - - -
5 changed files:
- debian/patches/series
- + debian/patches/static_libann.patch
- dox/doxygen/DoxygenFooter.html.in
- dox/doxygen/DoxygenHeader.html
- dox/doxygen/doxyfile.in
Changes:
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
doxygen_cleanup.patch
+static_libann.patch
=====================================
debian/patches/static_libann.patch
=====================================
@@ -0,0 +1,22 @@
+--- a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/CMakeLists.txt
++++ b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/ann_1.1/CMakeLists.txt
+@@ -40,18 +40,4 @@
+ )
+
+ # Create the ANNlib library
+-add_library( ANNlib SHARED ${ANN_SRCS} )
+-
+-# Necessary when building a library, because in windows dll_export
+-# is needed for creating the dll, but dll_import for using it in a program.
+-set_target_properties( ANNlib PROPERTIES DEFINE_SYMBOL DLL_EXPORTS )
+-
+-# Group in IDE's like Visual Studio
+-set_property( TARGET ANNlib PROPERTY FOLDER "libraries" )
+-
+-# Install
+-install( TARGETS ANNlib
+- ARCHIVE DESTINATION ${ELASTIX_ARCHIVE_DIR}
+- LIBRARY DESTINATION ${ELASTIX_LIBRARY_DIR}
+- RUNTIME DESTINATION ${ELASTIX_RUNTIME_DIR}
+- COMPONENT RuntimeLibraries )
++add_library( ANNlib STATIC ${ANN_SRCS} )
=====================================
dox/doxygen/DoxygenFooter.html.in
=====================================
@@ -7,9 +7,21 @@
<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="http://elastix.isi.uu.nl/index.php"><img src="http://elastix.isi.uu.nl/images/elastixLogo.gif" alt="elastix logo" height="40"></a>
+<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>
=====================================
dox/doxygen/DoxygenHeader.html
=====================================
@@ -24,9 +24,9 @@ $extrastylesheet
<div class="qindex">
<table width="100%">
<tr><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>
+<a class="logo1" href="../index.php"><img src="../images/elastixLogo.gif" alt="go home" height="40"></a></td>
<td style="text-align:center">
- <a class="qindex" href="http://elastix.isi.uu.nl/index.php">Home</a> |
+ <a class="qindex" href="../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,3 +40,17 @@ $extrastylesheet
<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>
+
=====================================
dox/doxygen/doxyfile.in
=====================================
@@ -1189,7 +1189,7 @@ HTML_COLORSTYLE_GAMMA = 80
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_TIMESTAMP = NO
+HTML_TIMESTAMP = YES
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
@@ -1197,7 +1197,7 @@ HTML_TIMESTAMP = NO
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_DYNAMIC_SECTIONS = YES
+HTML_DYNAMIC_SECTIONS = NO
# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
# shown in the various tree structured indices initially; the user can expand
@@ -1540,7 +1540,7 @@ MATHJAX_CODEFILE =
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
-SEARCHENGINE = YES
+SEARCHENGINE = NO
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
# implemented using a web server instead of a web client using Javascript. There
@@ -2351,7 +2351,7 @@ DIRECTORY_GRAPH = YES
# The default value is: png.
# This tag requires that the tag HAVE_DOT is set to YES.
-DOT_IMAGE_FORMAT = svg
+DOT_IMAGE_FORMAT = png
# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
# enable generation of interactive SVG images that allow zooming and panning.
@@ -2363,7 +2363,7 @@ DOT_IMAGE_FORMAT = svg
# The default value is: NO.
# This tag requires that the tag HAVE_DOT is set to YES.
-INTERACTIVE_SVG = YES
+INTERACTIVE_SVG = NO
# 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.
View it on GitLab: https://salsa.debian.org/med-team/elastix/compare/51c28ee2934320f13a7b81aab900f20ccb48610b...4abcce59a815da9074d514adbb9356b3c2388ac5
--
View it on GitLab: https://salsa.debian.org/med-team/elastix/compare/51c28ee2934320f13a7b81aab900f20ccb48610b...4abcce59a815da9074d514adbb9356b3c2388ac5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181223/9dece19f/attachment-0001.html>
More information about the debian-med-commit
mailing list