[SCM] crtmpserver/master: Imported Debian patch 0.0~dfsg+svn611-1

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

Imported Upstream version 0.0~dfsg+svn611
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e3060a5008e44af0dfd27d097e5aaaea76f1806f
X-Git-Newrev: 71567b9b3245f95f549d17b60651e3cb91d83c96

The following commit has been merged in the master branch:
commit 71567b9b3245f95f549d17b60651e3cb91d83c96
Merge: e3060a5008e44af0dfd27d097e5aaaea76f1806f 523df1f451600fb8e166ef08ab6e517ba7ed0932
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sat Oct 1 23:13:48 2011 +0300

    Imported Debian patch 0.0~dfsg+svn611-1

diff --combined debian/changelog
index ce06b52,0000000..2001d11
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,0 +1,44 @@@
++crtmpserver (0.0~dfsg+svn611-1) unstable; urgency=low
++
++  [ Andriy Beregovenko ]
++  * New upstream version
++  * Fixed search of libraries in cmake rules (Closes: #642707)
++  * Split package to libs apps dev and main daemon
++
++ -- Andriy Beregovenko <jet at jet.kiev.ua>  Sat, 01 Oct 2011 23:13:48 +0300
++
 +crtmpserver (0.0~dfsg+svn474-1) unstable; urgency=low
 +
 +  [ Andriy Beregovenko ]
 +  * Update debian changelog.
 +  * Imported Upstream version 0.0~dfsg+svn474.
 +  * Update patches relative to new upstream upload.
 +
 +  [ Alessio Treglia ]
 +  * Add script to retrieve sources from upstream's SVN and regenerate the
 +    tarball.
 +
 + -- Andriy Beregovenko <jet at jet.kiev.ua>  Mon, 06 Jun 2011 19:41:18 +0300
 +
 +crtmpserver (0.0~dfsg+svn421-2) unstable; urgency=low
 +
 +  [ Alessio Treglia ]
 +  * Bump Standards.
 +
 +  [ Andriy Beregovenko ]
 +  * Add example basic configuration and init script
 +  * Update man page
 +  * Add debian readme
 +  * Add patch fixes issue with rvalue access first on some platforms
 +  * Add patch which fixes big endian implementation
 +
 +  [ Reinhard Tartler ]
 +  * drop -Werror from CFLAGS (Closes: #625316)
 +
 + -- Andriy Beregovenko <jet at jet.kiev.ua>  Sun, 08 May 2011 11:12:04 +0300
 +
 +crtmpserver (0.0~dfsg+svn421-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #617641)
 +
 + -- Andriy Beregovenko <jet at jet.kiev.ua>  Fri, 18 Mar 2011 14:30:08 +0200
diff --combined debian/patches/18_enable_cmake_find_default_paths.diff
index 0000000,0000000..9d59aa5
new file mode 100644
--- /dev/null
+++ b/debian/patches/18_enable_cmake_find_default_paths.diff
@@@ -1,0 -1,0 +1,35 @@@
++From: Andriy Beregovenko <jet at jet.kiev.ua>
++Bug-Debian: http://bugs.debian.org/642707
++Description: Enable search libs in default locations
++
++--- a/cmake_find_modules/Find_openssl.cmake	2011-10-01 22:51:57.941039789 +0300
+++++ b/cmake_find_modules/Find_openssl.cmake	2011-10-01 22:52:25.337040706 +0300
++@@ -26,7 +26,7 @@
++ 		/sw/lib
++ 		/usr/local/ssl/lib
++ 		/lib
++-		NO_DEFAULT_PATH)
+++		)
++ 
++ FIND_LIBRARY(CRYPTO_LIBRARY_PATH
++ 	NAMES
++@@ -40,7 +40,7 @@
++ 		/sw/lib
++ 		/usr/local/ssl/lib
++ 		/lib
++-		NO_DEFAULT_PATH)
+++		)
++ 
++ IF($ENV{COMPILE_STATIC} MATCHES "1")
++ 	FIND_LIBRARY(Z_LIBRARY_PATH
++--- a/cmake_find_modules/Find_lua.cmake	2011-10-01 22:52:08.881040155 +0300
+++++ b/cmake_find_modules/Find_lua.cmake	2011-10-01 22:52:36.369041075 +0300
++@@ -22,7 +22,7 @@
++ 		/usr/local/lib/lua51
++ 		/sw/lib
++ 		/opt/local/lib
++-		NO_DEFAULT_PATH)
+++		)
++ 
++ IF(LUA_INCLUDE_PATH_)
++ 	SET(LUA_FOUND 1)
diff --combined debian/patches/series
index 4367403,0000000..81db183
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +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
++18_enable_cmake_find_default_paths.diff

-- 
crtmpserver packaging