[SCM] crtmpserver/master: Reformat and actualize patch

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


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

    Reformat and actualize patch
    
    Refresh patch using git format-patch way.
    
    Signed-off-by: Andriy Beregovenko <jet at jet.kiev.ua>

diff --git a/debian/patches/10-Do-not-build-tests.patch b/debian/patches/10-Do-not-build-tests.patch
new file mode 100644
index 0000000..a0e0e47
--- /dev/null
+++ b/debian/patches/10-Do-not-build-tests.patch
@@ -0,0 +1,24 @@
+From 79888c1aca48dcf93feb293cb22d92bf3c770a18 Mon Sep 17 00:00:00 2001
+From: Andriy Beregovenko <jet at jet.kiev.ua>
+Date: Sat, 1 Jun 2013 21:07:09 +0300
+Subject: [PATCH 1/1] Do not build tests
+
+This application is useless in release build.
+
+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)
+ ADD_SUBDIRECTORY(thelib thelib)
+ ADD_SUBDIRECTORY(applications applications)
+ ADD_SUBDIRECTORY(crtmpserver crtmpserver)
+-ADD_SUBDIRECTORY(tests)
+-- 
+1.7.10.4
+
diff --git a/debian/patches/10_disable_tests_vmtests.diff b/debian/patches/10_disable_tests_vmtests.diff
deleted file mode 100644
index 9369290..0000000
--- a/debian/patches/10_disable_tests_vmtests.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: disable tests.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,6 +193,6 @@ ADD_SUBDIRECTORY(thelib thelib)
- ADD_SUBDIRECTORY(applications applications)
- ADD_SUBDIRECTORY(crtmpserver crtmpserver)
- #ADD_SUBDIRECTORY(vmtests vmtests)
--ADD_SUBDIRECTORY(tests)
-+#ADD_SUBDIRECTORY(tests)
- #ADD_SUBDIRECTORY(androidapplestreaming androidapplestreaming)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 11d112d..b70d675 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 05_dont_Werror.diff
-10_disable_tests_vmtests.diff
+10-Do-not-build-tests.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