[Pkg-voip-commits] r2583 - in wengophone/trunk/debian: . patches patches/debian patches/generic

Marco Nenciarini mnencia at costa.debian.org
Fri Oct 20 15:32:33 UTC 2006 

Author: mnencia
Date: 2006-10-20 15:32:32 +0000 (Fri, 20 Oct 2006)
New Revision: 2583

Removed:
   wengophone/trunk/debian/patches/generic/cmake-external-speex.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/patches/debian/disable-crashreport.patch
   wengophone/trunk/debian/patches/debian/disable-ilbc.patch
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/rules
Log:
New upstream, this may wor^Wcompile on all arches.
Prepared for upload. Urgency medium.


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/changelog	2006-10-20 15:32:32 UTC (rev 2583)
@@ -1,3 +1,15 @@
+wengophone (2.0.0~rc5-svn8137-1) unstable; urgency=medium
+
+  * New upstream snapshot. Switched to branches/wengophone-2.0
+  * debian/get-orig-source.sh: Stripped wifo/phapi/speex from the
+    source tarball.
+  * debian/rules: passes CMAKE_SKIP_BUILD_RPATH to cmake to avoid
+    linking executable twice.
+  * Removed cmake-external-speex patch (fixed upstream)
+  * Urgency medium to try to go into testing before freeze.
+
+ -- Marco Nenciarini <mnencia at debian.org>  Fri, 20 Oct 2006 17:29:28 +0200
+
 wengophone (2.0.0~rc5-svn8108-2) unstable; urgency=low
 
   * Added cmake-external-speex.patch to fix compilation on alpha,

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/get-orig-source.sh	2006-10-20 15:32:32 UTC (rev 2583)
@@ -81,6 +81,9 @@
 # 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/disable-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-crashreport.patch	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/patches/debian/disable-crashreport.patch	2006-10-20 15:32:32 UTC (rev 2583)
@@ -1,11 +1,12 @@
-Index: wengophone-2.0.0~rc5-svn8108/CMakeLists.txt
+Index: wengophone-2.0.0~rc5-svn8137/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/CMakeLists.txt	2006-10-18 16:31:45.000000000 +0200
-@@ -60,5 +60,5 @@
+--- 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	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2006-10-20 15:32:32 UTC (rev 2583)
@@ -1,19 +1,19 @@
-Index: wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt
+Index: wengophone-2.0.0~rc5-svn8137/wifo/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/wifo/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt	2006-10-18 16:31:57.000000000 +0200
-@@ -20,7 +20,6 @@
+--- 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/speex
    phapi/speexec
    phapi/stun
-Index: wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt
+   phapi
+Index: wengophone-2.0.0~rc5-svn8137/wifo/phapi/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/wifo/phapi/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt	2006-10-18 16:31:57.000000000 +0200
+--- 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
 @@ -7,7 +7,6 @@
    ${OSIP2_INCLUDE_DIRS}
    ${EXOSIP_INCLUDE_DIRS}
@@ -22,7 +22,7 @@
    ${STUN_INCLUDE_DIRS}
    ${GSM_INCLUDE_DIRS}
    ${OWUTIL_INCLUDE_DIRS}
-@@ -39,7 +38,6 @@
+@@ -32,7 +31,6 @@
    ${OSIP2_LIBRARY}
    ${EXOSIP_LIBRARY}
    ${ORTP_LIBRARY}
@@ -30,7 +30,7 @@
    ${STUN_LIBRARY}
    ${GSM_LIBRARY}
    ${PHAPI-UTIL_LIBRARY}
-@@ -68,7 +66,6 @@
+@@ -54,7 +52,6 @@
    -DUSE_WAVEIN_CBK=1
    -DPSEUDO_AEC=0
    -DNO_ECHO__SUPPRESSOR=1

Deleted: wengophone/trunk/debian/patches/generic/cmake-external-speex.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-external-speex.patch	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/patches/generic/cmake-external-speex.patch	2006-10-20 15:32:32 UTC (rev 2583)
@@ -1,69 +0,0 @@
-Index: wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/wifo/phapi/CMakeLists.txt	2006-10-20 08:28:15.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt	2006-10-20 10:10:58.000000000 +0200
-@@ -456,11 +456,11 @@
- target_link_libraries(phamrplugin)
- 
- # speex
--#find_package(Speex REQUIRED)
-+find_package(Speex REQUIRED)
- include_directories(${SPEEX_INCLUDE_DIRS})
- macro_add_plugin(phspeexplugin ${phapi_speex_plugin_SRCS})
- macro_add_compile_flags(phspeexplugin ${PHAPI_OPTIMIZATION_FLAGS})
--target_link_libraries(phspeexplugin ${SPEEX_LIBRARY})
-+target_link_libraries(phspeexplugin ${SPEEX_LIBRARIES})
- 
- install(
-   TARGETS
-Index: wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/wifo/CMakeLists.txt	2006-10-20 08:28:39.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt	2006-10-20 08:29:34.000000000 +0200
-@@ -11,6 +11,12 @@
-   )
- endif (MSVC)
- 
-+if (WIN32)
-+  subdirs(
-+    phapi/speex
-+  )
-+endif (WIN32)
-+
- subdirs(
-   libosip2
-   eXosip
-@@ -20,7 +26,6 @@
-   phapi-util
-   phapi/fidlib
-   phapi/gsm
--  phapi/speex
-   phapi/speexec
-   phapi/stun
-   phapi
-Index: wengophone-2.0.0~rc5-svn8108/wifo/phapi/speex/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc5-svn8108.orig/wifo/phapi/speex/CMakeLists.txt	2006-10-20 10:10:01.000000000 +0200
-+++ wengophone-2.0.0~rc5-svn8108/wifo/phapi/speex/CMakeLists.txt	2006-10-20 10:11:00.000000000 +0200
-@@ -21,13 +21,13 @@
- endif (APPLE)
- 
- 
--set(SPEEX_LIBRARY
-+set(SPEEX_LIBRARIES
-   speex
-   CACHE INTERNAL "speex library"
- )
- 
- set(SPEEX_LINK_LIBRARIES
--  ${SPEEX_LIBRARY}
-+  ${SPEEX_LIBRARIES}
- )
- 
- set(speex_SRCS
-@@ -72,4 +72,4 @@
- 
- include_directories(${SPEEX_INCLUDE_DIRS})
- 
--add_library(${SPEEX_LIBRARY} STATIC ${speex_SRCS})
-+add_library(${SPEEX_LIBRARIES} STATIC ${speex_SRCS})

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/patches/series	2006-10-20 15:32:32 UTC (rev 2583)
@@ -3,4 +3,3 @@
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch
-generic/cmake-external-speex.patch

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2006-10-20 10:04:30 UTC (rev 2582)
+++ wengophone/trunk/debian/rules	2006-10-20 15:32:32 UTC (rev 2583)
@@ -5,14 +5,15 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
-DEB_CMAKE_EXTRA_FLAGS := -DWITH_BUILDID=ON -DWITH_SHARED_PHAPI=OFF \
+DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_BUILD_RPATH=ON \
+	-DWITH_BUILDID=ON -DWITH_SHARED_PHAPI=OFF \
 	-DWITH_SHARED_OWCURL=OFF -DWITH_SHARED_SFP-PLUGIN=OFF
 
 DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 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/trunk
+SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/branches/wengophone-2.0
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"

More information about the Pkg-voip-commits mailing list