[med-svn] [bart] 02/08: update patches

[Martin Uecker]

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

uecker-guest pushed a commit to branch patch-queue/master
in repository bart.

commit b0565eddcad1e24cf26deabf95c86e08d4f58ab6
Author: Martin Uecker <martin.uecker at med.uni-goettingen.de>
Date:   Sun Nov 26 12:04:09 2017 +0100

    update patches
---
 debian/patches/0001-remove-empty-directory.patch    |  4 ++--
 .../patches/0002-make-format-security-happy.patch   | 21 ---------------------
 ...3-remove-typo-in-symbol-and-make-it-static.patch | 21 ---------------------
 debian/patches/series                               |  2 --
 4 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/patches/0001-remove-empty-directory.patch b/debian/patches/0001-remove-empty-directory.patch
index fde94e6..06e28c0 100644
--- a/debian/patches/0001-remove-empty-directory.patch
+++ b/debian/patches/0001-remove-empty-directory.patch
@@ -7,10 +7,10 @@ Subject: remove empty directory
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 39c1f3e..d148c84 100644
+index 834698d..72b1829 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -462,7 +462,6 @@ install: bart $(root)/doc/commands.txt
+@@ -495,7 +495,6 @@ install: bart $(root)/doc/commands.txt
  	install bart $(DESTDIR)/$(PREFIX)/bin/
  	install -d $(DESTDIR)/$(PREFIX)/share/doc/bart/
  	install $(root)/doc/*.txt $(root)/README $(DESTDIR)/$(PREFIX)/share/doc/bart/
diff --git a/debian/patches/0002-make-format-security-happy.patch b/debian/patches/0002-make-format-security-happy.patch
deleted file mode 100644
index b7265a4..0000000
--- a/debian/patches/0002-make-format-security-happy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Sat, 14 Jan 2017 16:01:46 +0100
-Subject: make format security happy
-
----
- src/show.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/show.c b/src/show.c
-index a363bff..e29e749 100644
---- a/src/show.c
-+++ b/src/show.c
-@@ -58,7 +58,7 @@ ok:
- 	for (long i = 0; i < T; i++) {
- 
- 		printf(fmt, crealf(data[i]), cimagf(data[i]));
--		printf((0 == (i + 1) % dims[l]) ? "\n" : sep);
-+		printf("%s", (0 == (i + 1) % dims[l]) ? "\n" : sep);
- 	}
- }
- 
diff --git a/debian/patches/0003-remove-typo-in-symbol-and-make-it-static.patch b/debian/patches/0003-remove-typo-in-symbol-and-make-it-static.patch
deleted file mode 100644
index 75fe7e3..0000000
--- a/debian/patches/0003-remove-typo-in-symbol-and-make-it-static.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Sat, 14 Jan 2017 23:28:14 +0100
-Subject: remove typo in symbol (and make it static)
-
----
- src/num/flpmath.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/num/flpmath.c b/src/num/flpmath.c
-index 83ba115..dbc0395 100644
---- a/src/num/flpmath.c
-+++ b/src/num/flpmath.c
-@@ -334,7 +334,7 @@ static void make_z2opd(size_t offset, unsigned int D, const long dim[D], const l
- 	optimized_twoop_oi(D, dim, ostr, optr, istr1, iptr1, sizes, nary_z2opd, &offset);
- }
- 
--void* unsued = make_z2opd;
-+static void* unused = make_z2opd;
- 
- static void nary_2opd(struct nary_opt_data_s* data, void* ptr[])
- {
diff --git a/debian/patches/series b/debian/patches/series
index 76aec5e..1d193a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-remove-empty-directory.patch
-0002-make-format-security-happy.patch
-0003-remove-typo-in-symbol-and-make-it-static.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bart.git