[SCM] OCE packaging branch, debian, updated. debian/0.10-1

Denis Barbier bouzim at gmail.com
Sun Jun 10 07:36:27 UTC 2012


The following commit has been merged in the debian branch:
commit 2332f079b05aee3f236ceb4ff54e3253d8acd574
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Jun 7 23:22:51 2012 +0200

    Drop debian/patches/ftbfs-alpha.patch, it has been incorporated upstream

diff --git a/debian/patches/ftbfs-alpha.patch b/debian/patches/ftbfs-alpha.patch
deleted file mode 100644
index 0d991e0..0000000
--- a/debian/patches/ftbfs-alpha.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS on Alpha
- Will be applied upstream if it works as expected.
-Bug: http://bugs.debian.org/656838
-Forwarded: https://github.com/tpaviot/oce/issues/243
-Author: Michael Cree <mcree at orcon.net.nz>
-
-diff --git a/inc/MFT_FileRecord.hxx b/inc/MFT_FileRecord.hxx
-index 0cfd3d8..ba412b7 100644
---- a/inc/MFT_FileRecord.hxx
-+++ b/inc/MFT_FileRecord.hxx
-@@ -47,7 +47,7 @@
-         munmap((caddr_t) mmap_addr,(size_t) mmap_size)
- #endif // sgi
- 
--#if defined ( __alpha) || defined ( DECOSF1 )
-+#if (defined ( __alpha) || defined ( DECOSF1 )) && !defined(linux)
- #include <sys/mman.h>
- #define MMAP(file_addr,mmap_size,fildes) \
-         mmap((caddr_t) 0x1000000000,(size_t) mmap_size,PROT_READ, \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 47f564f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ftbfs-alpha.patch

-- 
OCE packaging



More information about the debian-science-commits mailing list