[Pkg-octave-commit] [octave-nan] 03/03: Drop patches hurd.patch andfix_makefile (applied upstream)

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-nan.

commit 767d752ae851b605d1b3a1580717c07097dc6e7b
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Jan 24 23:01:33 2014 +0100

    Drop patches hurd.patch andfix_makefile (applied upstream)
---
 debian/patches/fix_makefile | 20 --------------------
 debian/patches/hurd.patch   | 33 ---------------------------------
 debian/patches/series       |  2 --
 3 files changed, 55 deletions(-)

diff --git a/debian/patches/fix_makefile b/debian/patches/fix_makefile
deleted file mode 100644
index e7aa665..0000000
--- a/debian/patches/fix_makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Do not try to build MATLAB stuff
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -41,13 +41,7 @@
- 
- mex4o octave: $(PROGS)
- 
--ifneq ( , $(ls -1 $(MATLABDIR) ) )
--MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
--mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
--endif
--mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
--mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
--all:    octave win32 win64 mex4m
-+all:    octave
- 
- clean:
- 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index d6217b7..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix FTBFS and enable optimize byte swapping macros on hurd-i386
- The problem is that octave-nan tries to include <machine/endian.h> if BSD is
- defined (which is on Hurd, since it initially wanted to be BSD-compatible,
- somehow). This patch avoids that #include in Hurd, and also enables
- <byteswap.h> on any GNU libc platform (since GNU libc provides that header) to
- have optimized byte swapping macros on GNU/Hurd and also on GNU/kFreeBSD too.
-Author: Pino Toscano <pino at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670073
-Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29169670
-Applied-Upstream: commit: 10319
-Last-Update: 2012-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/xptopen.cpp
-+++ b/src/xptopen.cpp
-@@ -72,7 +72,7 @@ SPSS file format
- #define max(a,b)	(((a) > (b)) ? (a) : (b))
- #define min(a,b)	(((a) < (b)) ? (a) : (b))
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GLIBC__)
- /* use byteswap macros from the host system, hopefully optimized ones ;-) */
- #include <byteswap.h>
- #endif
-@@ -83,7 +83,7 @@ SPSS file format
- #define __BYTE_ORDER __LITTLE_ENDIAN
- #endif
- 
--#if (defined(BSD) && (BSD >= 199103))
-+#if ((defined(BSD) && !defined(__GNU__)) && (BSD >= 199103))
- #include <machine/endian.h>
- #define __BIG_ENDIAN _BIG_ENDIAN
- #define __LITTLE_ENDIAN _LITTLE_ENDIAN
diff --git a/debian/patches/series b/debian/patches/series
index 1cf9bbc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix_makefile
-hurd.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-nan.git