[SCM] crtmpserver/master: Update patchset

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

The following commit has been merged in the master branch:
commit 68a58277e6754160798062dfc0260ec08201a1b4
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Fri Jul 29 15:29:06 2011 +0300

    Update patchset

diff --git a/debian/patches/05_dont_Werror.diff b/debian/patches/05_dont_Werror.diff
index 3c3634b..dcd4dde 100644
--- a/debian/patches/05_dont_Werror.diff
+++ b/debian/patches/05_dont_Werror.diff
@@ -13,12 +13,12 @@ GCC 4.6.1 release, and the severity of the report will be raised.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -83,7 +83,7 @@ ADD_DEFINITIONS(-DHAS_MEDIA_NSV)
+@@ -119,7 +119,7 @@ ADD_DEFINITIONS(-DHAS_MEDIA_LUA)
  #ADD_DEFINITIONS(-DUSE_MEM_POOL)
  #ADD_DEFINITIONS(-DDEBUG_MEM_POOL)
  
 -SET(GENERIC_FLAGS "-Wall -Werror")
 +SET(GENERIC_FLAGS "-Wall")
  
- MESSAGE(STATUS "We have a ${CMAKE_SYSTEM} system")
- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ #add 64 bit support for 32 but platforms
+ ADD_DEFINITIONS(-D__USE_FILE_OFFSET64)
diff --git a/debian/patches/10_disable_tests_vmtests.diff b/debian/patches/10_disable_tests_vmtests.diff
index f888c9a..61cd882 100644
--- a/debian/patches/10_disable_tests_vmtests.diff
+++ b/debian/patches/10_disable_tests_vmtests.diff
@@ -1,14 +1,12 @@
-Description: disable tests and vmtests.
+Description: disable tests.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -188,7 +188,7 @@
- ADD_SUBDIRECTORY(vm vm)
+@@ -189,6 +189,6 @@ ADD_SUBDIRECTORY(thelib thelib)
  ADD_SUBDIRECTORY(applications applications)
  ADD_SUBDIRECTORY(crtmpserver crtmpserver)
--ADD_SUBDIRECTORY(vmtests vmtests)
+ #ADD_SUBDIRECTORY(vmtests vmtests)
 -ADD_SUBDIRECTORY(tests)
-+#ADD_SUBDIRECTORY(vmtests vmtests)
 +#ADD_SUBDIRECTORY(tests)
  #ADD_SUBDIRECTORY(androidapplestreaming androidapplestreaming)
  
diff --git a/debian/patches/13_disable_lua_config_install.diff b/debian/patches/13_disable_lua_config_install.diff
index 542d273..967ccf7 100644
--- a/debian/patches/13_disable_lua_config_install.diff
+++ b/debian/patches/13_disable_lua_config_install.diff
@@ -2,10 +2,12 @@ Description: disable default install for lua config
 
 --- a/crtmpserver/CMakeLists.txt
 +++ b/crtmpserver/CMakeLists.txt
-@@ -37,5 +37,5 @@
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
  
  ADD_PRECOMPILED_HEADER(${PROJECT_NAME} "${CRTMPSERVER_SOURCES_ROOT}/common/include/common.h")
  INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION sbin)
--INSTALL(FILES crtmpserver.lua DESTINATION etc)
-+#INSTALL(FILES crtmpserver.lua DESTINATION etc)
+-INSTALL(FILES crtmpserver.lua DESTINATION etc RENAME crtmpserver.lua.sample)
+-INSTALL(FILES ../../../man/crtmpserver.1 DESTINATION man/man1)
++#INSTALL(FILES crtmpserver.lua DESTINATION etc RENAME crtmpserver.lua.sample)
++#INSTALL(FILES ../../../man/crtmpserver.1 DESTINATION man/man1)
  
diff --git a/debian/patches/16_add_header_install.diff b/debian/patches/16_add_header_install.diff
new file mode 100644
index 0000000..2c5434d
--- /dev/null
+++ b/debian/patches/16_add_header_install.diff
@@ -0,0 +1,19 @@
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -27,3 +27,7 @@ IF(${LIB_TYPE} MATCHES "SHARED")
+ 	INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CRTMPSERVER_ROOT})
+ ENDIF(${LIB_TYPE} MATCHES "SHARED")
+ 
++INSTALL(DIRECTORY ${CRTMPSERVER_SOURCES_ROOT}/${PROJECT_NAME}/include/
++	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/crtmpserver/${PROJECT_NAME}
++	FILES_MATCHING PATTERN "*.h")
++
+--- a/thelib/CMakeLists.txt
++++ b/thelib/CMakeLists.txt
+@@ -36,3 +36,6 @@ IF(${LIB_TYPE} MATCHES "SHARED")
+ 	INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CRTMPSERVER_ROOT})
+ ENDIF(${LIB_TYPE} MATCHES "SHARED")
+ 
++INSTALL(DIRECTORY ${CRTMPSERVER_SOURCES_ROOT}/${PROJECT_NAME}/include/
++	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/crtmpserver/${PROJECT_NAME}
++	FILES_MATCHING PATTERN "*.h")
diff --git a/debian/patches/series b/debian/patches/series
index a0bc163..4367403 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 11_change_log_location.diff
 13_disable_lua_config_install.diff
 15_use_system_lua.diff
+16_add_header_install.diff

-- 
crtmpserver packaging