[SCM] crtmpserver/master: Refresh patch with latest sources

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

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

    Refresh patch with latest sources
    
    Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>

diff --git a/debian/patches/18_enable_cmake_find_default_paths.diff b/debian/patches/18_enable_cmake_find_default_paths.diff
index b32b458..8cfa7f9 100644
--- a/debian/patches/18_enable_cmake_find_default_paths.diff
+++ b/debian/patches/18_enable_cmake_find_default_paths.diff
@@ -2,34 +2,45 @@ From: Andriy Beregovenko <jet at jet.kiev.ua>
 Bug-Debian: http://bugs.debian.org/642707
 Description: Enable search libs in default locations
 
+--- a/cmake_find_modules/Find_lua.cmake
++++ b/cmake_find_modules/Find_lua.cmake
+@@ -8,7 +8,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
+ 		/usr/local/include/lua51
+ 		/sw/include
+ 		/opt/local/include
+-		NO_DEFAULT_PATH)
++		)
+ 
+ FIND_LIBRARY(LUA_LIBRARY_PATH_
+ 	NAMES
+@@ -22,7 +22,7 @@ FIND_LIBRARY(LUA_LIBRARY_PATH_
+ 		/usr/local/lib/lua51
+ 		/sw/lib
+ 		/opt/local/lib
+-		NO_DEFAULT_PATH)
++		)
+ 
+ IF(LUA_INCLUDE_PATH_)
+ 	SET(LUA_FOUND 1)
+diff --git a/cmake_find_modules/Find_openssl.cmake b/cmake_find_modules/Find_openssl.cmake
+index fb3614e..932d569 100644
 --- a/cmake_find_modules/Find_openssl.cmake
 +++ b/cmake_find_modules/Find_openssl.cmake
-@@ -26,7 +26,7 @@ FIND_LIBRARY(OPENSSL_LIBRARY_PATH
- 		/sw/lib
+@@ -36,7 +36,7 @@ FIND_LIBRARY(OPENSSL_LIBRARY_PATH
+ 		/lib/i386-linux-gnu
+ 		/usr/lib/i386-linux-gnu
  		/usr/local/ssl/lib
- 		/lib
 -		NO_DEFAULT_PATH)
 +		)
  
  FIND_LIBRARY(CRYPTO_LIBRARY_PATH
  	NAMES
-@@ -40,7 +40,7 @@ FIND_LIBRARY(CRYPTO_LIBRARY_PATH
- 		/sw/lib
+@@ -58,7 +58,7 @@ FIND_LIBRARY(CRYPTO_LIBRARY_PATH
+ 		/lib/i386-linux-gnu
+ 		/usr/lib/i386-linux-gnu
  		/usr/local/ssl/lib
- 		/lib
 -		NO_DEFAULT_PATH)
 +		)
  
  IF($ENV{COMPILE_STATIC} MATCHES "1")
  	FIND_LIBRARY(Z_LIBRARY_PATH
---- a/cmake_find_modules/Find_lua.cmake
-+++ b/cmake_find_modules/Find_lua.cmake
-@@ -23,7 +23,7 @@ FIND_LIBRARY(LUA_LIBRARY_PATH_
- 		/usr/local/lib/lua51
- 		/sw/lib
- 		/opt/local/lib
--		NO_DEFAULT_PATH)
-+		)
- 
- IF(LUA_INCLUDE_PATH_)
- 	SET(LUA_FOUND 1)

-- 
crtmpserver packaging