[SCM] crtmpserver/master: Add patch to fix pathes to special files

jet-guest at users.alioth.debian.org jet-guest at users.alioth.debian.org
Sat Jun 1 19:24:08 UTC 2013


The following commit has been merged in the master branch:
commit 53cd88c1f2dcdce995fc17484943f6b8459aede0
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sat Jun 1 21:40:08 2013 +0300

    Add patch to fix pathes to special files
    
    Fix pathes to files CODE_NAME and RELEASE_NUMBER
    
    Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>

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
new file mode 100644
index 0000000..16123a3
--- /dev/null
+++ b/debian/patches/12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch
@@ -0,0 +1,29 @@
+From e33d9deb59f0a18d99f02b18d9cd07cca7a50fb6 Mon Sep 17 00:00:00 2001
+From: Andriy Beregovenko <jet at jet.kiev.ua>
+Date: Sat, 1 Jun 2013 21:36:33 +0300
+Subject: [PATCH 1/1] Fix repacked pathes in main CMakeLists.txt
+
+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)
+ FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_BUILD_DATE ${TEMP_VAL}\n")
+ EXECUTE_PROCESS(COMMAND svnversion -n ${CRTMPSERVER_SOURCES_ROOT} OUTPUT_VARIABLE TEMP_VAL)
+ FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_BUILD_NUMBER \"${TEMP_VAL}\"\n")
+-FILE(STRINGS "../../RELEASE_NUMBER" RELEASE_NUMBER)
++FILE(STRINGS "RELEASE_NUMBER" RELEASE_NUMBER)
+ FILE(APPEND ${CRTMPSERVER_SOURCES_ROOT}/common/include/version.h "#define CRTMPSERVER_VERSION_RELEASE_NUMBER \"${RELEASE_NUMBER}\"\n")
+-FILE(STRINGS "../../CODE_NAME" CODE_NAME)
++FILE(STRINGS "CODE_NAME" CODE_NAME)
+ 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/series b/debian/patches/series
index b0c8e5e..927d052 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 10-Do-not-build-tests.patch
+12-Fix-repacked-pathes-in-main-CMakeLists.txt.patch
 13_disable_lua_config_install.diff
 15_use_system_lua.diff
 16_add_header_install.diff

-- 
crtmpserver packaging



More information about the pkg-multimedia-commits mailing list