[SCM] crtmpserver/master: Update/add patches relative to new upstream upload

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

The following commit has been merged in the master branch:
commit b74377d1e4877971ccc1770022cfc1cce90a958a
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Mon Jun 6 17:33:42 2011 +0300

    Update/add patches relative to new upstream upload

diff --git a/debian/patches/10_disable_tests_vmtests.diff b/debian/patches/10_disable_tests_vmtests.diff
new file mode 100644
index 0000000..ee2cbf2
--- /dev/null
+++ b/debian/patches/10_disable_tests_vmtests.diff
@@ -0,0 +1,14 @@
+Description: disable tests and vmtests.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,7 +184,7 @@
+ ADD_SUBDIRECTORY(vm vm)
+ ADD_SUBDIRECTORY(applications applications)
+ ADD_SUBDIRECTORY(crtmpserver crtmpserver)
+-ADD_SUBDIRECTORY(vmtests vmtests)
+-ADD_SUBDIRECTORY(tests)
++#ADD_SUBDIRECTORY(vmtests vmtests)
++#ADD_SUBDIRECTORY(tests)
+ #ADD_SUBDIRECTORY(androidapplestreaming androidapplestreaming)
+ 
diff --git a/debian/patches/11_change_log_location.diff b/debian/patches/11_change_log_location.diff
index 0a48ca2..afaadaf 100644
--- a/debian/patches/11_change_log_location.diff
+++ b/debian/patches/11_change_log_location.diff
@@ -1,15 +1,8 @@
 Description: change log file default location.
- Fix for log file location from original to package-specific.
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-03-25
 
----
- 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=
+--- a/crtmpserver/crtmpserver.lua
++++ b/crtmpserver/crtmpserver.lua
+@@ -49,7 +49,7 @@
  			type="file",
  			level=6,
  			-- the file where the log messages are going to land
@@ -18,7 +11,7 @@ Last-Update: 2011-03-25
  		}
  	},
  	
-@@ -39,7 +39,7 @@ configuration=
+@@ -58,7 +58,7 @@
  	{
  		-- 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 445c36f..542d273 100644
--- a/debian/patches/13_disable_lua_config_install.diff
+++ b/debian/patches/13_disable_lua_config_install.diff
@@ -1,19 +1,11 @@
-Description: disable default install rules for lua config
- Do not install original crtmpserver config via cmake. Instead it will be installed 
- as part or crtmpserver package (see debian/crtmpserver.install)
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-03-25
+Description: disable default install for lua config
 
----
- 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})
+--- a/crtmpserver/CMakeLists.txt
++++ b/crtmpserver/CMakeLists.txt
+@@ -37,5 +37,5 @@
+ 
  ADD_PRECOMPILED_HEADER(${PROJECT_NAME} "${CRTMPSERVER_SOURCES_ROOT}/common/include/common.h")
- INSTALL(TARGETS crtmpserver RUNTIME DESTINATION sbin)
+ INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION sbin)
 -INSTALL(FILES crtmpserver.lua DESTINATION etc)
 +#INSTALL(FILES crtmpserver.lua DESTINATION etc)
  
diff --git a/debian/patches/15_use_system_lua.diff b/debian/patches/15_use_system_lua.diff
index c6983b1..91e30d6 100644
--- a/debian/patches/15_use_system_lua.diff
+++ b/debian/patches/15_use_system_lua.diff
@@ -1,15 +1,8 @@
 Description: use system lua(lua 5.1)
- Allows cmake correctly find pathes to systemwide LUA headers and libraries.
-Author: Andriy Beregovenko <jet at jet.kiev.ua>
-Last-Update: 2011-03-25
 
----
- 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_
+--- a/cmake_find_modules/Find_lua.cmake
++++ b/cmake_find_modules/Find_lua.cmake
+@@ -3,6 +3,7 @@
  	NAMES
  		lualib.h
  	PATHS
@@ -17,7 +10,7 @@ Last-Update: 2011-03-25
  		/usr/include
  		/usr/local/include
  		/usr/local/include/lua51
-@@ -12,7 +13,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
+@@ -12,7 +13,7 @@
  
  FIND_LIBRARY(LUA_LIBRARY_PATH_
  	NAMES
diff --git a/debian/patches/series b/debian/patches/series
index 981e222..a0bc163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 05_dont_Werror.diff
-10_disable_vm_tests_vmtests.diff
+10_disable_tests_vmtests.diff
 11_change_log_location.diff
 13_disable_lua_config_install.diff
 15_use_system_lua.diff
-16_fix_rvalue_access.diff
-17_fix_bigendian_defines.diff

-- 
crtmpserver packaging