[SCM] crtmpserver/master: Patch was merged to upstream

[jet-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit daf52581d68eabcc661996080e875af8c90516d5
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sat Jun 1 21:25:36 2013 +0300

    Patch was merged to upstream
    
    Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>

diff --git a/debian/patches/19_gcc_4_7_compatibility.diff b/debian/patches/19_gcc_4_7_compatibility.diff
deleted file mode 100644
index 1c17c65..0000000
--- a/debian/patches/19_gcc_4_7_compatibility.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Andriy Beregovenko <jet at jet.kiev.ua>
-Bug-Debian: http://bugs.debian.org/667144
-Description: Fix compatibility issue with gcc 4.7
-
-In gcc 4.7 some functions and constants was moved to
-unistd.h. This patch adds a unistd header inclusion.
-
-diff --git a/common/include/platform/linux/linuxplatform.h b/common/include/platform/linux/linuxplatform.h
-index 25d7185..7b02a49 100644
---- a/common/include/platform/linux/linuxplatform.h
-+++ b/common/include/platform/linux/linuxplatform.h
-@@ -38,6 +38,7 @@
- #include <dlfcn.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
- #include <fstream>
- #include <glob.h>
- #include <iostream>
diff --git a/debian/patches/series b/debian/patches/series
index b70d675..21cbca9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 15_use_system_lua.diff
 16_add_header_install.diff
 18_enable_cmake_find_default_paths.diff
-19_gcc_4_7_compatibility.diff

-- 
crtmpserver packaging