[SCM] crtmpserver/master: refresh quilt patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jun 22 16:16:41 UTC 2013
The following commit has been merged in the master branch:
commit b28de5a6fc511b49b9a15240b301c4abdb7bdba0
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jun 22 18:10:23 2013 +0200
refresh quilt patches
diff --git a/debian/patches/10-Do-not-build-tests.patch b/debian/patches/10-Do-not-build-tests.patch
index a0e0e47..cef10d1 100644
--- a/debian/patches/10-Do-not-build-tests.patch
+++ b/debian/patches/10-Do-not-build-tests.patch
@@ -10,8 +10,6 @@ Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c85be4f..011ce70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,4 +226,3 @@ ADD_SUBDIRECTORY(common common)
@@ -19,6 +17,3 @@ index c85be4f..011ce70 100644
ADD_SUBDIRECTORY(applications applications)
ADD_SUBDIRECTORY(crtmpserver crtmpserver)
-ADD_SUBDIRECTORY(tests)
---
-1.7.10.4
-
diff --git a/debian/patches/12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch b/debian/patches/12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch
index 16123a3..5cc7a27 100644
--- a/debian/patches/12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch
+++ b/debian/patches/12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch
@@ -8,8 +8,6 @@ Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c85be4f..e57dbd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,9 +67,9 @@ STRING(STRIP "${TEMP_VAL_RAW}" TEMP_VAL)
@@ -24,6 +22,3 @@ index c85be4f..e57dbd2 100644
FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_CODE_NAME \"${CODE_NAME}\"\n")
FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_BUILDER_OS_NAME \"$ENV{OS_NAME}\"\n")
FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_BUILDER_OS_VERSION \"$ENV{OS_VERSION}\"\n")
---
-1.7.10.4
-
diff --git a/debian/patches/13_disable_lua_config_install.diff b/debian/patches/13_disable_lua_config_install.diff
index 967ccf7..e9e1dfc 100644
--- a/debian/patches/13_disable_lua_config_install.diff
+++ b/debian/patches/13_disable_lua_config_install.diff
@@ -2,7 +2,7 @@ Description: disable default install for lua config
--- a/crtmpserver/CMakeLists.txt
+++ b/crtmpserver/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
+@@ -34,6 +34,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)
diff --git a/debian/patches/16_add_header_install.diff b/debian/patches/16_add_header_install.diff
index bee2145..2c80260 100644
--- a/debian/patches/16_add_header_install.diff
+++ b/debian/patches/16_add_header_install.diff
@@ -13,7 +13,7 @@ Description: Update cmake rules for 'common' and 'thelib'.
+
--- a/thelib/CMakeLists.txt
+++ b/thelib/CMakeLists.txt
-@@ -31,3 +31,6 @@ IF(${LIB_TYPE} MATCHES "SHARED")
+@@ -26,3 +26,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 8cfa7f9..c6546e1 100644
--- a/debian/patches/18_enable_cmake_find_default_paths.diff
+++ b/debian/patches/18_enable_cmake_find_default_paths.diff
@@ -4,7 +4,7 @@ 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_
+@@ -9,7 +9,7 @@ FIND_PATH(LUA_INCLUDE_PATH_
/usr/local/include/lua51
/sw/include
/opt/local/include
@@ -13,7 +13,7 @@ Description: Enable search libs in default locations
FIND_LIBRARY(LUA_LIBRARY_PATH_
NAMES
-@@ -22,7 +22,7 @@ FIND_LIBRARY(LUA_LIBRARY_PATH_
+@@ -23,7 +23,7 @@ FIND_LIBRARY(LUA_LIBRARY_PATH_
/usr/local/lib/lua51
/sw/lib
/opt/local/lib
@@ -22,8 +22,6 @@ Description: Enable search libs in default locations
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
@@ -36,7 +36,7 @@ FIND_LIBRARY(OPENSSL_LIBRARY_PATH
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list