[Pkg-voip-commits] r6506 - in /qutecom/trunk/debian: ./ backports/ patches/ patches/debian/ patches/generic/ patches/head/
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Tue Nov 25 18:52:10 UTC 2008
Author: cavedon-guest
Date: Tue Nov 25 18:52:10 2008
New Revision: 6506
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6506
Log:
Qutecom now building, but still some issues with RPATH
Added:
qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch
qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch
qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch
qutecom/trunk/debian/patches/generic/install-qutecom.patch (with props)
qutecom/trunk/debian/qutecom.1 (contents, props changed)
- copied, changed from r6502, qutecom/trunk/debian/qtwengophone.1
qutecom/trunk/debian/qutecom.install (contents, props changed)
- copied, changed from r6502, qutecom/trunk/debian/wengophone.install
qutecom/trunk/debian/qutecom.manpages (contents, props changed)
- copied, changed from r6502, qutecom/trunk/debian/wengophone.manpages
qutecom/trunk/debian/qutecom.menu (contents, props changed)
- copied, changed from r6502, qutecom/trunk/debian/wengophone.menu
qutecom/trunk/debian/qutecom.xpm (contents, props changed)
- copied, changed from r6502, qutecom/trunk/debian/wengophone.xpm
Removed:
qutecom/trunk/debian/backports/
qutecom/trunk/debian/cmake.mk
qutecom/trunk/debian/patches/debian/cmake-find-boost-1.34.0.patch
qutecom/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch
qutecom/trunk/debian/patches/generic/def-enable-video-fix.patch
qutecom/trunk/debian/patches/generic/gcc-4_3.patch
qutecom/trunk/debian/patches/generic/memory-dump-fix-double-dump.patch
qutecom/trunk/debian/patches/generic/memory-dump-tmp-path.patch
qutecom/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch
qutecom/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch
qutecom/trunk/debian/patches/head/alsa-plughw-default.patch
qutecom/trunk/debian/patches/head/cmake-swscale.patch
qutecom/trunk/debian/patches/head/ffmpeg-swscale-api.patch
qutecom/trunk/debian/patches/head/img_resample.patch
qutecom/trunk/debian/patches/head/phapi-alsa-code-from-2.2.patch
qutecom/trunk/debian/patches/head/qt-fix-bad-window-size.patch
qutecom/trunk/debian/qtwengophone.1
qutecom/trunk/debian/wengophone.install
qutecom/trunk/debian/wengophone.manpages
qutecom/trunk/debian/wengophone.menu
qutecom/trunk/debian/wengophone.xpm
Modified:
qutecom/trunk/debian/changelog
qutecom/trunk/debian/control
qutecom/trunk/debian/copyright
qutecom/trunk/debian/get-orig-source.sh
qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch
qutecom/trunk/debian/patches/generic/desktop-file-update.patch
qutecom/trunk/debian/patches/series
qutecom/trunk/debian/rules
Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Tue Nov 25 18:52:10 2008
@@ -1,3 +1,23 @@
+qutecom (2.2~rc2.dfsg0-1) UNRELEASED; urgency=low
+
+ * New upstream version. Closes: #502151
+ * Renaming wengophone as qutecom
+ * Updating get-orig-source.sh to get source code from Mercurial web interface
+ * Renaming/updating files for: manpage, menu item/icon, copyright
+ * Removing stale backport scripts
+ * Removed most of the patches (merged upstream or no longer useful)
+ * Added patches:
+ - debian/install-qutecom.patch: to install files in /usr/{lib,share}/qutecom
+ - generic/googlebreakpad-64bit.patch: to disable memory dumper on
+ architectures different from i386
+ - generic/cmake-repo-revision-quotes.patch: to handle the absence of an hg
+ revision number during build
+ - generic/getcurrentdatetime.patch: to fix a compilation bug of a build tool
+ * Using cdbs cmake.mk, instead of a custom one
+ * Updating Standards-Version to 3.8.0
+
+ -- Ludovico Cavedon <cavedon at sssup.it> Sat, 22 Nov 2008 17:54:50 -0800
+
wengophone (2.1.2.dfsg0-6) unstable; urgency=low
* Removed debian/cmake-no-soname-shlibs.patch. Closes: #486948
Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Tue Nov 25 18:52:10 2008
@@ -1,4 +1,4 @@
-Source: wengophone
+Source: qutecom
Section: net
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
@@ -15,36 +15,35 @@
libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
dpkg-dev (>= 1.13.19), libx11-dev, python-dev
Build-Conflicts: qt3-dev-tools
-Standards-Version: 3.7.3
-Homepage: http://www.openwengo.org/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/wengophone/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/wengophone/?op=log
+Standards-Version: 3.8.0
+Homepage: http://www.qutecom.org/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/qutecom/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/qutecom/?op=log
-Package: wengophone
+Package: qutecom
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: wengophone
Description: SIP-based software telephone with video and chat features
- WengoPhone is a Voice-over-IP application based on standard protocols like SIP
+ QuteCom 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 multi-protocol presence and status, call history
and NAT traversal capability.
.
- In conjunction with commercial services provided from Wengo
- (http://www.wengo.fr), WengoPhone can be used to call regular PSTN lines
- and/or send SMS messages to cell phones.
+ QuteCom is the new name of the WengoPhone project, after it was dropped by
+ Wengo and taken on by MBDsys.
-Package: wengophone-dbg
+Package: qutecom-dbg
Architecture: any
Priority: extra
-Depends: wengophone (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: qutecom (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SIP-based software telephone with video and chat features
- WengoPhone is a Voice-over-IP application based on standard protocols like SIP
+ QuteCom 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 multi-protocol presence and status, call history
and NAT traversal capability.
.
- In conjunction with commercial services provided from Wengo
- (http://www.wengo.fr), WengoPhone can be used to call regular PSTN lines
- and/or send SMS messages to cell phones.
+ QuteCom is the new name of the WengoPhone project, after it was dropped by
+ Wengo and taken on by MBDsys.
.
- This package contains debug symbols, useful to debug wengophone.
+ This package contains debug symbols, useful to debug qutecom.
Modified: qutecom/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/copyright?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/copyright (original)
+++ qutecom/trunk/debian/copyright Tue Nov 25 18:52:10 2008
@@ -1,10 +1,12 @@
-This package was debianized by Marco Nenciarini <mnencia at debian.org> on
+This package wes debianized by Ludovico Cavedon <cavedon at sssup.it> on
+Sat, 22 Nov 2008 21:39:19 -0800, based on the Debian package for wengophone,
+created by Marco Nenciarini <mnencia at debian.org> on
Mon, 6 Feb 2006 10:54:04 +0100.
It was downloaded from
-http://dev.openwengo.com/svn/openwengo/softphone-classic
+http://www.qutecom.org/
-Copyright Holder: Wengo Development Team <wengophone-devel at lists.openwengo.com>
+Copyright Holder: QuteCom Development Team <qutecom-dev at lists.qutecom.org>
License:
Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Tue Nov 25 18:52:10 2008
@@ -3,32 +3,26 @@
set -e
-if [ -z "$1" ] || [ -z "$2" ]; then
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
echo "Missing parameter"
- echo "Usage: $0 version repository [revision]"
+ echo "Usage: $0 version hg_branch hg_tag"
echo
exit 1;
fi
+
version=$1
-svn_url=$2
+hg_branch=$2
+hg_tag=$3
-# ugly hack to install dev.openwengo.com certificate
-if ! svn --password guest --username guest --non-interactive info https://dev.openwengo.com/svn/openwengo > /dev/null; then
- echo "p" | svn --password guest --username guest info https://dev.openwengo.com/svn/openwengo > /dev/null
-fi
-
-if [ -n "$3" ]; then
- svn_rev="$3"
-else
- # Retrive latest svn verion numbers
- svn_rev=$(LANG=C svn --password guest --username guest --non-interactive info $svn_url | \
- awk '/Last Changed Rev:/ {print $4}')
-fi
+hg_filename="$hg_tag.tar.bz2"
+hg_dirname="$(echo -n $hg_branch | tr -s '.' '-')-$hg_tag"
+hg_url="http://hg.qutecom.org/$hg_branch/archive/$hg_filename"
+echo $hg_dirname
curdir="$PWD"
-destdir=wengophone-$version
-desttar=wengophone_$version.orig.tar
+destdir=qutecom-$version
+desttar=qutecom_$version.orig.tar
if [ -d "$curdir/../tarballs" ]; then
finaldir=$curdir/../tarballs
@@ -46,12 +40,15 @@
cd $workdir
-# Download sources from svn
+# Download sources
if [ -d $destdir ]; then
echo "Uptodate source found ($destdir), skipping download."
else
echo -n "Downloading sources... "
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url $destdir
+ wget "$hg_url"
+ tar jxf "$hg_filename"
+ mv "$hg_dirname" "$destdir"
+ rm "$hg_filename"
echo "done."
fi
@@ -68,16 +65,11 @@
echo "Cleaning tree to remove anything not needed for non-Windows builds..."
# Remove windows binary stuff
-rm -vrf $destdir/wengophone/together
rm -vrf $destdir/wengophone/nsis
rm -vrf $destdir/libs/3rdparty/*/binary-lib
find $destdir -iname \*.dll -print0 | xargs -0 rm -vf
find $destdir -iname \*.lib -print0 | xargs -0 rm -vf
-# Remove deprecated scons code
-# 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
@@ -99,8 +91,8 @@
purge_3rdparty $destdir/libs/3rdparty/samplerate
# Remove curl code
-# libray needed for Debian etch and Ubuntu feisty
-#purge_3rdparty $destdir/libs/3rdparty/curl
+# note: libray needed for Debian etch and Ubuntu feisty
+purge_3rdparty $destdir/libs/3rdparty/curl
# Remove iaxclient code
purge_3rdparty $destdir/libs/3rdparty/iaxclient
Modified: qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Tue Nov 25 18:52:10 2008
@@ -1,12 +1,12 @@
-Index: wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
---- wengophone-2.1.0.dfsg.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2007-05-18 12:39:05.000000000 +0200
-+++ wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2007-05-18 12:39:15.000000000 +0200
-@@ -63,7 +63,3 @@
- DESTINATION share/icons/hicolor/${size}x${size}/apps/
- RENAME wengophone.png)
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-25 07:27:06.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-25 07:27:41.000000000 +0000
+@@ -61,7 +61,3 @@
+ RENAME qutecom.png)
endforeach(size)
--
+
-install(FILES
- ${CMAKE_SOURCE_DIR}/wengophone/COPYING
+- ${CMAKE_SOURCE_DIR}/wengophone/AUTHORS
- DESTINATION ${DATA_INSTALL_DIR})
Added: qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch?rev=6506&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch (added)
+++ qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch Tue Nov 25 18:52:10 2008
@@ -1,0 +1,13 @@
+Index: qutecom-2.2~rc2.dfsg0/owbuild/owbuild/OWGlobalVariables.cmake
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/owbuild/owbuild/OWGlobalVariables.cmake 2008-11-25 06:31:57.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/owbuild/owbuild/OWGlobalVariables.cmake 2008-11-25 06:32:14.000000000 +0000
+@@ -49,7 +49,7 @@
+ ow_get_hg_revision(SVN_REVISION)
+ # Bugfix with svn revision number that can integrate a : and
+ # this does not work under Windows for the installer name, replace it by -
+-string(REPLACE ":" "-" SVN_REVISION ${SVN_REVISION})
++string(REPLACE ":" "-" SVN_REVISION "${SVN_REVISION}")
+
+ # Gets current date time
+ set(CURRENT_DATE_TIME "0")
Modified: qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch (original)
+++ qutecom/trunk/debian/patches/generic/cmake-static-coredumper.patch Tue Nov 25 18:52:10 2008
@@ -1,19 +1,19 @@
-Index: wengophone-2.1.1.dfsg/libs/3rdparty/coredumper/CMakeLists.txt
+Index: qutecom-2.2~rc2.dfsg0/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
+--- qutecom-2.2~rc2.dfsg0.orig/libs/3rdparty/coredumper/CMakeLists.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/3rdparty/coredumper/CMakeLists.txt 2008-11-23 05:52:50.000000000 +0000
@@ -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
+Index: qutecom-2.2~rc2.dfsg0/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
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-23 05:52:50.000000000 +0000
+@@ -25,12 +25,12 @@
+ ${TMP_BUILD_DIR}/libpsiidle.so
DESTINATION lib${LIB_SUFFIX}/wengophone)
-if (ENABLE_CRASHREPORT)
Modified: qutecom/trunk/debian/patches/generic/desktop-file-update.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/desktop-file-update.patch?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/generic/desktop-file-update.patch (original)
+++ qutecom/trunk/debian/patches/generic/desktop-file-update.patch Tue Nov 25 18:52:10 2008
@@ -1,19 +1,26 @@
-Index: wengophone-2.1.2.dfsg0/wengophone/res/wengophone.desktop
+Index: qutecom-2.2~rc2.dfsg0/wengophone/res/qutecom.desktop
===================================================================
---- wengophone-2.1.2.dfsg0.orig/wengophone/res/wengophone.desktop 2007-03-20 08:51:32.000000000 -0700
-+++ wengophone-2.1.2.dfsg0/wengophone/res/wengophone.desktop 2008-04-22 17:14:20.000000000 -0700
-@@ -1,8 +1,11 @@
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/res/qutecom.desktop 2008-11-25 07:53:54.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/res/qutecom.desktop 2008-11-25 07:55:15.000000000 +0000
+@@ -1,13 +1,13 @@
[Desktop Entry]
--Encoding=UTF-8
- Name=WengoPhone
--Comment=VOIP softphone
--Comment[fr]=Téléphone VOIP
+ Name=QuteCom
+-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=QuteCom
+-Icon=wengophone
+Comment=Talk to people over the Internet and send instant messages over multiple protocols
+Comment[fr]=Discuter avec des personnes sur Internet e envoie des messages instantanés en utilisant divers protocoles
+Comment[it]=Comunicare con le persone via Internet e inviare messaggi istantanei multiprotocollo
+GenericName=VoIP softphone and IM client
+GenericName[fr]=Téléphone VoIP e client IM
+GenericName[it]=Programma VoIP e client IM
- Exec=qtwengophone
- Icon=wengophone
++Exec=qutecom
++Icon=qutecom
StartupNotify=true
+ Terminal=false
+ Type=Application
Added: qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch?rev=6506&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch (added)
+++ qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch Tue Nov 25 18:52:10 2008
@@ -1,0 +1,12 @@
+Index: qutecom-2.2~rc2.dfsg0/owbuild/owbuild/getcurrentdatetime.cpp
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/owbuild/owbuild/getcurrentdatetime.cpp 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/owbuild/owbuild/getcurrentdatetime.cpp 2008-11-23 05:54:26.000000000 +0000
+@@ -10,6 +10,7 @@
+ #include <cstdlib>
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+
+ /**
+ * Transforms a integer to a std::string.
Added: qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch?rev=6506&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch (added)
+++ qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch Tue Nov 25 18:52:10 2008
@@ -1,0 +1,90 @@
+Index: qutecom-2.2~rc2.dfsg0/libs/owutil/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/owutil/CMakeLists.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/owutil/CMakeLists.txt 2008-11-25 06:58:01.000000000 +0000
+@@ -30,6 +30,10 @@
+ socket
+ system
+ http
+- memorydump
+ )
+
++if (ENABLE_CRASHREPORT)
++ subdirs(
++ memorydump
++ )
++endif (ENABLE_CRASHREPORT)
+Index: qutecom-2.2~rc2.dfsg0/libs/3rdparty/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/libs/3rdparty/CMakeLists.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/libs/3rdparty/CMakeLists.txt 2008-11-25 06:58:58.000000000 +0000
+@@ -62,9 +62,14 @@
+ sndfile
+ #iaxclient
+ psiidle
+- googlebreakpad
+ )
+
++if (ENABLE_CRASHREPORT)
++ subdirs(
++ googlebreakpad
++ )
++endif (ENABLE_CRASHREPORT)
++
+ #if (LINUX)
+ # subdirs(
+ # coredumper
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/main.cpp
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/main.cpp 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/main.cpp 2008-11-25 06:58:01.000000000 +0000
+@@ -71,6 +71,7 @@
+
+ #include <cutil/global.h>
+
++#if defined(ENABLE_CRASHREPORT)
+ #if defined(CC_MSVC)
+ #include <memorydump/MSVCMemoryDump.h>
+ #elif defined(CC_MINGW)
+@@ -80,6 +81,7 @@
+ #elif defined(OS_MACOSX)
+ #include <memorydump/MACMemoryDump.h>
+ #endif
++#endif // ENABLE_CRASHREPORT
+
+ #if defined(OS_MACOSX) || defined(OS_LINUX)
+ #include <signal.h>
+Index: qutecom-2.2~rc2.dfsg0/DefineWengoOptions.cmake
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/DefineWengoOptions.cmake 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/DefineWengoOptions.cmake 2008-11-25 06:58:01.000000000 +0000
+@@ -36,7 +36,11 @@
+
+ option(COPY_DATA_FILES_ON_CONFIGURE "Copy data files on configure" ON)
+
+-option(ENABLE_CRASHREPORT "Enable integrated crashreport system" ON)
++if (LINUX AND NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i[3456]86")
++ option(ENABLE_CRASHREPORT "Enable integrated crashreport system" OFF)
++else (LINUX AND NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i[3456]86")
++ option(ENABLE_CRASHREPORT "Enable integrated crashreport system" ON)
++endif (LINUX AND NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i[3456]86")
+
+ option(CUSTOM_ACCOUNT "Enable custom account" OFF)
+
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists.txt 2008-10-21 10:31:56.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists.txt 2008-11-25 06:58:01.000000000 +0000
+@@ -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: qutecom/trunk/debian/patches/generic/install-qutecom.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/install-qutecom.patch?rev=6506&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/install-qutecom.patch (added)
+++ qutecom/trunk/debian/patches/generic/install-qutecom.patch Tue Nov 25 18:52:10 2008
@@ -1,0 +1,45 @@
+Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+===================================================================
+--- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-25 07:56:09.000000000 +0000
++++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-11-25 08:17:28.000000000 +0000
+@@ -3,7 +3,7 @@
+ ${BINARY_NAME}
+ PROPERTIES
+ INSTALL_RPATH
+- ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wengophone
++ ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qutecom
+ INSTALL_RPATH_USE_LINK_PATH
+ ON
+ )
+@@ -23,19 +23,19 @@
+ ${TMP_BUILD_DIR}/libowsl.so
+ ${TMP_BUILD_DIR}/libowutil.so
+ ${TMP_BUILD_DIR}/libpsiidle.so
+- DESTINATION lib${LIB_SUFFIX}/wengophone)
++ DESTINATION lib${LIB_SUFFIX}/qutecom)
+
+ #if (ENABLE_CRASHREPORT)
+ # install(PROGRAMS
+ # ${TMP_BUILD_DIR}/libcoredumper.so
+-# DESTINATION lib${LIB_SUFFIX}/wengophone
++# DESTINATION lib${LIB_SUFFIX}/qutecom
+ # )
+ #endif (ENABLE_CRASHREPORT)
+
+ if (CURL_INTERNAL)
+ install(PROGRAMS
+ ${TMP_BUILD_DIR}/libcurl.so
+- DESTINATION lib${LIB_SUFFIX}/wengophone)
++ DESTINATION lib${LIB_SUFFIX}/qutecom)
+ endif (CURL_INTERNAL)
+
+ install(DIRECTORY
+@@ -58,7 +58,7 @@
+ install(FILES
+ ${CMAKE_SOURCE_DIR}/wengophone/res/wengophone_${size}x${size}.png
+ DESTINATION share/icons/hicolor/${size}x${size}/apps/
+- RENAME wengophone.png)
++ RENAME qutecom.png)
+ endforeach(size)
+
+ install(FILES
Propchange: qutecom/trunk/debian/patches/generic/install-qutecom.patch
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Tue Nov 25 18:52:10 2008
@@ -1,21 +1,11 @@
-head/alsa-plughw-default.patch
-head/qt-fix-bad-window-size.patch
-head/phapi-alsa-code-from-2.2.patch
-head/img_resample.patch
-head/ffmpeg-swscale-api.patch
-head/cmake-swscale.patch -p0
-generic/qobjectthreadsafe-fix-qt42.patch
-generic/cmake-fix-ENABLE_CRASHREPORT.patch
generic/cmake-static-coredumper.patch
-generic/memory-dump-fix-double-dump.patch
-generic/memory-dump-tmp-path.patch
+#generic/curl-openssl-mt-fix.patch
+generic/getcurrentdatetime.patch
+generic/googlebreakpad-64bit.patch
+generic/install-qutecom.patch
+generic/cmake-repo-revision-quotes.patch
+debian/remove-extra-copying-file.patch
generic/desktop-file-update.patch
-generic/def-enable-video-fix.patch
-generic/phapi-fix-crash-missing-codec.patch
-generic/curl-openssl-mt-fix.patch
-generic/gcc-4_3.patch
-debian/remove-extra-copying-file.patch
-debian/cmake-no-rpath_to_link_path.patch
-debian/cmake-rpath-shlibs.patch
-debian/cmake-force-fpic.patch
-debian/cmake-find-boost-1.34.0.patch
+#debian/cmake-no-rpath_to_link_path.patch
+#debian/cmake-rpath-shlibs.patch
+#debian/cmake-force-fpic.patch
Copied: qutecom/trunk/debian/qutecom.1 (from r6502, qutecom/trunk/debian/qtwengophone.1)
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/qutecom.1?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/qtwengophone.1 (original)
+++ qutecom/trunk/debian/qutecom.1 Tue Nov 25 18:52:10 2008
@@ -1,9 +1,9 @@
-.TH "qtwengophone" "1" "16 July 2007" "Wengophone" "User Commands"
+.TH "qutecom" "1" "22 November 2008" "QuteCom" "User Commands"
.SH "NAME"
-wengophone \- SIP-based software telephone with video and chat features
+qutecom \- SIP-based software telephone with video and chat features
internet phone.
.SH "SYNOPSIS"
-.B qtwengophone
+.B qutecom
.RI [ options ]
.SH "DESCRIPTION"
WengoPhone is a Voice over IP application based on standard protocols like
@@ -28,16 +28,16 @@
Pass a path to load configuration directory.
.TP
.B -c, --command \fIarg\fP
-Pass a command to the wengophone.
+Pass a command to the qutecom.
.SH "FILES"
.TP
-.I ~/.wengophone/
-This is where wengophone reads its config information. You do not have to
+.I ~/.qutecom/
+This is where qutecom reads its config information. You do not have to
modify or edit this file.
.SH "SEE ALSO"
http://www.openwengo.org/
.SH "AUTHORS"
-Wengo Development Team <wengophone-devel at lists.openwengo.com>
+QuteCom Development Team <qutecom-dev at lists.qutecom.org>.
.PP
This manual page was written by Marco Nenciarini <mnencia at debian.org> for
the Debian project (but may be used by others).
Propchange: qutecom/trunk/debian/qutecom.1
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: qutecom/trunk/debian/qutecom.install (from r6502, qutecom/trunk/debian/wengophone.install)
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/qutecom.install?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/wengophone.install (original)
+++ qutecom/trunk/debian/qutecom.install Tue Nov 25 18:52:10 2008
@@ -1,1 +1,1 @@
-debian/wengophone.xpm usr/share/pixmaps
+debian/qutecom.xpm usr/share/pixmaps
Propchange: qutecom/trunk/debian/qutecom.install
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: qutecom/trunk/debian/qutecom.manpages (from r6502, qutecom/trunk/debian/wengophone.manpages)
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/qutecom.manpages?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/wengophone.manpages (original)
+++ qutecom/trunk/debian/qutecom.manpages Tue Nov 25 18:52:10 2008
@@ -1,1 +1,1 @@
-debian/qtwengophone.1
+debian/qutecom.1
Propchange: qutecom/trunk/debian/qutecom.manpages
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: qutecom/trunk/debian/qutecom.menu (from r6502, qutecom/trunk/debian/wengophone.menu)
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/qutecom.menu?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/wengophone.menu (original)
+++ qutecom/trunk/debian/qutecom.menu Tue Nov 25 18:52:10 2008
@@ -1,4 +1,4 @@
-?package(wengophone):needs="X11" section="Applications/Network/Communication"\
- command="/usr/bin/qtwengophone"\
- title="WengoPhone" icon="/usr/share/pixmaps/wengophone.xpm"\
+?package(qutecom):needs="X11" section="Applications/Network/Communication"\
+ command="/usr/bin/qutecom"\
+ title="QuteCom" icon="/usr/share/pixmaps/qutecom.xpm"\
longtitle="SIP-based software telephone with video and chat features"
Propchange: qutecom/trunk/debian/qutecom.menu
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: qutecom/trunk/debian/qutecom.xpm (from r6502, qutecom/trunk/debian/wengophone.xpm)
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/qutecom.xpm?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/wengophone.xpm (original)
+++ qutecom/trunk/debian/qutecom.xpm Tue Nov 25 18:52:10 2008
@@ -1,5 +1,5 @@
/* XPM */
-static char * wengophone_xpm[] = {
+static char * qutecom_xpm[] = {
"32 32 454 2",
" c None",
". c #7797B0",
Propchange: qutecom/trunk/debian/qutecom.xpm
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=6506&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Tue Nov 25 18:52:10 2008
@@ -1,14 +1,14 @@
#!/usr/bin/make -f
-include debian/cmake.mk
+include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_DESTDIR=$(CURDIR)/debian/wengophone
-DEB_DH_STRIP_ARGS := --dbg-package=wengophone
+DEB_DESTDIR=$(CURDIR)/debian/qutecom
+DEB_DH_STRIP_ARGS := --dbg-package=qutecom
-DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
-DEB_INSTALL_DOCS_wengophone := $(CURDIR)/wengophone/src/presentation/qt/AUTHORS
+DEB_INSTALL_MANPAGES_qutecom := $(CURDIR)/debian/qutecom.1
+DEB_INSTALL_DOCS_qutecom := $(CURDIR)/wengophone/AUTHORS
DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -25,33 +25,30 @@
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
+ DEB_CMAKE_EXTRA_FLAGS += -DENABLE_CRASHREPORT=OFF
endif
# Avoid postinst-has-useless-call-to-ldconfig
-DEB_DH_MAKESHLIBS_ARGS_wengophone := -n
+DEB_DH_MAKESHLIBS_ARGS_qutecom := -n
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
SRCVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[.0-9]*$$//')
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:=https://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-08-22-wengophone-2.1.2
+HGBRANCH:=qutecom-2.2
+HGTAG:=QuteCom-2.2-RC2
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@echo "Source version: $(SRCVERSION)"
@@echo "Upstream version: $(UPVERSION)"
- @@echo "Svn version: $(SVNVERSION)"
+ @@echo "Hg branch: $(HGBRANCH)"
+ @@echo "Hg tag: $(HGTAG)"
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading version $(UPVERSION) from $(SVNREP) ...
+ @@echo Downloading version $(UPVERSION)
@@chmod +x debian/get-orig-source.sh
- debian/get-orig-source.sh $(SRCVERSION) $(SVNREP) $(SVNVERSION)
+ debian/get-orig-source.sh $(SRCVERSION) $(HGBRANCH) $(HGTAG)
More information about the Pkg-voip-commits
mailing list