[Pkg-voip-commits] r6731 - in /qutecom/tags/2.2~rc3.dfsg0-1/debian: ./ patches/ patches/debian/ patches/generic/ patches/head/
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Fri Feb 6 08:19:36 UTC 2009
Author: cavedon-guest
Date: Fri Feb 6 08:19:36 2009
New Revision: 6731
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6731
Log:
* Remove wifo/eXosip/scripts/ltmain.sh from source tarball to prevent lintian ancient-libtool warning.
* Add watch file and make get-orig-source use uscan.
* Add lintian override for qutecom-data: desktop-command-not-in-package
(qutecom executable is in the binary package)
* Link AUTHORS file from /usr/share/qutecom in order to make is visible from
the About dialog.
* Change arguments to dh_makeshlibs in order to prevent
lintian error pkg-has-shlibs-control-file-but-no-actual-shared-libs
Added:
qutecom/tags/2.2~rc3.dfsg0-1/debian/qutecom-data.lintian-overrides
qutecom/tags/2.2~rc3.dfsg0-1/debian/watch
Removed:
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/remove-old-ltmain.patch
Modified:
qutecom/tags/2.2~rc3.dfsg0-1/debian/changelog
qutecom/tags/2.2~rc3.dfsg0-1/debian/control
qutecom/tags/2.2~rc3.dfsg0-1/debian/get-orig-source.sh
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-force-fpic.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-noavformat.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/remove-extra-copying-file.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/cmake-install-missing-endif.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/ffmpeg-api-52.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/imwrapper-safe-reinit.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/wengophone-thread-destruction.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/head/cmake-swscale.patch
qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/series
qutecom/tags/2.2~rc3.dfsg0-1/debian/rules
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/changelog?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/changelog (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/changelog Fri Feb 6 08:19:36 2009
@@ -1,9 +1,16 @@
-qutecom (2.2~rc3.dfsg0-2) experimental; urgency=low
+qutecom (2.2~rc3.dfsg1-2) experimental; urgency=low
* Move architecture independent data into a qutecom-data.
- * Add debian/remove-old-ltmain.patch to prevent lintian ancient-libtool
+ * Remove wifo/eXosip/scripts/ltmain.sh to prevent lintian ancient-libtool
warning.
* Update copyright information.
+ * Add watch file and make get-orig-source use uscan.
+ * Add lintian override for qutecom-data: desktop-command-not-in-package
+ (qutecom executable is in the binary package)
+ * Link AUTHORS file from /usr/share/qutecom in order to make is visible from
+ the About dialog.
+ * Change arguments to dh_makeshlibs in order to prevent
+ lintian error pkg-has-shlibs-control-file-but-no-actual-shared-libs
* Previous uploads of qutecom were rejected because of incomplete copyright
file. Closes: #502151
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/control?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/control (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/control Fri Feb 6 08:19:36 2009
@@ -22,7 +22,7 @@
Package: qutecom
Architecture: any
-Depends: qutecom-data (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: qutecom-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: wengophone
Description: SIP-based software telephone with video and chat features
QuteCom is a Voice-over-IP application based on standard protocols like SIP
@@ -35,8 +35,8 @@
Package: qutecom-data
Architecture: all
-Depends: qutecom (= ${binary:Version})
-Description: SIP-based software telephone with video and chat features
+Depends: qutecom (>= ${source:Version}), ${misc:Depends}
+Description: SIP-based software telephone with video and chat features (data files)
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
@@ -51,7 +51,7 @@
Architecture: any
Priority: extra
Depends: qutecom (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: SIP-based software telephone with video and chat features
+Description: SIP-based software telephone with video and chat features (debug files)
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
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/get-orig-source.sh?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/get-orig-source.sh (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/get-orig-source.sh Fri Feb 6 08:19:36 2009
@@ -3,23 +3,16 @@
set -e
-if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+if [ -z "$1" ] || [ -z "$2" ]; then
echo "Missing parameter"
- echo "Usage: $0 version hg_branch hg_tag"
+ echo "Usage: $0 src_version up_version"
echo
exit 1;
fi
version=$1
-hg_branch=$2
-hg_tag=$3
-
-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
-
+upversion=$2
curdir="$PWD"
destdir=qutecom-$version
desttar=qutecom_$version.orig.tar
@@ -38,19 +31,22 @@
workdir="$(mktemp -d)"
trap "rm -fr $workdir; echo Aborted." EXIT
-cd $workdir
# Download sources
-if [ -d $destdir ]; then
+if [ -d $workdir/$destdir ]; then
echo "Uptodate source found ($destdir), skipping download."
+ cd $workdir
else
- echo -n "Downloading sources... "
- wget "$hg_url"
- tar jxf "$hg_filename"
- mv "$hg_dirname" "$destdir"
- rm "$hg_filename"
+ echo "Downloading sources... "
+ filename=$(basename $(uscan --destdir "$workdir" --force-download --download-version "$upversion" --dehs | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p'))
+ dirname=$(basename "$filename" .tar.gz)
+ cd $workdir
+ tar zxf "$filename"
+ mv "$dirname" "$destdir"
+ rm "$filename"
echo "done."
fi
+
# Cleaning tree
purge_3rdparty() {
@@ -136,6 +132,9 @@
# Remove MSVC code
purge_3rdparty $destdir/libs/owutil/cutil/msvc
+# Avoid lintian warning on source: ancient-libtool wifo/eXosip/scripts/ltmain.sh 1.4.3
+rm $destdir/wifo/eXosip/scripts/ltmain.sh
+
echo "Cleaning done"
# Make the sources archive
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-force-fpic.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/debian/cmake-force-fpic.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-force-fpic.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-force-fpic.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,4 @@
+Make sure all shared code is compiled with -fPIC
Index: qutecom-2.2~rc3.dfsg0/owbuild/owbuild/OWDefaultCompilerFlags.cmake
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/owbuild/owbuild/OWDefaultCompilerFlags.cmake 2008-12-18 14:22:36.000000000 +0100
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-noavformat.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/debian/cmake-noavformat.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-noavformat.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/cmake-noavformat.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,4 @@
+Do not fail if libavformat is not used, as we are using libswscale
Index: qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/owbuild/FindFFMPEG.cmake 2008-12-26 15:06:57.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/debian/remove-extra-copying-file.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/debian/remove-extra-copying-file.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,4 @@
+Do not copy COPYING and AUTHORS files into /usr/share/qutecom
Index: qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-21 10:42:49.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/cmake-install-missing-endif.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/generic/cmake-install-missing-endif.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/cmake-install-missing-endif.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/cmake-install-missing-endif.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,5 @@
+Fix syntax error in CMakeLists-install-linux.txt
+http://trac.qutecom.org/ticket/25
Index: qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-12-21 10:42:16.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/ffmpeg-api-52.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/generic/ffmpeg-api-52.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/ffmpeg-api-52.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/ffmpeg-api-52.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,5 @@
+Fix compilation with compilation with libavcodec version 52
+http://trac.qutecom.org/ticket/29
Index: qutecom-2.2~rc3.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.c
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/wifo/phapi/phcodec-avcodec-wrapper.c 2008-12-18 13:22:36.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/imwrapper-safe-reinit.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/generic/imwrapper-safe-reinit.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/imwrapper-safe-reinit.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/imwrapper-safe-reinit.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,5 @@
+Prevent race condition during re-initialization of libpurple
+http://trac.qutecom.org/ticket/26
Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/profile/UserProfileHandler.cpp
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/profile/UserProfileHandler.cpp 2008-12-18 13:22:36.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/wengophone-thread-destruction.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/generic/wengophone-thread-destruction.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/wengophone-thread-destruction.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/generic/wengophone-thread-destruction.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,5 @@
+Delay destruction of WengoPhone instance
+http://trac.qutecom.org/ticket/30
Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/WengoPhone.cpp
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/WengoPhone.cpp 2008-12-27 10:15:36.000000000 +0100
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/head/cmake-swscale.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/head/cmake-swscale.patch?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/head/cmake-swscale.patch (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/head/cmake-swscale.patch Fri Feb 6 08:19:36 2009
@@ -1,3 +1,5 @@
+Fix typo in libswscale (ffmpeg) detection code
+http://trac.qutecom.org/ticket/45
Index: qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake
===================================================================
--- qutecom-2.2~rc3.dfsg0.orig/owbuild/FindFFMPEG.cmake 2008-12-26 14:58:56.000000000 +0000
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/patches/series?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/series (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/patches/series Fri Feb 6 08:19:36 2009
@@ -7,4 +7,3 @@
debian/cmake-noavformat.patch
debian/remove-extra-copying-file.patch
debian/cmake-force-fpic.patch
-debian/remove-old-ltmain.patch
Added: qutecom/tags/2.2~rc3.dfsg0-1/debian/qutecom-data.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/qutecom-data.lintian-overrides?rev=6731&op=file
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/qutecom-data.lintian-overrides (added)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/qutecom-data.lintian-overrides Fri Feb 6 08:19:36 2009
@@ -1,0 +1,1 @@
+qutecom-data: desktop-command-not-in-package /usr/share/applications/qutecom.desktop qutecom
Modified: qutecom/tags/2.2~rc3.dfsg0-1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/rules?rev=6731&op=diff
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/rules (original)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/rules Fri Feb 6 08:19:36 2009
@@ -30,30 +30,29 @@
endif
-# Avoid postinst-has-useless-call-to-ldconfig
-DEB_DH_MAKESHLIBS_ARGS_qutecom := -n
+# Avoid postinst-has-useless-call-to-ldconfig and pkg-has-shlibs-control-file-but-no-actual-shared-libs
+DEB_DH_MAKESHLIBS_ARGS_qutecom := -Xsfp
install/qutecom-data::
mkdir -p $(DEB_DESTDIR)-data/usr
mv $(DEB_DESTDIR)/usr/share $(DEB_DESTDIR)-data/usr
+install/qutecom::
+ mkdir -p $(DEB_DESTDIR)/usr/share/qutecom
+ ln -s /usr/share/doc/qutecom/AUTHORS $(DEB_DESTDIR)/usr/share/qutecom
+
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.*$$//')
-
-HGBRANCH:=qutecom-2.2
-HGTAG:=QuteCom-2.2-RC3
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@echo "Source version: $(SRCVERSION)"
@@echo "Upstream version: $(UPVERSION)"
- @@echo "Hg branch: $(HGBRANCH)"
- @@echo "Hg tag: $(HGTAG)"
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading version $(UPVERSION)
@@chmod +x debian/get-orig-source.sh
- debian/get-orig-source.sh $(SRCVERSION) $(HGBRANCH) $(HGTAG)
+ debian/get-orig-source.sh $(SRCVERSION) $(UPVERSION)
Added: qutecom/tags/2.2~rc3.dfsg0-1/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/tags/2.2%7Erc3.dfsg0-1/debian/watch?rev=6731&op=file
==============================================================================
--- qutecom/tags/2.2~rc3.dfsg0-1/debian/watch (added)
+++ qutecom/tags/2.2~rc3.dfsg0-1/debian/watch Fri Feb 6 08:19:36 2009
@@ -1,0 +1,3 @@
+version=3
+
+opts="uversionmangle=s/-RC/~rc/,dversionmangle=s/\.dfsg\d+//" http://www.qutecom.com/downloads/qutecom-(.*).tar.gz
More information about the Pkg-voip-commits
mailing list