[nfft] 06/13: Drop fix-broken-destdir.diff, fix-hppa-build.patch and fix-missing-lm.patch, applied upstream.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Dec 12 14:24:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.
commit 8fe122839dfc53defe8a2c06958ee174a2164b5c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Dec 9 16:45:44 2015 +0000
Drop fix-broken-destdir.diff, fix-hppa-build.patch and
fix-missing-lm.patch, applied upstream.
---
debian/patches/fix-broken-destdir.diff | 22 ----------------------
debian/patches/fix-hppa-build.patch | 15 ---------------
debian/patches/fix-missing-lm.patch | 16 ----------------
debian/patches/series | 1 -
4 files changed, 54 deletions(-)
diff --git a/debian/patches/fix-broken-destdir.diff b/debian/patches/fix-broken-destdir.diff
deleted file mode 100644
index 032ba0d..0000000
--- a/debian/patches/fix-broken-destdir.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nfft/Makefile.am
-===================================================================
---- nfft.orig/Makefile.am
-+++ nfft/Makefile.am
-@@ -69,12 +69,12 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = nfft3 at PREC_SUFFIX@.pc
-
- install-data-hook:
-- chmod u+wX $(prefix)
-- $(install_sh) -d $(datarootdir)
-- chmod -R u+wX $(datarootdir)
-- $(install_sh) -d $(docdir)
-+ chmod u+wX $(DESTDIR)/$(prefix)
-+ $(install_sh) -d $(DESTDIR)/$(datarootdir)
-+ chmod -R u+wX $(DESTDIR)/$(datarootdir)
-+ $(install_sh) -d $(DESTDIR)/$(docdir)
- chmod -Rf u+rwX $(srcdir)/doc
-- cp -R $(srcdir)/doc/* $(docdir)/
-+ cp -R $(srcdir)/doc/* $(DESTDIR)/$(docdir)/
-
- uninstall-hook:
- rm -Rf $(docdir)
diff --git a/debian/patches/fix-hppa-build.patch b/debian/patches/fix-hppa-build.patch
deleted file mode 100644
index 0d93b6f..0000000
--- a/debian/patches/fix-hppa-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS for hppa architecture.
-Forwarded: no
-Author: Helge Deller <deller at gmx.de>
-diff -up ./include/cycle.h.org ./include/cycle.h
---- ./include/cycle.h.org 2014-03-26 15:42:41.840098000 -0600
-+++ ./include/cycle.h 2014-03-26 15:43:35.072098000 -0600
-@@ -341,7 +341,7 @@ INLINE_ELAPSED(inline)
- /*
- * PA-RISC cycle counter
- */
--#if defined(__hppa__) || defined(__hppa) && !defined(HAVE_TICK_COUNTER)
-+#if (defined(__hppa__) || defined(__hppa)) && !defined(HAVE_TICK_COUNTER)
- typedef unsigned long ticks;
-
- # ifdef __GNUC__
diff --git a/debian/patches/fix-missing-lm.patch b/debian/patches/fix-missing-lm.patch
deleted file mode 100644
index b5cacc1..0000000
--- a/debian/patches/fix-missing-lm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Workaround for missing -lm flag in build system
- The correct fix is currently being worked on upstream.
-Forwarded: not-needed
-Author: Ghislain Vaillant <ghisvail at gmail.com>
-Index: nfft-3.2.3/configure.ac
-===================================================================
---- nfft-3.2.3.orig/configure.ac 2013-10-07 14:34:52.621871961 +0100
-+++ nfft-3.2.3/configure.ac 2013-10-07 14:40:36.817860434 +0100
-@@ -364,6 +364,7 @@
- saved_LIBS=$LIBS
- AC_CHECK_LIB(m, sin)
- LIBS=$saved_LIBS
-+LIBS="$saved_LIBS -lm"
-
- AC_CHECK_FUNCS([gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time])
-
diff --git a/debian/patches/series b/debian/patches/series
index 9146e27..84d94a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-#fix-broken-destdir.diff
doxygen-no-html-timestamps.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