[arrayfire] 05/13: Refresh patch queue: - Drop bugfix-in-assign.patch, applied upstream. - Rename remaining patches to their corresponding commit message, following switch to gbp-pq.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:57:04 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 arrayfire.

commit e699af342ccbbbade927d62fc8b8383e50f4b2a9
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Nov 17 11:26:55 2015 +0000

    Refresh patch queue:
      - Drop bugfix-in-assign.patch, applied upstream.
      - Rename remaining patches to their corresponding commit message, following
        switch to gbp-pq.
---
 ...tch => Disable-privacy-breaching-settings.patch} | 13 +++++++++----
 debian/patches/Fix-CBLAS-detection.patch            | 21 +++++++++++++++++++++
 ...ygen-settings.patch => Use-system-mathjax.patch} | 15 ++++++++++-----
 debian/patches/bugfix-in-assign.patch               | 20 --------------------
 debian/patches/fix-cblas-detection.patch            | 20 --------------------
 debian/patches/series                               |  7 +++----
 6 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/debian/patches/disable-privacy-breach-doc.patch b/debian/patches/Disable-privacy-breaching-settings.patch
similarity index 85%
rename from debian/patches/disable-privacy-breach-doc.patch
rename to debian/patches/Disable-privacy-breaching-settings.patch
index bb3dac6..355fb3e 100644
--- a/debian/patches/disable-privacy-breach-doc.patch
+++ b/debian/patches/Disable-privacy-breaching-settings.patch
@@ -1,8 +1,13 @@
-Description: disable potential privacy breaching components in docs
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 17 Nov 2015 11:22:26 +0000
+Subject: Disable privacy breaching settings.
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ docs/footer.htm | 48 ------------------------------------------------
+ 1 file changed, 48 deletions(-)
+
+diff --git a/docs/footer.htm b/docs/footer.htm
+index 5a2af81..712fed7 100644
 --- a/docs/footer.htm
 +++ b/docs/footer.htm
 @@ -4,54 +4,6 @@
diff --git a/debian/patches/Fix-CBLAS-detection.patch b/debian/patches/Fix-CBLAS-detection.patch
new file mode 100644
index 0000000..e493c56
--- /dev/null
+++ b/debian/patches/Fix-CBLAS-detection.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 17 Nov 2015 11:22:57 +0000
+Subject: Fix CBLAS detection.
+
+---
+ CMakeModules/FindCBLAS.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
+index d08b3c2..915059e 100644
+--- a/CMakeModules/FindCBLAS.cmake
++++ b/CMakeModules/FindCBLAS.cmake
+@@ -26,7 +26,7 @@ SET(CBLAS_INCLUDE_FILE CACHE STRING
+ # all further checks.
+ FIND_PACKAGE(PkgConfig)
+ IF(PKG_CONFIG_FOUND)
+-  PKG_CHECK_MODULES(PC_CBLAS cblas)
++  PKG_CHECK_MODULES(PC_CBLAS blas)
+ ENDIF(PKG_CONFIG_FOUND)
+ 
+ IF(PC_CBLAS_FOUND)
diff --git a/debian/patches/fix-doxygen-settings.patch b/debian/patches/Use-system-mathjax.patch
similarity index 58%
rename from debian/patches/fix-doxygen-settings.patch
rename to debian/patches/Use-system-mathjax.patch
index 2a0b978..be4a20c 100644
--- a/debian/patches/fix-doxygen-settings.patch
+++ b/debian/patches/Use-system-mathjax.patch
@@ -1,11 +1,16 @@
-Description: fix Doxygen documentation settings for Debian
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 17 Nov 2015 11:22:16 +0000
+Subject: Use system mathjax.
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ docs/doxygen.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/doxygen.mk b/docs/doxygen.mk
+index defb7fe..1a1a266 100644
 --- a/docs/doxygen.mk
 +++ b/docs/doxygen.mk
-@@ -1464,7 +1464,7 @@
+@@ -1464,7 +1464,7 @@ MATHJAX_FORMAT         = HTML-CSS
  # The default value is: http://cdn.mathjax.org/mathjax/latest.
  # This tag requires that the tag USE_MATHJAX is set to YES.
  
diff --git a/debian/patches/bugfix-in-assign.patch b/debian/patches/bugfix-in-assign.patch
deleted file mode 100644
index 678ff18..0000000
--- a/debian/patches/bugfix-in-assign.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4698f12a7ac5209c6e25e3d97f15fe803fdf585c Mon Sep 17 00:00:00 2001
-From: Shehzan Mohammed <shehzan at arrayfire.com>
-Date: Tue, 8 Sep 2015 17:19:36 -0400
-Subject: [PATCH] BUGFIX in assign
-
----
- src/api/c/assign.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/api/c/assign.cpp
-+++ b/src/api/c/assign.cpp
-@@ -124,7 +124,7 @@
-         ArrayInfo lInfo = getInfo(lhs);
- 
-         if (ndims == 1 && ndims != (dim_t)lInfo.ndims()) {
--            af_array tmp_in, tmp_out;
-+            af_array tmp_in = 0, tmp_out = 0;
-             AF_CHECK(af_flat(&tmp_in, lhs));
-             AF_CHECK(af_assign_seq(&tmp_out, tmp_in, ndims, index, rhs));
-             AF_CHECK(af_moddims(out, tmp_out, lInfo.ndims(), lInfo.dims().get()));
diff --git a/debian/patches/fix-cblas-detection.patch b/debian/patches/fix-cblas-detection.patch
deleted file mode 100644
index d21d83e..0000000
--- a/debian/patches/fix-cblas-detection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix CBLAS detection for Debian
- ArrayFire looks for a cblas.pc file to detect the BLAS headers and library,
- whereas Debian ships a blas.pc in libblas-dev. This patch does a s/cblas/blas
- on the pkg-config part of the relevant find module.
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Bug: https://github.com/arrayfire/arrayfire/pull/1037 
-Last-Update: 2015-10-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeModules/FindCBLAS.cmake
-+++ b/CMakeModules/FindCBLAS.cmake
-@@ -26,7 +26,7 @@
- # all further checks.
- FIND_PACKAGE(PkgConfig)
- IF(PKG_CONFIG_FOUND)
--  PKG_CHECK_MODULES(PC_CBLAS cblas)
-+  PKG_CHECK_MODULES(PC_CBLAS blas)
- ENDIF(PKG_CONFIG_FOUND)
- 
- IF(PC_CBLAS_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index eb87a7e..bc6903c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix-doxygen-settings.patch
-disable-privacy-breach-doc.patch
-bugfix-in-assign.patch
-fix-cblas-detection.patch
+Use-system-mathjax.patch
+Disable-privacy-breaching-settings.patch
+Fix-CBLAS-detection.patch

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

More information about the debian-science-commits mailing list