[Pkg-voip-commits] r2531 - in wengophone/trunk/debian: . patches
patches/debian patches/generic
Marco Nenciarini
mnencia at costa.debian.org
Mon Oct 9 13:43:55 UTC 2006
Author: mnencia
Date: 2006-10-09 13:43:54 +0000 (Mon, 09 Oct 2006)
New Revision: 2531
Added:
wengophone/trunk/debian/patches/debian/
wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
wengophone/trunk/debian/patches/debian/disable-crashreport.patch
wengophone/trunk/debian/patches/generic/
wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch
wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch
wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch
wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch
wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
wengophone/trunk/debian/patches/head/
Removed:
wengophone/trunk/debian/patches/000_cmake-static-owcurl.patch
wengophone/trunk/debian/patches/001_cmake-fix-static-phapi.patch
wengophone/trunk/debian/patches/002_cmake-fix-static-sfp-plugin.patch
wengophone/trunk/debian/patches/003_cmake-amrplugin-pic-code.patch
wengophone/trunk/debian/patches/200_no-crashreport.patch
wengophone/trunk/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/patches/README
wengophone/trunk/debian/patches/series
Log:
New patch organization
Added STUN compilation fix for non i386 arches
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/changelog 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,3 +1,9 @@
+wengophone (2.0.0~rc4-svn7960-2) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Marco Nenciarini <mnencia at debian.org> Sun, 8 Oct 2006 13:49:50 +0200
+
wengophone (2.0.0~rc4-svn7960-1) unstable; urgency=low
* New upstream snapshot.
Deleted: wengophone/trunk/debian/patches/000_cmake-static-owcurl.patch
===================================================================
--- wengophone/trunk/debian/patches/000_cmake-static-owcurl.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/000_cmake-static-owcurl.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,39 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/libs/curl/CMakeLists.txt 2006-10-06 12:40:42.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt 2006-10-06 12:56:55.000000000 +0000
-@@ -30,6 +30,8 @@
- -DUSE_OPENSSL
- )
-
-+option(WITH_SHARED_OWCURL "Build owcurl as shared library" ON)
-+
- if (APPLE)
- find_package(ZLIB REQUIRED)
-
-@@ -122,14 +124,16 @@
- ${OWCURL_DEFINITIONS}
- )
-
--add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
-+if (WITH_SHARED_OWCURL)
-+ add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
-+ install(
-+ TARGETS
-+ ${OWCURL_LIBRARY}
-+ DESTINATION
-+ ${LIB_INSTALL_DIR}
-+ )
-+else (WITH_SHARED_OWCURL)
-+ add_library(${OWCURL_LIBRARY} STATIC ${owcurl_SRCS})
-+endif (WITH_SHARED_OWCURL)
-
- target_link_libraries(${OWCURL_LINK_LIBRARIES})
--
--install(
-- TARGETS
-- ${OWCURL_LIBRARY}
-- DESTINATION
-- ${LIB_INSTALL_DIR}
--)
--
Deleted: wengophone/trunk/debian/patches/001_cmake-fix-static-phapi.patch
===================================================================
--- wengophone/trunk/debian/patches/001_cmake-fix-static-phapi.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/001_cmake-fix-static-phapi.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,27 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/CMakeLists.txt 2006-10-06 12:45:17.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt 2006-10-06 12:50:15.000000000 +0000
-@@ -256,7 +256,7 @@
-
- if (UNIX AND NOT WIN32)
- if (APPLE)
-- set(WITH_PHAPI_SHARED OFF)
-+ set(WITH_SHARED_PHAPI OFF)
-
- set(phapi_SRCS
- ${phapi_SRCS}
-@@ -419,13 +419,6 @@
-
- install(
- TARGETS
-- ${PHAPI_LIBRARY}
-- DESTINATION
-- ${LIB_INSTALL_DIR}
--)
--
--install(
-- TARGETS
- phamrplugin
- phspeexplugin
- DESTINATION
Deleted: wengophone/trunk/debian/patches/002_cmake-fix-static-sfp-plugin.patch
===================================================================
--- wengophone/trunk/debian/patches/002_cmake-fix-static-sfp-plugin.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/002_cmake-fix-static-sfp-plugin.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,45 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:56:02.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:58:31.000000000 +0000
-@@ -23,6 +23,12 @@
- ${EXOSIP_LIBRARY}
- )
-
-+option(WITH_SHARED_SFP-PLUGIN "Build sfp-plugin as shared library" ON)
-+
-+if (APPLE)
-+ set(WITH_SHARED_SFP-PLUGIN OFF)
-+endif (APPLE)
-+
- if (MSVC)
- set(SFP-PLUGIN_DEFINITIONS
- -DBUILD_SFP_PLUGIN_DLL
-@@ -44,15 +50,7 @@
- ${SFP-PLUGIN_DEFINITIONS}
- )
-
--if (APPLE)
-- add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
-- install(
-- TARGETS
-- ${SFP-PLUGIN_LIBRARY}
-- ARCHIVE DESTINATION
-- ${LIB_INSTALL_DIR}
-- )
--else (APPLE)
-+if (WITH_SHARED_SFP-PLUGIN)
- add_library(${SFP-PLUGIN_LIBRARY} SHARED ${sfp-plugin_SRCS})
- install(
- TARGETS
-@@ -60,7 +58,9 @@
- LIBRARY DESTINATION
- ${LIB_INSTALL_DIR}
- )
--endif (APPLE)
-+else (WITH_SHARED_SFP-PLUGIN)
-+ add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
-+endif (WITH_SHARED_SFP-PLUGIN)
-
- target_link_libraries(${SFP-PLUGIN_LINK_LIBRARIES})
-
Deleted: wengophone/trunk/debian/patches/003_cmake-amrplugin-pic-code.patch
===================================================================
--- wengophone/trunk/debian/patches/003_cmake-amrplugin-pic-code.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/003_cmake-amrplugin-pic-code.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,26 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:47.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:21.000000000 +0000
-@@ -41,7 +41,7 @@
- ${AMRWB_INCLUDE_DIRS}
- )
-
--add_library(${AMRWB_LIBRARY} STATIC ${amrwb_SRCS})
-+add_library(${AMRWB_LIBRARY} SHARED ${amrwb_SRCS})
-
- target_link_libraries(${AMRWB_LINK_LIBRARIES})
-
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:52:27.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:51:02.000000000 +0000
-@@ -28,7 +28,7 @@
- ${AMRNB_INCLUDE_DIRS}
- )
-
--add_library(${AMRNB_LIBRARY} STATIC ${amrnb_SRCS})
-+add_library(${AMRNB_LIBRARY} SHARED ${amrnb_SRCS})
-
- target_link_libraries(${AMRNB_LINK_LIBRARIES})
-
Deleted: wengophone/trunk/debian/patches/200_no-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/200_no-crashreport.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/200_no-crashreport.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,12 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/CMakeLists.txt 2006-10-06 12:24:17.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/CMakeLists.txt 2006-10-06 12:24:25.000000000 +0000
-@@ -61,6 +61,6 @@
- libs/sipwrapper/src/phapi
- libs/imwrapper/src/multiim
- wengophone
-- crashreport
-+# crashreport
- )
-
Deleted: wengophone/trunk/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch
===================================================================
--- wengophone/trunk/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,40 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 13:33:32.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 15:29:45.000000000 +0000
-@@ -32,6 +32,35 @@
- else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
- set(_SVN_REVISION 0)
- endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
-+ else (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
-+ find_file(_DEBIAN_CHANGELOG
-+ NAMES
-+ changelog
-+ PATHS
-+ ${CMAKE_SOURCE_DIR}/debian
-+ )
-+
-+ if (_DEBIAN_CHANGELOG)
-+ message("-- Generating subversion revison using debian/changelog")
-+ execute_process(
-+ COMMAND
-+ sed -ne "1s/^[^(]*([^)]*svn\\([^)]\\+\\)-[0-9]\\+).*$/\\1/p" ${_DEBIAN_CHANGELOG}
-+ COMMAND
-+ tr -d "\\n"
-+ RESULT_VARIABLE
-+ _SVN_REVISION_RESULT_VARIABLE
-+ OUTPUT_VARIABLE
-+ _SVN_REVISION_OUTPUT_VARIABLE
-+ )
-+
-+ if (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
-+ set(_SVN_REVISION ${_SVN_REVISION_OUTPUT_VARIABLE})
-+ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
-+ set(_SVN_REVISION 0)
-+ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
-+
-+ endif (_DEBIAN_CHANGELOG)
-+
- endif (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
-
- set(${_revision}
Modified: wengophone/trunk/debian/patches/README
===================================================================
--- wengophone/trunk/debian/patches/README 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/README 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,3 +1,3 @@
-0xx: Possibly relevant for upstream adoption.
-1xx: Grabbed from upstream development.
-2xx: Only relevant for official Debian release.
+generic: Possibly relevant for upstream adoption.
+head: Grabbed from upstream development.
+debian: Only relevant for official Debian release.
Copied: wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch (from rev 2490, wengophone/trunk/debian/patches/201_cmake-svnrelease-from-debian-changelog.patch)
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch (rev 0)
+++ wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,40 @@
+Index: wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 13:33:32.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/cmake/Modules/MacroGetSubversionRevision.cmake 2006-10-06 15:29:45.000000000 +0000
+@@ -32,6 +32,35 @@
+ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
+ set(_SVN_REVISION 0)
+ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ else (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
++ find_file(_DEBIAN_CHANGELOG
++ NAMES
++ changelog
++ PATHS
++ ${CMAKE_SOURCE_DIR}/debian
++ )
++
++ if (_DEBIAN_CHANGELOG)
++ message("-- Generating subversion revison using debian/changelog")
++ execute_process(
++ COMMAND
++ sed -ne "1s/^[^(]*([^)]*svn\\([^)]\\+\\)-[0-9]\\+).*$/\\1/p" ${_DEBIAN_CHANGELOG}
++ COMMAND
++ tr -d "\\n"
++ RESULT_VARIABLE
++ _SVN_REVISION_RESULT_VARIABLE
++ OUTPUT_VARIABLE
++ _SVN_REVISION_OUTPUT_VARIABLE
++ )
++
++ if (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ set(_SVN_REVISION ${_SVN_REVISION_OUTPUT_VARIABLE})
++ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++ set(_SVN_REVISION 0)
++ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0)
++
++ endif (_DEBIAN_CHANGELOG)
++
+ endif (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
+
+ set(${_revision}
Copied: wengophone/trunk/debian/patches/debian/disable-crashreport.patch (from rev 2490, wengophone/trunk/debian/patches/200_no-crashreport.patch)
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-crashreport.patch (rev 0)
+++ wengophone/trunk/debian/patches/debian/disable-crashreport.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,12 @@
+Index: wengophone-2.0.0~rc4-svn7946/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/CMakeLists.txt 2006-10-06 12:24:17.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/CMakeLists.txt 2006-10-06 12:24:25.000000000 +0000
+@@ -61,6 +61,6 @@
+ libs/sipwrapper/src/phapi
+ libs/imwrapper/src/multiim
+ wengophone
+- crashreport
++# crashreport
+ )
+
Copied: wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch (from rev 2490, wengophone/trunk/debian/patches/003_cmake-amrplugin-pic-code.patch)
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,26 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:47.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:21.000000000 +0000
+@@ -41,7 +41,7 @@
+ ${AMRWB_INCLUDE_DIRS}
+ )
+
+-add_library(${AMRWB_LIBRARY} STATIC ${amrwb_SRCS})
++add_library(${AMRWB_LIBRARY} SHARED ${amrwb_SRCS})
+
+ target_link_libraries(${AMRWB_LINK_LIBRARIES})
+
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:52:27.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:51:02.000000000 +0000
+@@ -28,7 +28,7 @@
+ ${AMRNB_INCLUDE_DIRS}
+ )
+
+-add_library(${AMRNB_LIBRARY} STATIC ${amrnb_SRCS})
++add_library(${AMRNB_LIBRARY} SHARED ${amrnb_SRCS})
+
+ target_link_libraries(${AMRNB_LINK_LIBRARIES})
+
Copied: wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch (from rev 2490, wengophone/trunk/debian/patches/001_cmake-fix-static-phapi.patch)
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,27 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/CMakeLists.txt 2006-10-06 12:45:17.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt 2006-10-06 12:50:15.000000000 +0000
+@@ -256,7 +256,7 @@
+
+ if (UNIX AND NOT WIN32)
+ if (APPLE)
+- set(WITH_PHAPI_SHARED OFF)
++ set(WITH_SHARED_PHAPI OFF)
+
+ set(phapi_SRCS
+ ${phapi_SRCS}
+@@ -419,13 +419,6 @@
+
+ install(
+ TARGETS
+- ${PHAPI_LIBRARY}
+- DESTINATION
+- ${LIB_INSTALL_DIR}
+-)
+-
+-install(
+- TARGETS
+ phamrplugin
+ phspeexplugin
+ DESTINATION
Copied: wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch (from rev 2490, wengophone/trunk/debian/patches/002_cmake-fix-static-sfp-plugin.patch)
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,45 @@
+Index: wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:56:02.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/wifo/sfp-plugin/CMakeLists.txt 2006-10-06 12:58:31.000000000 +0000
+@@ -23,6 +23,12 @@
+ ${EXOSIP_LIBRARY}
+ )
+
++option(WITH_SHARED_SFP-PLUGIN "Build sfp-plugin as shared library" ON)
++
++if (APPLE)
++ set(WITH_SHARED_SFP-PLUGIN OFF)
++endif (APPLE)
++
+ if (MSVC)
+ set(SFP-PLUGIN_DEFINITIONS
+ -DBUILD_SFP_PLUGIN_DLL
+@@ -44,15 +50,7 @@
+ ${SFP-PLUGIN_DEFINITIONS}
+ )
+
+-if (APPLE)
+- add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
+- install(
+- TARGETS
+- ${SFP-PLUGIN_LIBRARY}
+- ARCHIVE DESTINATION
+- ${LIB_INSTALL_DIR}
+- )
+-else (APPLE)
++if (WITH_SHARED_SFP-PLUGIN)
+ add_library(${SFP-PLUGIN_LIBRARY} SHARED ${sfp-plugin_SRCS})
+ install(
+ TARGETS
+@@ -60,7 +58,9 @@
+ LIBRARY DESTINATION
+ ${LIB_INSTALL_DIR}
+ )
+-endif (APPLE)
++else (WITH_SHARED_SFP-PLUGIN)
++ add_library(${SFP-PLUGIN_LIBRARY} STATIC ${sfp-plugin_SRCS})
++endif (WITH_SHARED_SFP-PLUGIN)
+
+ target_link_libraries(${SFP-PLUGIN_LINK_LIBRARIES})
+
Copied: wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch (from rev 2490, wengophone/trunk/debian/patches/000_cmake-static-owcurl.patch)
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,39 @@
+Index: wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn7946.orig/libs/curl/CMakeLists.txt 2006-10-06 12:40:42.000000000 +0000
++++ wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt 2006-10-06 12:56:55.000000000 +0000
+@@ -30,6 +30,8 @@
+ -DUSE_OPENSSL
+ )
+
++option(WITH_SHARED_OWCURL "Build owcurl as shared library" ON)
++
+ if (APPLE)
+ find_package(ZLIB REQUIRED)
+
+@@ -122,14 +124,16 @@
+ ${OWCURL_DEFINITIONS}
+ )
+
+-add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
++if (WITH_SHARED_OWCURL)
++ add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
++ install(
++ TARGETS
++ ${OWCURL_LIBRARY}
++ DESTINATION
++ ${LIB_INSTALL_DIR}
++ )
++else (WITH_SHARED_OWCURL)
++ add_library(${OWCURL_LIBRARY} STATIC ${owcurl_SRCS})
++endif (WITH_SHARED_OWCURL)
+
+ target_link_libraries(${OWCURL_LINK_LIBRARIES})
+-
+-install(
+- TARGETS
+- ${OWCURL_LIBRARY}
+- DESTINATION
+- ${LIB_INSTALL_DIR}
+-)
+-
Added: wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch (rev 0)
+++ wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch 2006-10-09 13:43:54 UTC (rev 2531)
@@ -0,0 +1,13 @@
+Index: wengophone-2.0.0~rc4-svn7960/wifo/phapi/stun/stun.c
+===================================================================
+--- wengophone-2.0.0~rc4-svn7960.orig/wifo/phapi/stun/stun.c 2006-10-09 15:02:17.000000000 +0200
++++ wengophone-2.0.0~rc4-svn7960/wifo/phapi/stun/stun.c 2006-10-09 15:04:30.000000000 +0200
+@@ -782,7 +782,7 @@
+ #elif defined(EMBED)
+ tick = rand();
+ #else
+-# error Need some way to seed the random number generator
++ tick = time(NULL);
+ #endif
+ seed = (tick);
+ #ifdef WIN32
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-10-09 13:23:27 UTC (rev 2530)
+++ wengophone/trunk/debian/patches/series 2006-10-09 13:43:54 UTC (rev 2531)
@@ -1,6 +1,7 @@
-000_cmake-static-owcurl.patch
-001_cmake-fix-static-phapi.patch
-002_cmake-fix-static-sfp-plugin.patch
-003_cmake-amrplugin-pic-code.patch
-200_no-crashreport.patch
-201_cmake-svnrelease-from-debian-changelog.patch
+generic/cmake-static-owcurl.patch
+generic/cmake-fix-static-phapi.patch
+generic/cmake-fix-static-sfp-plugin.patch
+generic/cmake-amrplugin-pic-code.patch
+generic/stun-fix-non-i386.patch
+debian/disable-crashreport.patch
+debian/cmake-svnrelease-from-debian-changelog.patch
More information about the Pkg-voip-commits
mailing list