[clblas] 06/07: d/p: break doxygen patch down to more specific patches

Tue Aug 4 15:35:44 UTC 2015

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit bcc133946d96889292f08363fd99c8bcc36f8c5b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Aug 4 15:40:39 2015 +0100

    d/p: break doxygen patch down to more specific patches
---
 debian/changelog                          |  6 +++++-
 debian/patches/fix-docs-output.patch      | 18 ++++++++++++++++
 debian/patches/fix-doxygen-settings.patch | 34 -------------------------------
 debian/patches/reproducible-build.patch   | 17 ++++++++++++++++
 debian/patches/series                     |  1 -
 debian/patches/use-system-mathjax.patch   | 16 +++++++++++++++
 6 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af02c79..cc7c1b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 clblas (2.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * d/patches: add patch fixing missing linkage with pthread. 
+  * d/patches: add patch fixing missing linkage with pthread.
+  * Break fix-doxygen-settings.patch down to more specific patches:
+    - fix-docs-output.patch,
+    - use-system-mathjax.patch,
+    - reproducible-build.patch.
 
  -- Ghislain Antony Vaillant <ghisvail at gmail.com>  Thu, 30 Jul 2015 17:29:37 +0100
 
diff --git a/debian/patches/fix-docs-output.patch b/debian/patches/fix-docs-output.patch
new file mode 100644
index 0000000..775a669
--- /dev/null
+++ b/debian/patches/fix-docs-output.patch
@@ -0,0 +1,18 @@
+Description: fix output directory for documentation
+ Use default doxygen directory, i.e. under docs/html, rather than the 
+ inappropriate path set by upstream.
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com> 
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/clBLAS.doxy
++++ b/doc/clBLAS.doxy
+@@ -1223,7 +1223,7 @@
+ # installing MathJax.  However, it is strongly recommended to install a local 
+ # copy of MathJax from http://www.mathjax.org before deployment.
+ 
+-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+ 
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
+ # names that should be enabled during MathJax rendering.
diff --git a/debian/patches/fix-doxygen-settings.patch b/debian/patches/fix-doxygen-settings.patch
deleted file mode 100644
index 11196ea..0000000
--- a/debian/patches/fix-doxygen-settings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: fix Doxygen documentation settings for Debian
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/doc/clBLAS.doxy
-+++ b/doc/clBLAS.doxy
-@@ -52,7 +52,7 @@
- # If a relative path is entered, it will be relative to the location 
- # where doxygen was started. If left blank the current directory will be used.
- 
--OUTPUT_DIRECTORY       = ..\..\bin\clBLAS.doxy
-+OUTPUT_DIRECTORY       = 
- 
- # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
- # 4096 sub-directories (in 2 levels) under the output directory of each output 
-@@ -974,7 +974,7 @@
- # page will contain the date and time when the page was generated. Setting 
- # this to NO can help when comparing the output of multiple runs.
- 
--HTML_TIMESTAMP         = YES
-+HTML_TIMESTAMP         = NO
- 
- # 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 
-@@ -1223,7 +1223,7 @@
- # installing MathJax.  However, it is strongly recommended to install a local 
- # copy of MathJax from http://www.mathjax.org before deployment.
- 
--MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-+MATHJAX_RELPATH        = /usr/share/javascript/mathjax
- 
- # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
- # names that should be enabled during MathJax rendering.
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 0000000..9d7c2b7
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,17 @@
+Description: make package build reproducible
+ By disabling the HTML timestamp setting in Doxygen.
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/clBLAS.doxy
++++ b/doc/clBLAS.doxy
+@@ -974,7 +974,7 @@
+ # page will contain the date and time when the page was generated. Setting 
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # 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 
diff --git a/debian/patches/series b/debian/patches/series
index 88e1bbb..6f5a3e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix-doxygen-settings.patch
 debian-enable-multiarch.patch
 disable-multilib-cflags.patch
 fix-pthread-linkage.patch
diff --git a/debian/patches/use-system-mathjax.patch b/debian/patches/use-system-mathjax.patch
new file mode 100644
index 0000000..31abb89
--- /dev/null
+++ b/debian/patches/use-system-mathjax.patch
@@ -0,0 +1,16 @@
+Description: use system mathjax instead of remote
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/clBLAS.doxy
++++ b/doc/clBLAS.doxy
+@@ -52,7 +52,7 @@
+ # If a relative path is entered, it will be relative to the location 
+ # where doxygen was started. If left blank the current directory will be used.
+ 
+-OUTPUT_DIRECTORY       = ..\..\bin\clBLAS.doxy
++OUTPUT_DIRECTORY       = 
+ 
+ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+ # 4096 sub-directories (in 2 levels) under the output directory of each output 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git

