summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gspreemann@gmail.com>2018-05-18 19:14:40 +0200
committerGard Spreemann <gspreemann@gmail.com>2018-05-18 19:14:40 +0200
commit332e7cf49db86a9cca6931126fd78a4a96fa5725 (patch)
tree341804fa75fcfc995097183d38b4d816cf7540d3
parent99ae22a516b1227acc3dfd20df9946881442c86b (diff)
Refresh patches.
-rw-r--r--debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch4
-rw-r--r--debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch8
-rw-r--r--debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch4
-rw-r--r--debian/patches/0004-Use-system-MathJax.patch4
-rw-r--r--debian/patches/0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch4
-rw-r--r--debian/patches/no-external-doc-resources.patch12
6 files changed, 13 insertions, 23 deletions
diff --git a/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch b/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
index ba76ed11..12978cfe 100644
--- a/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
+++ b/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
@@ -1,4 +1,3 @@
-From 976e231e80eeb59c27f2389fb9ee70030c56cb44 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 11:46:06 +0200
Subject: [PATCH 1/5] Force Python 3 detection to avoid mixing 2 and 3.
@@ -31,6 +30,3 @@ index 04aed1f..f3a5b7b 100644
)
endif()
---
-2.11.0
-
diff --git a/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch b/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
index b532ab10..cd17e0f1 100644
--- a/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
+++ b/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
@@ -1,8 +1,7 @@
-From 598ac8ccc13024583e51f25559cbe7eaf059188e Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 12:05:01 +0200
-Subject: [PATCH 2/5] Disable the Sphinx test. We're not using it, as it
- requires the Sphinx bibtex module (#800358).
+Subject: [PATCH 2/5] Disable the Sphinx test. We're not using it,
+ as it requires the Sphinx bibtex module (#800358).
---
cython/CMakeLists.txt | 8 ++++----
@@ -27,6 +26,3 @@ index afca9d6..ec3cb8f 100644
endif(SPHINX_PATH AND NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
endif(CYTHON_FOUND)
---
-2.11.0
-
diff --git a/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch b/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
index 54c13639..4edf1caa 100644
--- a/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
+++ b/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
@@ -1,4 +1,3 @@
-From 9218bee33900e1e203991607e038f029a2216c3c Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 5 Feb 2018 10:15:40 +0100
Subject: [PATCH 3/5] Disable tests that use DFSG-deleted data files.
@@ -106,6 +105,3 @@ index 7762c8a..c41898b 100644
+ # "human.off" "100")
endif (NOT CGAL_VERSION VERSION_LESS 4.8.1)
---
-2.11.0
-
diff --git a/debian/patches/0004-Use-system-MathJax.patch b/debian/patches/0004-Use-system-MathJax.patch
index 98510981..c3346d1e 100644
--- a/debian/patches/0004-Use-system-MathJax.patch
+++ b/debian/patches/0004-Use-system-MathJax.patch
@@ -1,4 +1,3 @@
-From 1228db48dd680c1baf20fdd9b5b99665adf8f212 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 16:06:36 +0200
Subject: [PATCH 4/5] Use system MathJax.
@@ -20,6 +19,3 @@ index f1981e2..991645b 100644
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
---
-2.11.0
-
diff --git a/debian/patches/0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch b/debian/patches/0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch
index ace45b46..9f4c6412 100644
--- a/debian/patches/0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch
+++ b/debian/patches/0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch
@@ -1,4 +1,3 @@
-From 8beaad20e6d61f9d2253ee1b679fe2feafff9bdc Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 16 Oct 2017 13:46:22 +0200
Subject: [PATCH 5/5] Don't set runtime_library_dirs for the Python extension.
@@ -21,6 +20,3 @@ index c767e93..d00f65a 100644
)
setup(
---
-2.11.0
-
diff --git a/debian/patches/no-external-doc-resources.patch b/debian/patches/no-external-doc-resources.patch
index df35669d..735ac63b 100644
--- a/debian/patches/no-external-doc-resources.patch
+++ b/debian/patches/no-external-doc-resources.patch
@@ -1,5 +1,15 @@
+From: Gard Spreemann <gspreemann@gmail.com>
+Date: Fri, 18 May 2018 19:09:11 +0200
+Subject: no-external-doc-resources
+
Remove external resource references from Doxygen header. Later upstream
versions will include an alternative header that does the job.
+---
+ doc/common/header.html | 60 --------------------------------------------------
+ 1 file changed, 60 deletions(-)
+
+diff --git a/doc/common/header.html b/doc/common/header.html
+index 9c51438..6a02a89 100644
--- a/doc/common/header.html
+++ b/doc/common/header.html
@@ -8,8 +8,6 @@
@@ -11,7 +21,7 @@ versions will include an alternative header that does the job.
<!-- GUDHI website css for header END -->
<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="$relpath^jquery.js"></script>
-@@ -22,64 +20,6 @@
+@@ -22,64 +20,6 @@ $extrastylesheet
</head>
<body>