[SCM] crtmpserver/master: Refresh patches.

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6272cf48152315d22de50baad75ab483251da4c2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 4 12:15:50 2011 +0200

    Refresh patches.

diff --git a/debian/patches/05_dont_Werror.diff b/debian/patches/05_dont_Werror.diff
index dcd4dde..f6b0296 100644
--- a/debian/patches/05_dont_Werror.diff
+++ b/debian/patches/05_dont_Werror.diff
@@ -13,7 +13,7 @@ GCC 4.6.1 release, and the severity of the report will be raised.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -119,7 +119,7 @@ ADD_DEFINITIONS(-DHAS_MEDIA_LUA)
+@@ -123,7 +123,7 @@ ADD_DEFINITIONS(-DHAS_LUA)
  #ADD_DEFINITIONS(-DUSE_MEM_POOL)
  #ADD_DEFINITIONS(-DDEBUG_MEM_POOL)
  
diff --git a/debian/patches/10_disable_tests_vmtests.diff b/debian/patches/10_disable_tests_vmtests.diff
index 61cd882..9369290 100644
--- a/debian/patches/10_disable_tests_vmtests.diff
+++ b/debian/patches/10_disable_tests_vmtests.diff
@@ -2,7 +2,7 @@ Description: disable tests.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -189,6 +189,6 @@ ADD_SUBDIRECTORY(thelib thelib)
+@@ -193,6 +193,6 @@ ADD_SUBDIRECTORY(thelib thelib)
  ADD_SUBDIRECTORY(applications applications)
  ADD_SUBDIRECTORY(crtmpserver crtmpserver)
  #ADD_SUBDIRECTORY(vmtests vmtests)
diff --git a/debian/patches/11_change_log_location.diff b/debian/patches/11_change_log_location.diff
index afaadaf..0e6cb54 100644
--- a/debian/patches/11_change_log_location.diff
+++ b/debian/patches/11_change_log_location.diff
@@ -2,7 +2,7 @@ Description: change log file default location.
 
 --- a/crtmpserver/crtmpserver.lua
 +++ b/crtmpserver/crtmpserver.lua
-@@ -49,7 +49,7 @@
+@@ -30,7 +30,7 @@ configuration=
  			type="file",
  			level=6,
  			-- the file where the log messages are going to land
@@ -11,7 +11,7 @@ Description: change log file default location.
  		}
  	},
  	
-@@ -58,7 +58,7 @@
+@@ -39,7 +39,7 @@ configuration=
  	{
  		-- this is the root directory of all applications
  		-- usually this is relative to the binary execuable
diff --git a/debian/patches/15_use_system_lua.diff b/debian/patches/15_use_system_lua.diff
index 91e30d6..622880e 100644
--- a/debian/patches/15_use_system_lua.diff
+++ b/debian/patches/15_use_system_lua.diff
@@ -2,7 +2,7 @@ Description: use system lua(lua 5.1)
 
 --- a/cmake_find_modules/Find_lua.cmake
 +++ b/cmake_find_modules/Find_lua.cmake
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
  	NAMES
  		lualib.h
  	PATHS
@@ -10,7 +10,7 @@ Description: use system lua(lua 5.1)
  		/usr/include
  		/usr/local/include
  		/usr/local/include/lua51
-@@ -12,7 +13,7 @@
+@@ -12,7 +13,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
  
  FIND_LIBRARY(LUA_LIBRARY_PATH_
  	NAMES
diff --git a/debian/patches/16_add_header_install.diff b/debian/patches/16_add_header_install.diff
index 2c5434d..2c445d5 100644
--- a/debian/patches/16_add_header_install.diff
+++ b/debian/patches/16_add_header_install.diff
@@ -10,7 +10,7 @@
 +
 --- a/thelib/CMakeLists.txt
 +++ b/thelib/CMakeLists.txt
-@@ -36,3 +36,6 @@ IF(${LIB_TYPE} MATCHES "SHARED")
+@@ -31,3 +31,6 @@ IF(${LIB_TYPE} MATCHES "SHARED")
  	INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CRTMPSERVER_ROOT})
  ENDIF(${LIB_TYPE} MATCHES "SHARED")
  
diff --git a/debian/patches/18_enable_cmake_find_default_paths.diff b/debian/patches/18_enable_cmake_find_default_paths.diff
index 9d59aa5..b32b458 100644
--- a/debian/patches/18_enable_cmake_find_default_paths.diff
+++ b/debian/patches/18_enable_cmake_find_default_paths.diff
@@ -2,9 +2,9 @@ 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_openssl.cmake	2011-10-01 22:51:57.941039789 +0300
-+++ b/cmake_find_modules/Find_openssl.cmake	2011-10-01 22:52:25.337040706 +0300
-@@ -26,7 +26,7 @@
+--- 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
  		/usr/local/ssl/lib
  		/lib
@@ -13,7 +13,7 @@ Description: Enable search libs in default locations
  
  FIND_LIBRARY(CRYPTO_LIBRARY_PATH
  	NAMES
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ FIND_LIBRARY(CRYPTO_LIBRARY_PATH
  		/sw/lib
  		/usr/local/ssl/lib
  		/lib
@@ -22,9 +22,9 @@ Description: Enable search libs in default locations
  
  IF($ENV{COMPILE_STATIC} MATCHES "1")
  	FIND_LIBRARY(Z_LIBRARY_PATH
---- a/cmake_find_modules/Find_lua.cmake	2011-10-01 22:52:08.881040155 +0300
-+++ b/cmake_find_modules/Find_lua.cmake	2011-10-01 22:52:36.369041075 +0300
-@@ -22,7 +22,7 @@
+--- 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

-- 
crtmpserver packaging