[med-svn] [muscle] 02/06: Somehow quilt is picky about line endings - refresh the patch

Andreas Tille tille at debian.org
Mon Jan 18 19:56:27 UTC 2016


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

tille pushed a commit to branch master
in repository muscle.

commit 2f936b8f7885df85f47f1fa3a0aa2b424dc9f544
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 18 20:07:45 2016 +0100

    Somehow quilt is picky about line endings - refresh the patch
---
 debian/patches/01_Fix_FTBFS_Hurd.patch | 45 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/debian/patches/01_Fix_FTBFS_Hurd.patch b/debian/patches/01_Fix_FTBFS_Hurd.patch
index 62471a3..c7afcb9 100644
--- a/debian/patches/01_Fix_FTBFS_Hurd.patch
+++ b/debian/patches/01_Fix_FTBFS_Hurd.patch
@@ -5,28 +5,27 @@ Description: Fix a FTBFS on Hurd since it use MACH kernel like OSX
 Last-Update: 2016-01-16
 Forwarded: TODO
 
---- a/muscle-3.8.31.orig/globalsosx.cpp
-+++ b/muscle-3.8.31/globalsosx.cpp
+--- a/src/globalsosx.cpp
++++ b/src/globalsosx.cpp
 @@ -1,4 +1,4 @@
--#ifdef __MACH__
-+#ifdef __OSX__
- 
- #include <memory.h>
- #include <stdlib.h>
-@@ -89,4 +89,4 @@
- 	{
- 	}
- 
--#endif // __MACH__
-+#endif // __OSX__
-
---- a/muscle-3.8.31.orig/globalsother.cpp
-+++ b/muscle-3.8.31/globalsother.cpp
+-#ifdef __MACH__
++#ifdef __OSX__
+ 
+ #include <memory.h>
+ #include <stdlib.h>
+@@ -89,4 +89,4 @@ void OSInit()
+ 	{
+ 	}
+ 
+-#endif // __MACH__
++#endif // __OSX__
+--- a/src/globalsother.cpp
++++ b/src/globalsother.cpp
 @@ -1,6 +1,6 @@
- #include "muscle.h"
- 
--#if		!defined(__linux__) && !defined(_MSC_VER) && !defined(__MACH__)
-+#if		!defined(__linux__) && !defined(_MSC_VER) && !defined(__OSX__)
- 
- double GetNAN()
- 	{
+ #include "muscle.h"
+ 
+-#if		!defined(__linux__) && !defined(_MSC_VER) && !defined(__MACH__)
++#if		!defined(__linux__) && !defined(_MSC_VER) && !defined(__OSX__)
+ 
+ double GetNAN()
+ 	{

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



More information about the debian-med-commit mailing list