[SCM] crtmpserver/master: Remove upstream conf file related things.

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

The following commit has been merged in the master branch:
commit fa9ea5c9f5d4c206255bcc2f95dccb4e040cdf04
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sun Mar 18 12:02:16 2012 +0200

    Remove upstream conf file related things.
    
    Since upstream configuration file is handling manually, there is no
    needs to keep it in source tree, so remove exclude it from example
    list and remove path for it.

diff --git a/debian/crtmpserver.examples b/debian/crtmpserver.examples
index 78db861..55b78ae 100644
--- a/debian/crtmpserver.examples
+++ b/debian/crtmpserver.examples
@@ -1,2 +1 @@
 debian/examples/*
-crtmpserver/crtmpserver.lua
diff --git a/debian/patches/11_change_log_location.diff b/debian/patches/11_change_log_location.diff
deleted file mode 100644
index 0e6cb54..0000000
--- a/debian/patches/11_change_log_location.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: change log file default location.
-
---- a/crtmpserver/crtmpserver.lua
-+++ b/crtmpserver/crtmpserver.lua
-@@ -30,7 +30,7 @@ configuration=
- 			type="file",
- 			level=6,
- 			-- the file where the log messages are going to land
--			fileName="/tmp/crtmpserver.log"
-+			fileName="/var/log/crtmpserver/crtmpserver.log"
- 		}
- 	},
- 	
-@@ -39,7 +39,7 @@ configuration=
- 	{
- 		-- this is the root directory of all applications
- 		-- usually this is relative to the binary execuable
--		rootDirectory="applications",
-+		rootDirectory="/usr/lib/crtmpserver/applications",
- 		
- 		
- 		--this is where the applications array starts
diff --git a/debian/patches/series b/debian/patches/series
index 81db183..78aabfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 05_dont_Werror.diff
 10_disable_tests_vmtests.diff
-11_change_log_location.diff
 13_disable_lua_config_install.diff
 15_use_system_lua.diff
 16_add_header_install.diff

-- 
crtmpserver packaging