[Pkg-voip-commits] r3755 - in wengophone/trunk/debian: . backports patches patches/generic patches/head

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Tue Jul 17 15:00:14 UTC 2007


Author: cavedon-guest
Date: 2007-07-17 15:00:13 +0000 (Tue, 17 Jul 2007)
New Revision: 3755

Added:
   wengophone/trunk/debian/backports/
   wengophone/trunk/debian/backports/etch
   wengophone/trunk/debian/backports/feisty
   wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch
   wengophone/trunk/debian/patches/generic/cmake-static-coredumper.patch
   wengophone/trunk/debian/patches/generic/desktop-file-update.patch
   wengophone/trunk/debian/patches/generic/portaudio-avoid-unnecessary-inclusion.patch
   wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch
Removed:
   wengophone/trunk/debian/dirs
   wengophone/trunk/debian/patches/generic/cmake-fix-disable-crashreport.patch
   wengophone/trunk/debian/wengophone.desktop
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/copyright
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/qtwengophone.1
   wengophone/trunk/debian/rules
   wengophone/trunk/debian/wengophone.install
   wengophone/trunk/debian/wengophone.menu
Log:
New upstream release
Manpage update
Copyright update
Backport hooks for etch and feisty


Added: wengophone/trunk/debian/backports/etch
===================================================================
--- wengophone/trunk/debian/backports/etch	                        (rev 0)
+++ wengophone/trunk/debian/backports/etch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Hook for automatic backports at buildserver.net
+#
+# Target dist: Debian Etch, Ubuntu Feisty
+
+sed -i -e 's#\(libboost-[-a-z]*-dev *( *>= *\)1.34[^)]*)#\11.33)#g' debian/control
+sed -i -e 's#libcurl4-openssl-dev[^)]*)#g++-3.4#g' debian/control
+sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
+
+exit 0

Added: wengophone/trunk/debian/backports/feisty
===================================================================
--- wengophone/trunk/debian/backports/feisty	                        (rev 0)
+++ wengophone/trunk/debian/backports/feisty	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1 @@
+link etch
\ No newline at end of file

Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/changelog	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,3 +1,34 @@
+wengophone (2.1.1.dfsg-0.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream stable release.
+  * Updated copyright file
+  * Updated build dependencies
+  * Removed dirs file (not needed)
+  * Using patched .desktop file from upstream
+  * Updated man page
+  * Added patch for Qt >= 4.2
+  * Disabling portaudio support
+  * Added patch for correct portaudio exclusion
+  * Removed cmake-fix-disable-crashreport.patch
+  * Added patch for fixing the behavior of ENABLE_CRASHREPORT=OFF
+  * Enabling crashreport and coredumper only on i386 and amd64
+  * Added patch for compiling coredumper statically
+  * Removing from orig tarball:
+    + libs/3rdparty/ffmpeg-bin-win32
+    + libs/3rdparty/pthread
+    + libs/3rdparty/glib
+    + libs/3rdparty/openssl
+  * No longer removing from orig tarball:
+    + scons code (already removed by upstream)
+    + libs/3rdparty/curl (needed for etch and feisty)
+  * Added backport script for etch and feisty:
+    + using internal libcurl
+    + changed dependence on Boost 1.33 instead of 1.34
+    + compiling with gcc/g++ 3.4 
+
+ -- Ludovico Cavedon <cavedon at sssup.it>  Mon, 16 Jul 2007 15:40:48 +0200
+
 wengophone (2.1.0.dfsg-3) unstable; urgency=low
 
   * Added patch cmake-fix-disable-crashreport to really disable

Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/control	2007-07-17 15:00:13 UTC (rev 3755)
@@ -4,15 +4,15 @@
 Maintainer: Marco Nenciarini <mnencia at debian.org>
 Build-Conflicts: qt3-dev-tools
 Build-Depends: cdbs (>= 0.4.27-1), bzip2, debhelper (>= 4.1.0), quilt,
- patchutils (>= 0.2.25), cmake, libqt4-dev, libgtk2.0-dev,
- libavcodec-dev (>= 0.cvs20060823-3.1),
- libavformat-dev (>= 0.cvs20060823-3.1), portaudio19-dev,
- libgnutls-dev, libboost-serialization-dev (>= 1.34.0-1),
- libboost-thread-dev (>= 1.34.0-1), libboost-regex-dev (>= 1.34.0-1),
- libboost-signals-dev (>= 1.34.0-1),
- libboost-program-options-dev (>= 1.34.0-1), uuid-dev, libasound2-dev,
- libspeex-dev, libssl-dev, libxml2-dev, libcurl3-openssl-dev,
- libsamplerate0-dev, libsndfile1-dev, libiaxclient-dev
+ patchutils (>= 0.2.25), cmake (>= 2.4.4), libqt4-dev (>= 4.1.4),
+ libglib2.0-dev (>= 2.10.3), libavcodec-dev (>= 0.cvs20060823-3.1),
+ libavformat-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9),
+ libboost-serialization-dev (>= 1.34.0-1), libboost-thread-dev (>= 1.34.0-1),
+ libboost-regex-dev (>= 1.34.0-1), libboost-signals-dev (>= 1.34.0-1),
+ libboost-program-options-dev (>= 1.34.0-1), uuid-dev,
+ libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
+ libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
+ libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1)
 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/copyright
===================================================================
--- wengophone/trunk/debian/copyright	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/copyright	2007-07-17 15:00:13 UTC (rev 3755)
@@ -69,3 +69,17 @@
 
 - Gaim
 published under GNU GPL
+
+- IAXClient
+Copyright (C) Mark Spencer <markster at linux-support.net>
+published under GNU LGPL
+
+- OWbuild
+Copyright (C) 2006-2007  Wengo
+published under BSD-style license
+
+- Coredumper
+Copyright (c) 2005, Google Inc.
+published under BSD-style license
+
+

Deleted: wengophone/trunk/debian/dirs
===================================================================
--- wengophone/trunk/debian/dirs	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/dirs	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wengophone
-usr/share/wengophone/lang
-usr/share/pixmaps
-usr/share/applications

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/get-orig-source.sh	2007-07-17 15:00:13 UTC (rev 3755)
@@ -70,8 +70,9 @@
 find $destdir -iname \*.lib -print0 | xargs -0 rm -vf
 
 # Remove deprecated scons code
-rm -vrf $destdir/wengoscons
-find $destdir -depth \( -iname scons\* -o -iname soptions \) -print0 | xargs -0 rm -vrf
+# already removed since upstream release 2.1.1
+#rm -vrf $destdir/wengoscons
+#find $destdir -depth \( -iname scons\* -o -iname soptions \) -print0 | xargs -0 rm -vrf
 
 # Remove outdated autotools files
 find $destdir \( -iname config.guess -o -iname config.sub \) -print0 | xargs -0 rm -vf
@@ -84,6 +85,7 @@
 
 # Remove ffmpeg code
 purge_3rdparty $destdir/libs/3rdparty/ffmpeg 
+rm -r $destdir/libs/3rdparty/ffmpeg-bin-win32
 
 # Remove speex code
 purge_3rdparty $destdir/wifo/phapi/speex
@@ -92,11 +94,21 @@
 purge_3rdparty $destdir/libs/3rdparty/samplerate
 
 # Remove curl code
-purge_3rdparty $destdir/libs/3rdparty/curl
+# libray needed for Debian etch and Ubuntu feisty
+#purge_3rdparty $destdir/libs/3rdparty/curl
 
 # Remove iaxclient code
 purge_3rdparty $destdir/libs/3rdparty/iaxclient
 
+# Remove pthread code
+purge_3rdparty $destdir/libs/3rdparty/pthread
+
+# Remove glib code
+purge_3rdparty $destdir/libs/3rdparty/glib
+
+# Remove openssl code
+purge_3rdparty $destdir/libs/3rdparty/openssl
+
 echo "Cleaning done"
 
 # Make the sources archive

Added: wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,59 @@
+diff -urNad wengophone-2.1.1~/libs/3rdparty/CMakeLists.txt wengophone-2.1.1/libs/3rdparty/CMakeLists.txt
+--- wengophone-2.1.1~/libs/3rdparty/CMakeLists.txt	2007-07-05 00:51:07.000000000 +0200
++++ wengophone-2.1.1/libs/3rdparty/CMakeLists.txt	2007-07-05 00:51:45.000000000 +0200
+@@ -57,11 +57,11 @@
+ 	#iaxclient
+ )
+ 
+-if (LINUX)
++if (LINUX AND ENABLE_CRASHREPORT)
+ 	subdirs(
+ 		coredumper
+ 	)
+-endif (LINUX)
++endif (LINUX AND ENABLE_CRASHREPORT)
+ 
+ if (NOT APPLE)
+ 	subdirs(
+diff -urNad wengophone-2.1.1~/libs/owutil/CMakeLists.txt wengophone-2.1.1/libs/owutil/CMakeLists.txt
+--- wengophone-2.1.1~/libs/owutil/CMakeLists.txt	2007-07-05 00:51:05.000000000 +0200
++++ wengophone-2.1.1/libs/owutil/CMakeLists.txt	2007-07-05 00:51:45.000000000 +0200
+@@ -32,9 +32,11 @@
+ 	http
+ )
+ 
+-if (WIN32 OR LINUX)
+-       subdirs(
+-               memorydump
+-       )
+-endif (WIN32 OR LINUX)
++if (ENABLE_CRASHREPORT)
++	if (WIN32 OR LINUX)
++	       subdirs(
++		       memorydump
++	       )
++	endif (WIN32 OR LINUX)
++endif (ENABLE_CRASHREPORT)
+ 
+diff -urNad wengophone-2.1.1~/wengophone/src/presentation/qt/CMakeLists.txt wengophone-2.1.1/wengophone/src/presentation/qt/CMakeLists.txt
+--- wengophone-2.1.1~/wengophone/src/presentation/qt/CMakeLists.txt	2007-07-05 00:51:05.000000000 +0200
++++ wengophone-2.1.1/wengophone/src/presentation/qt/CMakeLists.txt	2007-07-05 00:51:45.000000000 +0200
+@@ -23,11 +23,13 @@
+ 	owsoftupdater
+ )
+ 
+-if (MSVC OR LINUX)
+-	ow_use_private_libraries(
+-		owmemorydump
+-		)
+-endif (MSVC OR LINUX)
++if (ENABLE_CRASHREPORT)
++	if (MSVC OR LINUX)
++		ow_use_private_libraries(
++			owmemorydump
++			)
++	endif (MSVC OR LINUX)
++endif (ENABLE_CRASHREPORT)
+ 
+ if (SIPWRAPPER_BACKEND_SIPX)
+ 	ow_add_private_definitions(

Deleted: wengophone/trunk/debian/patches/generic/cmake-fix-disable-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-disable-crashreport.patch	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-disable-crashreport.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,17 +0,0 @@
-Index: wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists.txt
-===================================================================
---- wengophone-2.1.0.dfsg.orig/wengophone/src/presentation/qt/CMakeLists.txt	2007-06-05 15:34:09.000000000 +0200
-+++ wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists.txt	2007-06-05 15:39:17.000000000 +0200
-@@ -23,12 +23,6 @@
- 	owsoftupdater
- )
- 
--if (MSVC OR LINUX)
--	ow_use_private_libraries(
--		owmemorydump
--		)
--endif (MSVC OR LINUX)
--
- if (SIPWRAPPER_BACKEND_SIPX)
- 	ow_add_private_definitions(
- 		-DSIPXWRAPPER

Added: wengophone/trunk/debian/patches/generic/cmake-static-coredumper.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-static-coredumper.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-static-coredumper.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,33 @@
+Index: wengophone-2.1.1.dfsg/libs/3rdparty/coredumper/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.1.dfsg.orig/libs/3rdparty/coredumper/CMakeLists.txt	2007-07-16 16:10:04.000000000 +0200
++++ wengophone-2.1.1.dfsg/libs/3rdparty/coredumper/CMakeLists.txt	2007-07-16 16:10:32.000000000 +0200
+@@ -1,4 +1,4 @@
+-ow_create_shared_library(coredumper)
++ow_create_static_library(coredumper)
+ 
+ ow_add_sources(
+ 	src/coredumper.c
+Index: wengophone-2.1.1.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+===================================================================
+--- wengophone-2.1.1.dfsg.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-07-16 16:10:17.000000000 +0200
++++ wengophone-2.1.1.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-07-16 16:11:08.000000000 +0200
+@@ -21,12 +21,12 @@
+ 	${TMP_BUILD_DIR}/libsfp-plugin.so
+ 	DESTINATION lib${LIB_SUFFIX}/wengophone)
+ 
+-if (ENABLE_CRASHREPORT)
+-	install(PROGRAMS
+-		${TMP_BUILD_DIR}/libcoredumper.so
+-		DESTINATION lib${LIB_SUFFIX}/wengophone
+-	)
+-endif (ENABLE_CRASHREPORT)
++#if (ENABLE_CRASHREPORT)
++#	install(PROGRAMS
++#		${TMP_BUILD_DIR}/libcoredumper.so
++#		DESTINATION lib${LIB_SUFFIX}/wengophone
++#	)
++#endif (ENABLE_CRASHREPORT)
+ 
+ if (CURL_INTERNAL)
+ 	install(PROGRAMS

Added: wengophone/trunk/debian/patches/generic/desktop-file-update.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/desktop-file-update.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/desktop-file-update.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,19 @@
+Index: wengophone-2.1.1.dfsg/wengophone/res/wengophone.desktop
+===================================================================
+--- wengophone-2.1.1.dfsg.orig/wengophone/res/wengophone.desktop	2007-07-16 15:10:06.000000000 +0200
++++ wengophone-2.1.1.dfsg/wengophone/res/wengophone.desktop	2007-07-16 15:10:13.000000000 +0200
+@@ -1,8 +1,12 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=WengoPhone
+-Comment=VOIP softphone
+-Comment[fr]=Téléphone VOIP
++Comment=VoIP softphone
++Comment[fr]=Téléphone VoIP
++Comment[it]=Programma VoIP
++GenericName=VoIP softphone
++GenericName[fr]=Téléphone VoIP
++GenericName[it]=Programma VoIP
+ Exec=qtwengophone
+ Icon=wengophone
+ StartupNotify=true

Added: wengophone/trunk/debian/patches/generic/portaudio-avoid-unnecessary-inclusion.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/portaudio-avoid-unnecessary-inclusion.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/portaudio-avoid-unnecessary-inclusion.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,34 @@
+Index: wengophone-2.1.1.dfsg/libs/3rdparty/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.1.dfsg.orig/libs/3rdparty/CMakeLists.txt	2007-07-16 11:07:14.000000000 +0200
++++ wengophone-2.1.1.dfsg/libs/3rdparty/CMakeLists.txt	2007-07-16 11:07:14.000000000 +0200
+@@ -63,9 +63,9 @@
+ 	)
+ endif (LINUX AND ENABLE_CRASHREPORT)
+ 
+-if (NOT APPLE)
++if (NOT APPLE AND OWSOUND_PORTAUDIO_SUPPORT)
+ 	subdirs(
+ 		portaudio
+ 
+ 	)
+-endif (NOT APPLE)
++endif (NOT APPLE AND OWSOUND_PORTAUDIO_SUPPORT)
+Index: wengophone-2.1.1.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+===================================================================
+--- wengophone-2.1.1.dfsg.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-07-16 11:08:25.000000000 +0200
++++ wengophone-2.1.1.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-07-16 11:09:20.000000000 +0200
+@@ -34,11 +34,11 @@
+ 		DESTINATION lib${LIB_SUFFIX}/wengophone)
+ endif (CURL_INTERNAL)
+ 
+-if (PORTAUDIO_INTERNAL)
++if (PORTAUDIO_INTERNAL AND OWSOUND_PORTAUDIO_SUPPORT)
+ 	install(PROGRAMS
+ 		${TMP_BUILD_DIR}/libportaudio.so
+ 		DESTINATION lib${LIB_SUFFIX}/wengophone)
+-endif (PORTAUDIO_INTERNAL)
++endif (PORTAUDIO_INTERNAL AND OWSOUND_PORTAUDIO_SUPPORT)
+ 
+ install(DIRECTORY
+ 	${TMP_BUILD_DIR}/lang

Added: wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch
===================================================================
--- wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch	2007-07-17 15:00:13 UTC (rev 3755)
@@ -0,0 +1,18 @@
+diff -urNad wengophone-2.1.1~/libs/qtutil/src/QObjectThreadSafe.cpp wengophone-2.1.1/libs/qtutil/src/QObjectThreadSafe.cpp
+--- wengophone-2.1.1~/libs/qtutil/src/QObjectThreadSafe.cpp	2006-08-12 00:15:03.000000000 +0200
++++ wengophone-2.1.1/libs/qtutil/src/QObjectThreadSafe.cpp	2007-07-04 10:59:41.000000000 +0200
+@@ -20,10 +20,13 @@
+ #include <qtutil/QObjectThreadSafe.h>
+ 
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QThread>
+ 
+ QObjectThreadSafe::QObjectThreadSafe(QObject * parent)
+ 	: QObject(parent) {
+-
++	assert(!parent || parent->thread() == QThread::currentThread());
++	if(!parent)
++	  moveToThread(QCoreApplication::instance()->thread());
+ 	_blockEvents = false;
+ }
+ 

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/patches/series	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,4 +1,8 @@
-generic/cmake-fix-disable-crashreport.patch
+head/qobjectthreadsafe-fix-qt42.patch
+generic/cmake-fix-ENABLE_CRASHREPORT.patch
+generic/cmake-static-coredumper.patch
+generic/portaudio-avoid-unnecessary-inclusion.patch
+generic/desktop-file-update.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
 debian/cmake-force-fpic.patch

Modified: wengophone/trunk/debian/qtwengophone.1
===================================================================
--- wengophone/trunk/debian/qtwengophone.1	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/qtwengophone.1	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,13 +1,11 @@
-.TH "qtwengophone" "1" "August 2006" "Wengophone" "User Commands"
+.TH "qtwengophone" "1" "16 July 2007" "Wengophone" "User Commands"
 .SH "NAME"
-.LP 
 wengophone \- SIP-based software telephone with video and chat features
 internet phone.
-.SH "SYNTAX"
-.LP 
-wengophone
+.SH "SYNOPSIS"
+.B qtwengophone
+.RI [ options ]
 .SH "DESCRIPTION"
-.LP 
 WengoPhone is a Voice over IP application based on standard protocols like
 SIP and RTP. It enables voice, video and text chat between two clients.
 Features include a contact list with presence and status, call history and
@@ -16,21 +14,32 @@
 In conjunction with other services, WengoPhone can be used to call regular
 PSTN lines and/or send SMS messages to cell phones.
 .SH "OPTIONS"
-.LP
-The program has no command line options. Everything is configured from the
-property box.
+.TP
+.B -h, --help
+Print usage message.
+.TP
+.B -b, --background
+Run in background mode.
+.TP
+.B -s, --several
+Allow several WengoPhone at the same time.
+.TP
+.B -q, --configpath \fIarg\fP
+Pass a path to load configuration directory.
+.TP
+.B -c, --command \fIarg\fP
+Pass a command to the wengophone.
 .SH "FILES"
-.LP 
-\fI~/.wengo/\fP 
+.TP
+.I ~/.wengophone/
 This is where wengophone reads its config information. You do not have to
 modify or edit this file.
-.br 
 .SH "SEE ALSO"
-.LP
 http://www.openwengo.org/
 .SH "AUTHORS"
-.LP 
 Wengo Development Team <wengophone-devel at lists.openwengo.com>
 .PP
 This manual page was written by Marco Nenciarini <mnencia at debian.org> for
 the Debian project (but may be used by others).  
+.PP
+This manual page was updated by Ludovico Cavedon <cavedon at sssup.it>.

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/rules	2007-07-17 15:00:13 UTC (rev 3755)
@@ -7,16 +7,25 @@
 DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
 DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DCMAKE_INSTALL_RPATH=/usr/lib/wengophone \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-	-DPORTAUDIO_INTERNAL=OFF \
+	-DOWSOUND_PORTAUDIO_SUPPORT=OFF \
 	-DFFMPEG_INTERNAL=OFF \
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
-	-DCURL_INTERNAL=OFF \
-	-DIAXCLIENT_INTERNAL=OFF \
-	-DENABLE_CRASHREPORT=OFF
+	-DCURL_INTERNAL=OFF
+
+
+ifeq ($(DEB_HOST_ARCH), i386)
+        DEB_CMAKE_EXTRA_FLAGS += -DENABLE_CRASHREPORT=ON
+else
+        ifeq ($(DEB_HOST_ARCH), amd64)
+                DEB_CMAKE_EXTRA_FLAGS += -DENABLE_CRASHREPORT=ON
+        else
+                DEB_CMAKE_EXTRA_FLAGS += -DENABLE_CRASHREPORT=OFF
+        endif
+endif
+
+
 # Avoid postinst-has-useless-call-to-ldconfig
 DEB_DH_MAKESHLIBS_ARGS_wengophone := -n
 
@@ -25,7 +34,7 @@
 UPVERSION:=$(shell echo $(SRCVERSION) | sed -e 's/-svn.*$$//' -e 's/.dfsg.*$$//')
 SVNVERSION:=$(shell echo $(DEBVERSION) | grep svn | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
 
-SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-05-15-wengophone-2.1.0
+SVNREP:=http://dev.openwengo.org/svn/openwengo/wengophone-ng/tags/release/2.1/2007-06-21-wengophone-2.1.1
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"

Deleted: wengophone/trunk/debian/wengophone.desktop
===================================================================
--- wengophone/trunk/debian/wengophone.desktop	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/wengophone.desktop	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=WengoPhone
-Comment=VOIP softphone
-Comment[fr]=Logiciel de VOIP
-Comment[it]=Programma VOIP
-GenericName=VOIP softphone
-GenericName[fr]=Programma VOIP
-Exec=qtwengophone
-Icon=wengophone
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Qt;Network;

Modified: wengophone/trunk/debian/wengophone.install
===================================================================
--- wengophone/trunk/debian/wengophone.install	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/wengophone.install	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,2 +1 @@
-debian/wengophone.desktop usr/share/applications
 debian/wengophone.xpm usr/share/pixmaps

Modified: wengophone/trunk/debian/wengophone.menu
===================================================================
--- wengophone/trunk/debian/wengophone.menu	2007-07-17 14:12:37 UTC (rev 3754)
+++ wengophone/trunk/debian/wengophone.menu	2007-07-17 15:00:13 UTC (rev 3755)
@@ -1,4 +1,4 @@
 ?package(wengophone):needs="X11" section="Apps/Net"\
   command="/usr/bin/qtwengophone"\
-  title="Wengophone" icon="/usr/share/pixmaps/wengophone.xpm"\
+  title="WengoPhone" icon="/usr/share/pixmaps/wengophone.xpm"\
   longtitle="SIP-based software telephone with video and chat features"




More information about the Pkg-voip-commits mailing list