[nfft] 04/16: Update patch queue: - Drop Use-configured-libdir-in-pkgconfig-file.patch, applied upstream. - Drop Disable-slow-tests.patch, fixed upstream.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu May 5 14:43:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository nfft.
commit 6659e4e86afe637aeb0d27cd94dd7021b20b6c8e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Apr 11 08:01:01 2016 +0100
Update patch queue:
- Drop Use-configured-libdir-in-pkgconfig-file.patch, applied upstream.
- Drop Disable-slow-tests.patch, fixed upstream.
---
debian/patches/Disable-slow-tests.patch | 108 ---------------------
.../Use-configured-libdir-in-pkgconfig-file.patch | 20 ----
debian/patches/series | 2 -
3 files changed, 130 deletions(-)
diff --git a/debian/patches/Disable-slow-tests.patch b/debian/patches/Disable-slow-tests.patch
deleted file mode 100644
index e75ae81..0000000
--- a/debian/patches/Disable-slow-tests.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Tue, 15 Dec 2015 10:38:22 +0000
-Subject: Disable slow tests.
-
----
- tests/check.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/tests/check.c b/tests/check.c
-index be9582b..c5fc8f7 100644
---- a/tests/check.c
-+++ b/tests/check.c
-@@ -46,25 +46,31 @@ int main(void)
- CU_add_test(nfft, "nfft_1d_fast_file", X(check_1d_fast_file));
- CU_add_test(nfft, "nfft_adjoint_1d_direct_file", X(check_adjoint_1d_direct_file));
- CU_add_test(nfft, "nfft_adjoint_1d_fast_file", X(check_adjoint_1d_fast_file));
-+/*
- CU_add_test(nfft, "nfft_1d_online", X(check_1d_online));
- CU_add_test(nfft, "nfft_adjoint_1d_online", X(check_adjoint_1d_online));
-+*/
-
- CU_add_test(nfft, "nfft_2d_direct_file", X(check_2d_direct_file));
- CU_add_test(nfft, "nfft_2d_fast_file", X(check_2d_fast_file));
- CU_add_test(nfft, "nfft_adjoint_2d_direct_file", X(check_adjoint_2d_direct_file));
- CU_add_test(nfft, "nfft_adjoint_2d_fast_file", X(check_adjoint_2d_fast_file));
-+/*
- CU_add_test(nfft, "nfft_2d_online", X(check_2d_online));
- CU_add_test(nfft, "nfft_adjoint_2d_online", X(check_adjoint_2d_online));
-+*/
-
- CU_add_test(nfft, "nfft_3d_direct_file", X(check_3d_direct_file));
- CU_add_test(nfft, "nfft_3d_fast_file", X(check_3d_fast_file));
- CU_add_test(nfft, "nfft_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
- CU_add_test(nfft, "nfft_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
-+/*
- CU_add_test(nfft, "nfft_3d_online", X(check_3d_online));
- CU_add_test(nfft, "nfft_adjoint_3d_online", X(check_adjoint_3d_online));
-
- CU_add_test(nfft, "nfft_4d_online", X(check_4d_online));
- CU_add_test(nfft, "nfft_adjoint_4d_online", X(check_adjoint_4d_online));
-+*/
- #ifdef HAVE_NFCT
- #undef X
- #define X(name) NFCT(name)
-@@ -74,25 +80,31 @@ int main(void)
- CU_add_test(nfct, "nfct_1d_fast_file", X(check_1d_fast_file));
- CU_add_test(nfct, "nfct_adjoint_1d_direct_file", X(check_adjoint_1d_direct_file));
- CU_add_test(nfct, "nfct_adjoint_1d_fast_file", X(check_adjoint_1d_fast_file));
-+/*
- CU_add_test(nfct, "nfct_1d_online", X(check_1d_online));
- CU_add_test(nfct, "nfct_adjoint_1d_online", X(check_adjoint_1d_online));
-+*/
-
- CU_add_test(nfct, "nfct_2d_direct_file", X(check_2d_direct_file));
- CU_add_test(nfct, "nfct_2d_fast_file", X(check_2d_fast_file));
- CU_add_test(nfct, "nfct_adjoint_2d_direct_file", X(check_adjoint_2d_direct_file));
- CU_add_test(nfct, "nfct_adjoint_2d_fast_file", X(check_adjoint_2d_fast_file));
-+/*
- CU_add_test(nfct, "nfct_2d_online", X(check_2d_online));
- CU_add_test(nfct, "nfct_adjoint_2d_online", X(check_adjoint_2d_online));
-+*/
-
- CU_add_test(nfct, "nfct_3d_direct_file", X(check_3d_direct_file));
- CU_add_test(nfct, "nfct_3d_fast_file", X(check_3d_fast_file));
- CU_add_test(nfct, "nfct_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
- CU_add_test(nfct, "nfct_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
-+/*
- CU_add_test(nfct, "nfct_3d_online", X(check_3d_online));
- CU_add_test(nfct, "nfct_adjoint_3d_online", X(check_adjoint_3d_online));
-
- CU_add_test(nfct, "nfct_4d_online", X(check_4d_online));
- CU_add_test(nfct, "nfct_adjoint_4d_online", X(check_adjoint_4d_online));
-+*/
- #endif
- #endif
- #ifdef HAVE_NFST
-@@ -104,25 +116,31 @@ int main(void)
- CU_add_test(nfst, "nfst_1d_fast_file", X(check_1d_fast_file));
- CU_add_test(nfst, "nfst_adjoint_1d_direct_file", X(check_adjoint_1d_direct_file));
- CU_add_test(nfst, "nfst_adjoint_1d_fast_file", X(check_adjoint_1d_fast_file));
-+/*
- CU_add_test(nfst, "nfst_1d_online", X(check_1d_online));
- CU_add_test(nfst, "nfst_adjoint_1d_online", X(check_adjoint_1d_online));
-+*/
-
- CU_add_test(nfst, "nfst_2d_direct_file", X(check_2d_direct_file));
- CU_add_test(nfst, "nfst_2d_fast_file", X(check_2d_fast_file));
- CU_add_test(nfst, "nfst_adjoint_2d_direct_file", X(check_adjoint_2d_direct_file));
- CU_add_test(nfst, "nfst_adjoint_2d_fast_file", X(check_adjoint_2d_fast_file));
-+/*
- CU_add_test(nfst, "nfst_2d_online", X(check_2d_online));
- CU_add_test(nfst, "nfst_adjoint_2d_online", X(check_adjoint_2d_online));
-+*/
-
- CU_add_test(nfst, "nfst_3d_direct_file", X(check_3d_direct_file));
- CU_add_test(nfst, "nfst_3d_fast_file", X(check_3d_fast_file));
- CU_add_test(nfst, "nfst_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
- CU_add_test(nfst, "nfst_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
-+/*
- CU_add_test(nfst, "nfst_3d_online", X(check_3d_online));
- CU_add_test(nfst, "nfst_adjoint_3d_online", X(check_adjoint_3d_online));
-
- CU_add_test(nfst, "nfst_4d_online", X(check_4d_online));
- CU_add_test(nfst, "nfst_adjoint_4d_online", X(check_adjoint_4d_online));
-+*/
- #endif
- #endif
- #undef X
diff --git a/debian/patches/Use-configured-libdir-in-pkgconfig-file.patch b/debian/patches/Use-configured-libdir-in-pkgconfig-file.patch
deleted file mode 100644
index c0ccebd..0000000
--- a/debian/patches/Use-configured-libdir-in-pkgconfig-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 9 Dec 2015 16:38:27 +0000
-Subject: Use configured libdir in pkgconfig file.
-
----
- nfft3.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nfft3.pc.in b/nfft3.pc.in
-index 2c9c89d..a7c7237 100644
---- a/nfft3.pc.in
-+++ b/nfft3.pc.in
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
-
- Name: NFFT
diff --git a/debian/patches/series b/debian/patches/series
index 81289ac..84d94a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
doxygen-no-html-timestamps.patch
-Use-configured-libdir-in-pkgconfig-file.patch
-Disable-slow-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nfft.git
More information about the debian-science-commits
mailing list