[SCM] faust/master: Removed (more) patches applied upstream

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed May 25 09:17:47 UTC 2016


The following commit has been merged in the master branch:
commit b03748a7606faab4fe619282ef8c5c657c009a59
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu May 19 11:21:47 2016 +0200

    Removed (more) patches applied upstream

diff --git a/debian/patches/atoi b/debian/patches/atoi
deleted file mode 100644
index b16ea8b..0000000
--- a/debian/patches/atoi
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: include stdlib.h and cstdlib for atoi
-Author: Mario Lang <mlang at debian.org>
-Bug-Debian: http://bugs.debian.org/652322
-Forwarded: no
-Last-Update: 2012-03-24
-
---- faust.orig/compiler/draw/schema/topSchema.cpp
-+++ faust/compiler/draw/schema/topSchema.cpp
-@@ -21,6 +21,7 @@
- 
- #include <stdlib.h>
- #include "topSchema.h"
-+#include <cstdlib>
- #include <iostream>
- #include <assert.h>
- #include <cstdlib>
---- faust.orig/compiler/tlib/list.cpp
-+++ faust/compiler/tlib/list.cpp
-@@ -105,6 +105,7 @@
- #include <stdlib.h>
- #include "list.hh"
- #include "compatibility.hh"
-+#include <cstdlib>
- #include <map>
- #include <cstdlib>
- 
diff --git a/debian/patches/series b/debian/patches/series
index c4914b4..835854e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-atoi
 strip-usrlocal
 kFreeBSD
-unistd
 ldflags
 spelling
diff --git a/debian/patches/unistd b/debian/patches/unistd
deleted file mode 100644
index df7caf0..0000000
--- a/debian/patches/unistd
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Include unistd.h since it is required for gcc-4.7
- The function isatty and gethostname are defined in unistd.h.
- They are used by faust, but faust does not include unistd.h.
-Author: Mario Lang <mlang at debian.org>
-Bug-Debian: http://bugs.debian.org/667163
-Forwarded: no
-
---- faust.orig/architecture/osclib/faust/src/nodes/RootNode.cpp
-+++ faust/architecture/osclib/faust/src/nodes/RootNode.cpp
-@@ -23,6 +23,7 @@
- 
- #include <string>
- #include <sstream>
-+#include <unistd.h>
- 
- #ifndef _WIN32
- #include <unistd.h>

-- 
faust packaging



More information about the pkg-multimedia-commits mailing list