[SCM] crtmpserver/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Apr 3 08:24:45 UTC 2011


The following commit has been merged in the master branch:
commit a3b002101dc9a8c6261aa80f0845af1c4d02ad65
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 3 10:24:40 2011 +0200

    Refresh patches.

diff --git a/debian/patches/10_disable_vm_tests_vmtests.diff b/debian/patches/10_disable_vm_tests_vmtests.diff
index 1fcc81b..5dc9584 100644
--- a/debian/patches/10_disable_vm_tests_vmtests.diff
+++ b/debian/patches/10_disable_vm_tests_vmtests.diff
@@ -4,9 +4,13 @@ Description: disable vm, tests and vmtests.
 Author: Andriy Beregovenko <jet at jet.kiev.ua>
 Last-Update: 2011-03-25
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -160,7 +160,7 @@
+---
+ CMakeLists.txt |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- crtmpserver.orig/CMakeLists.txt
++++ crtmpserver/CMakeLists.txt
+@@ -167,7 +167,7 @@ ADD_SUBDIRECTORY(applications applicatio
  #ADD_SUBDIRECTORY(androidapplestreaming androidapplestreaming)
  
  ADD_DEFINITIONS(-DVM_LUA)
diff --git a/debian/patches/11_change_log_location.diff b/debian/patches/11_change_log_location.diff
index eae3fcd..0a48ca2 100644
--- a/debian/patches/11_change_log_location.diff
+++ b/debian/patches/11_change_log_location.diff
@@ -3,9 +3,13 @@ Description: change log file default location.
 Author: Andriy Beregovenko <jet at jet.kiev.ua>
 Last-Update: 2011-03-25
 
---- a/crtmpserver/crtmpserver.lua
-+++ b/crtmpserver/crtmpserver.lua
-@@ -49,7 +49,7 @@
+---
+ crtmpserver/crtmpserver.lua |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- crtmpserver.orig/crtmpserver/crtmpserver.lua
++++ crtmpserver/crtmpserver/crtmpserver.lua
+@@ -30,7 +30,7 @@ configuration=
  			type="file",
  			level=6,
  			-- the file where the log messages are going to land
@@ -14,7 +18,7 @@ Last-Update: 2011-03-25
  		}
  	},
  	
-@@ -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/13_disable_lua_config_install.diff b/debian/patches/13_disable_lua_config_install.diff
index 97ce2e4..445c36f 100644
--- a/debian/patches/13_disable_lua_config_install.diff
+++ b/debian/patches/13_disable_lua_config_install.diff
@@ -4,9 +4,13 @@ Description: disable default install rules for lua config
 Author: Andriy Beregovenko <jet at jet.kiev.ua>
 Last-Update: 2011-03-25
 
---- a/crtmpserver/CMakeLists.txt
-+++ b/crtmpserver/CMakeLists.txt
-@@ -17,5 +17,5 @@
+---
+ crtmpserver/CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- crtmpserver.orig/crtmpserver/CMakeLists.txt
++++ crtmpserver/crtmpserver/CMakeLists.txt
+@@ -17,5 +17,5 @@ ADD_EXECUTABLE(crtmpserver ${CRTMPSERVER
  TARGET_LINK_LIBRARIES(crtmpserver thelib ${OPENSSL_LIBRARY_PATH} ${CRYPTO_LIBRARY_PATH})
  ADD_PRECOMPILED_HEADER(${PROJECT_NAME} "${CRTMPSERVER_SOURCES_ROOT}/common/include/common.h")
  INSTALL(TARGETS crtmpserver RUNTIME DESTINATION sbin)
diff --git a/debian/patches/15_use_system_lua.diff b/debian/patches/15_use_system_lua.diff
index f524cd2..c6983b1 100644
--- a/debian/patches/15_use_system_lua.diff
+++ b/debian/patches/15_use_system_lua.diff
@@ -3,9 +3,13 @@ Description: use system lua(lua 5.1)
 Author: Andriy Beregovenko <jet at jet.kiev.ua>
 Last-Update: 2011-03-25
 
---- a/cmake_find_modules/Find_lua.cmake
-+++ b/cmake_find_modules/Find_lua.cmake
-@@ -3,6 +3,7 @@
+---
+ cmake_find_modules/Find_lua.cmake |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- crtmpserver.orig/cmake_find_modules/Find_lua.cmake
++++ crtmpserver/cmake_find_modules/Find_lua.cmake
+@@ -3,6 +3,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
  	NAMES
  		lualib.h
  	PATHS
@@ -13,7 +17,7 @@ Last-Update: 2011-03-25
  		/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

-- 
crtmpserver packaging



More information about the pkg-multimedia-commits mailing list