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

[Marco Nenciarini]

Author: mnencia
Date: 2006-10-20 08:50:46 +0000 (Fri, 20 Oct 2006)
New Revision: 2581

Added:
   wengophone/trunk/debian/patches/generic/cmake-external-speex.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/wengophone.desktop
Log:
Added translation to desktop files (help needed for better translations)
New patch generic/cmake-external-speex.patch
Prepared for upload


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-10-18 15:55:32 UTC (rev 2580)
+++ wengophone/trunk/debian/changelog	2006-10-20 08:50:46 UTC (rev 2581)
@@ -1,3 +1,12 @@
+wengophone (2.0.0~rc5-svn8108-2) unstable; urgency=low
+
+  * Added cmake-external-speex.patch to fix compilation on alpha,
+    amd64, hppa and ia64 (Closes: #394137)
+  * debian/wengophone.desktop: Merged french translation from Ubuntu,
+    added italian translation.
+
+ -- Marco Nenciarini <mnencia at debian.org>  Fri, 20 Oct 2006 10:35:43 +0200
+
 wengophone (2.0.0~rc5-svn8108-1) unstable; urgency=low
 
   * New upstream snapshot.

Added: wengophone/trunk/debian/patches/generic/cmake-external-speex.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-external-speex.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-external-speex.patch	2006-10-20 08:50:46 UTC (rev 2581)
@@ -0,0 +1,69 @@
+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-18 15:55:32 UTC (rev 2580)
+++ wengophone/trunk/debian/patches/series	2006-10-20 08:50:46 UTC (rev 2581)
@@ -3,3 +3,4 @@
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch
+generic/cmake-external-speex.patch

Modified: wengophone/trunk/debian/wengophone.desktop
===================================================================
--- wengophone/trunk/debian/wengophone.desktop	2006-10-18 15:55:32 UTC (rev 2580)
+++ wengophone/trunk/debian/wengophone.desktop	2006-10-20 08:50:46 UTC (rev 2581)
@@ -2,7 +2,10 @@
 Encoding=UTF-8
 Name=WengoPhone
 Comment=VOIP softphone
-Comment[fr]=VOIP softphone
+Comment[fr]=Logiciel de VOIP
+Comment[it]=Programma VOIP
+GenericName=VOIP softphone
+GenericName[fr]=Programma VOIP
 Exec=qtwengophone
 Icon=wengophone
 StartupNotify=true