[Pkg-voip-commits] r3182 - in wengophone/trunk/debian: . patches
patches/debian patches/generic
Marco Nenciarini
mnencia at alioth.debian.org
Wed Feb 28 18:45:21 CET 2007
Author: mnencia
Date: 2007-02-28 18:45:20 +0100 (Wed, 28 Feb 2007)
New Revision: 3182
Removed:
wengophone/trunk/debian/patches/debian/disable-crashreport.patch
wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/control
wengophone/trunk/debian/get-orig-source.sh
wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
wengophone/trunk/debian/patches/debian/disable-ilbc.patch
wengophone/trunk/debian/patches/series
wengophone/trunk/debian/rules
Log:
Switched to new 2.1 branch
The resulting package is lintian/linda ugly, but this is the first step.
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/changelog 2007-02-28 17:45:20 UTC (rev 3182)
@@ -1,3 +1,15 @@
+wengophone (2.1.0~beta1-svn9983-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot. Switched to branches/wengophone-2.1
+ * Removed patches
+ + disable-crashreport
+ + cmake-fix-static-sfp-plugin
+ * debian/control: Build-depends on libcurl3-openssl-dev,
+ libsamplerate0-dev and libsndfile1-dev
+ * Modified get-orig-source.sh to match the new source tree
+
+ -- Marco Nenciarini <mnencia at debian.org> Wed, 28 Feb 2007 18:35:34 +0100
+
wengophone (2.0.0~rc5-svn8768-1) UNRELEASED; urgency=low
* New upstream snapshot.
Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/control 2007-02-28 17:45:20 UTC (rev 3182)
@@ -9,7 +9,8 @@
libboost-serialization-dev (>= 1.33.1-5), libboost-thread-dev (>= 1.33.1-5),
libboost-regex-dev (>= 1.33.1-5), libboost-signals-dev (>= 1.33.1-5),
libboost-program-options-dev (>= 1.33.1-5), uuid-dev, libasound2-dev,
- libspeex-dev, libssl-dev, libxml2-dev
+ libspeex-dev, libssl-dev, libxml2-dev, libcurl3-openssl-dev,
+ libsamplerate0-dev, libsndfile1-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/get-orig-source.sh 2007-02-28 17:45:20 UTC (rev 3182)
@@ -46,44 +46,24 @@
echo "Uptodate source found ($destdir), skipping download."
else
echo -n "Downloading sources... "
- mkdir -p $destdir
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/crashreport $destdir/crashreport
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/wengophone $destdir/wengophone
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/libs $destdir/libs
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/wifo $destdir/wifo
- # new CMake build system
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/cmake $destdir/cmake
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/CMakeLists.txt $destdir/CMakeLists.txt
+ svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url $destdir
echo "done."
fi
-# Remove binaries
+# Cleaning tree
echo "Cleaning tree to remove anything not needed for non-Windows builds..."
rm -vrf $destdir/wengophone/together
-find $destdir -iname scons\* | xargs rm -vf
+rm -vrf $destdir/wengophone/nsis
+rm -vrf $destdir/wengoscons
+find $destdir -iname scons\* | xargs rm -vrf
find $destdir -iname config.guess -o -iname config.sub | xargs rm -vf
find $destdir -iname \*.dll | xargs rm -vf
find $destdir -iname \*.lib | xargs rm -vf
-find $destdir -iname \*.pdf | xargs rm -vf
-find $destdir -iname \*.jpg | xargs rm -vf
-find $destdir -iname \*.html | xargs rm -vf
echo "Cleaning done"
-# Remove ffmpeg and openssl
-rm -rf $destdir/libs/3rdparty
-rm -rf $destdir/libs/ffmpeg
-rm -rf $destdir/libs/openssl/inc32
-rm -rf $destdir/libs/openssl/out32
-
-# Remove portaudio
-rm -fr $destdir/libs/portaudio
-
# Remove iLBC codec
rm -rf $destdir/wifo/phapi/ilbc
-# Remove speex
-rm -rf $destdir/wifo/phapi/speex
-
# Make the sources archive
echo -n "Writing archive... "
tar cf $desttar $destdir
Modified: wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch 2007-02-28 17:45:20 UTC (rev 3182)
@@ -1,40 +1,40 @@
-Index: wengophone-2.0.0~rc5-svn8768/cmake/Modules/MacroGetSubversionRevision.cmake
+Index: wengophone-2.1.0~beta1-svn9961/owbuild/owbuild/OWGetSvnRevision.cmake
===================================================================
---- wengophone-2.0.0~rc5-svn8768.orig/cmake/Modules/MacroGetSubversionRevision.cmake 2006-12-29 00:33:42.000000000 +0100
-+++ wengophone-2.0.0~rc5-svn8768/cmake/Modules/MacroGetSubversionRevision.cmake 2006-12-29 00:34:38.000000000 +0100
-@@ -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
-+ )
+--- wengophone-2.1.0~beta1-svn9961.orig/owbuild/owbuild/OWGetSvnRevision.cmake 2007-02-19 13:53:54.000000000 +0100
++++ wengophone-2.1.0~beta1-svn9961/owbuild/owbuild/OWGetSvnRevision.cmake 2007-02-26 17:03:51.000000000 +0100
+@@ -53,7 +53,34 @@
+ set(${revision} 0)
+ endif (SVN_REVISION_RESULT_VARIABLE EQUAL 0)
+ else (SVNVERSION_EXECUTABLE AND SVN_DOT_DIR)
+- message("Subversion svn command line not found, it is recommended to install it")
++ 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 (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 AND _SVN_REVISION_OUTPUT_VARIABLE)
-+ set(_SVN_REVISION ${_SVN_REVISION_OUTPUT_VARIABLE})
-+ else (_SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND _SVN_REVISION_OUTPUT_VARIABLE)
-+ message(FATAL_ERROR "FATAL: cannot generate svn revision number from debian/changelog")
-+ endif (_SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND _SVN_REVISION_OUTPUT_VARIABLE)
++ if (SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND SVN_REVISION_OUTPUT_VARIABLE)
++ set(${revision} ${SVN_REVISION_OUTPUT_VARIABLE})
++ else (SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND SVN_REVISION_OUTPUT_VARIABLE)
++ message(FATAL_ERROR "FATAL: cannot generate svn revision number from debian/changelog")
++ endif (SVN_REVISION_RESULT_VARIABLE EQUAL 0 AND SVN_REVISION_OUTPUT_VARIABLE)
+
-+ endif (_DEBIAN_CHANGELOG)
++ endif (DEBIAN_CHANGELOG)
+
- endif (_SVN_EXECUTEABLE AND _SVN_DOT_DIR)
+ endif (SVNVERSION_EXECUTABLE AND SVN_DOT_DIR)
- set(${_revision}
+ endmacro (ow_get_svn_revision revision)
Deleted: wengophone/trunk/debian/patches/debian/disable-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-crashreport.patch 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/patches/debian/disable-crashreport.patch 2007-02-28 17:45:20 UTC (rev 3182)
@@ -1,12 +0,0 @@
-Index: wengophone-2.0.0~rc5-svn8137/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc5-svn8137.orig/CMakeLists.txt 2006-10-09 02:59:06.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8137/CMakeLists.txt 2006-10-20 15:48:03.000000000 +0200
-@@ -59,6 +59,6 @@
- libs/sipwrapper/src/phapi
- libs/imwrapper/src/multiim
- wengophone
-- crashreport
-+# crashreport
- )
-
Modified: wengophone/trunk/debian/patches/debian/disable-ilbc.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-ilbc.patch 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/patches/debian/disable-ilbc.patch 2007-02-28 17:45:20 UTC (rev 3182)
@@ -1,40 +1,32 @@
-Index: wengophone-2.0.0~rc5-svn8137/wifo/CMakeLists.txt
+Index: wengophone-2.1.0~beta1-svn9983/wifo/CMakeLists.txt
===================================================================
---- wengophone-2.0.0~rc5-svn8137.orig/wifo/CMakeLists.txt 2006-10-20 15:32:00.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8137/wifo/CMakeLists.txt 2006-10-20 15:49:37.000000000 +0200
-@@ -40,7 +40,6 @@
- phapi-util
- phapi/fidlib
- phapi/gsm
-- phapi/ilbc
- phapi/speexec
- phapi/stun
- phapi
-Index: wengophone-2.0.0~rc5-svn8137/wifo/phapi/CMakeLists.txt
+--- wengophone-2.1.0~beta1-svn9983.orig/wifo/CMakeLists.txt 2007-01-15 14:02:10.000000000 +0000
++++ wengophone-2.1.0~beta1-svn9983/wifo/CMakeLists.txt 2007-02-28 14:17:43.000000000 +0000
+@@ -41,7 +41,6 @@
+ phapi/gsm
+ phapi/amrnb
+ phapi/amrwb
+- phapi/ilbc
+ phapi/speex
+ phapi/speexec
+ phapi/stun
+Index: wengophone-2.1.0~beta1-svn9983/wifo/phapi/CMakeLists.txt
===================================================================
---- wengophone-2.0.0~rc5-svn8137.orig/wifo/phapi/CMakeLists.txt 2006-10-20 15:32:00.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8137/wifo/phapi/CMakeLists.txt 2006-10-20 15:48:59.000000000 +0200
+--- wengophone-2.1.0~beta1-svn9983.orig/wifo/phapi/CMakeLists.txt 2007-02-28 09:48:11.000000000 +0000
++++ wengophone-2.1.0~beta1-svn9983/wifo/phapi/CMakeLists.txt 2007-02-28 14:18:49.000000000 +0000
@@ -7,7 +7,6 @@
- ${OSIP2_INCLUDE_DIRS}
- ${EXOSIP_INCLUDE_DIRS}
- ${ORTP_INCLUDE_DIRS}
-- ${ILBC_INCLUDE_DIRS}
- ${STUN_INCLUDE_DIRS}
- ${GSM_INCLUDE_DIRS}
- ${OWUTIL_INCLUDE_DIRS}
-@@ -32,7 +31,6 @@
- ${OSIP2_LIBRARY}
- ${EXOSIP_LIBRARY}
- ${ORTP_LIBRARY}
-- ${ILBC_LIBRARY}
- ${STUN_LIBRARY}
- ${GSM_LIBRARY}
- ${PHAPI-UTIL_LIBRARY}
-@@ -54,7 +52,6 @@
- -DUSE_WAVEIN_CBK=1
- -DPSEUDO_AEC=0
- -DNO_ECHO__SUPPRESSOR=1
-- -DENABLE_ILBC=1
- -DOSIP_MT=1
- -DENABLE_TRACE=0
- -DPH_VIDEO_USELOCK=1
+ ow_use_private_libraries(
+ osip2
+ ortp
+- ilbc
+ stun
+ gsm
+ owutil
+@@ -41,7 +40,6 @@
+ -DUSE_WAVEIN_CBK=1
+ -DPSEUDO_AEC=0
+ -DNO_ECHO__SUPPRESSOR=1
+- -DENABLE_ILBC=1
+ # -DOSIP_MT=1
+ # -DENABLE_TRACE=0
+ -DPH_VIDEO_USELOCK=1
Deleted: wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-static-sfp-plugin.patch 2007-02-28 17:45:20 UTC (rev 3182)
@@ -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})
-
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/patches/series 2007-02-28 17:45:20 UTC (rev 3182)
@@ -1,4 +1,2 @@
-generic/cmake-fix-static-sfp-plugin.patch
-debian/disable-crashreport.patch
debian/cmake-svnrelease-from-debian-changelog.patch
debian/disable-ilbc.patch
Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules 2007-02-26 13:58:32 UTC (rev 3181)
+++ wengophone/trunk/debian/rules 2007-02-28 17:45:20 UTC (rev 3182)
@@ -13,7 +13,7 @@
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
SVNVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
-SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/branches/wengophone-2.0
+SVNREP:=https://dev.openwengo.com/svn/openwengo/wengophone-ng/branches/wengophone-2.1
print-version:
@@echo "Debian version: $(DEBVERSION)"
More information about the Pkg-voip-commits
mailing list