[Pkg-voip-commits] r7233 - in /qutecom/trunk/debian: ./ patches/ patches/debian/ patches/generic/ patches/head/

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Sun May 17 23:21:41 UTC 2009 

Author: cavedon-guest
Date: Sun May 17 23:21:41 2009
New Revision: 7233

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7233
Log:
* Snapshot for new upstream release. Closes: #527929.
* Use "+dfsg" instead of ".dfsg" (lintian: dfsg-version-with-period)
* Revert dependency on unversioned boost libraries.
* Remove unneeded dependency on boost-regex.
* get-orig-source.sh:
  - add support for upstream HG snapshots
  - no longer remove gaim and coredumper (removed upstream)
  - remove MSVC libraries
  - remove duplicated tinyxml code.
* Remove paches merged upstream.

Removed:
    qutecom/trunk/debian/patches/generic/accept_certificate.patch
    qutecom/trunk/debian/patches/generic/alsa-hw-mixer.patch
    qutecom/trunk/debian/patches/generic/boost_1_37.patch
    qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch
    qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch
    qutecom/trunk/debian/patches/generic/fix-alsa-mixer.patch
    qutecom/trunk/debian/patches/generic/fix-ring-pulseaudio.patch
    qutecom/trunk/debian/patches/generic/gcc-4.4.patch
    qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch
    qutecom/trunk/debian/patches/generic/libpurple_debug.patch
    qutecom/trunk/debian/patches/generic/pixelfromat.patch
    qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch
    qutecom/trunk/debian/patches/head/allow_bound_sign.patch
    qutecom/trunk/debian/patches/head/background_css.patch
    qutecom/trunk/debian/patches/head/cmake-swscale.patch
    qutecom/trunk/debian/patches/head/fix-ringing.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/get-orig-source.sh
    qutecom/trunk/debian/patches/debian/remove-extra-copying-file.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=7233&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Sun May 17 23:21:41 2009
@@ -1,11 +1,32 @@
-qutecom (2.2~rc3.dfsg1-7) UNRELEASED; urgency=low
-
-  * Add head/background_css.patch: fix background in KDE. Closes: #527929.
+qutecom (2.2~rc3+hg375+dfsg1-1) UNRELEASED; urgency=low
+
+  * New upstream release. Closes: #527929.
+  * Use "+dfsg" instead of ".dfsg" (lintian: dfsg-version-with-period)
   * Revert dependency on unversioned boost libraries.
   * Remove unneeded dependency on boost-regex.
-  * Add missing description to generic/gcc-4.4.patch.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Mon, 11 May 2009 10:43:45 -0700
+  * get-orig-source.sh:
+    - add support for upstream HG snapshots
+    - no longer remove gaim and coredumper (removed upstream)
+    - remove MSVC libraries
+    - remove duplicated tinyxml code.
+  * Remove paches merged upstream:
+    - head/cmake-swscale.patch
+    - head/allow_bound_sign.patch
+    - head/fix-ringing.patch
+    - head/background_css.patch
+    - generic/cmake-install-missing-endif.patch
+    - generic/imwrapper-safe-reinit.patch
+    - generic/ffmpeg-api-52.patch
+    - generic/wengophone-thread-destruction.patch
+    - generic/boost_1_37.patch
+    - generic/pixelfromat.patch
+    - generic/libpurple_debug.patch
+    - generic/accept_certificate.patch
+    - generic/fix-ring-pulseaudio.patch
+    - generic/fix-alsa-mixer.patch
+    - generic/gcc-4.4.patch
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Sun, 17 May 2009 16:19:40 -0700
 
 qutecom (2.2~rc3.dfsg1-6) unstable; urgency=low
 

Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=7233&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Sun May 17 23:21:41 2009
@@ -13,6 +13,7 @@
 
 version=$1
 upversion=$2
+hg_branch="qutecom-2.2"
 curdir="$PWD"
 destdir=qutecom-$version
 desttar=qutecom_$version.orig.tar
@@ -38,12 +39,23 @@
     cd $workdir
 else
     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"
+    if ( echo "$upversion" | grep -E 'hg[0-9]+' > /dev/null ); then
+        hg_rev=$(echo "$upversion" | sed -e 's/^.*hg\([0-9]*\).*$/\1/')
+        hg_filename="$hg_rev.tar.bz2"
+        hg_dirname="$(echo -n $hg_branch | tr -s '.' '-')-$hg_rev"
+        hg_url="http://hg.qutecom.org/$hg_branch/archive/$hg_filename"
+        wget "$hg_url"
+        tar jxf "$hg_filename"
+        mv "$hg_dirname" "$destdir"
+        rm "$hg_filename"
+    else
+        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"
+    fi
     echo "done."
 fi
 
@@ -103,13 +115,13 @@
 purge_3rdparty $destdir/libs/3rdparty/openssl
 
 # Remove gaim code
-purge_3rdparty $destdir/libs/3rdparty/gaim
+#purge_3rdparty $destdir/libs/3rdparty/gaim
 
 # Remove libpurple code
 #purge_3rdparty $destdir/libs/3rdparty/libpurple
 
 # Remove coredumper code
-purge_3rdparty $destdir/libs/3rdparty/coredumper
+#purge_3rdparty $destdir/libs/3rdparty/coredumper
 
 # Remove gnutls code
 purge_3rdparty $destdir/libs/3rdparty/gnutls
@@ -132,6 +144,12 @@
 # Remove MSVC code
 purge_3rdparty $destdir/libs/owutil/cutil/msvc
 
+# Remove MSVC reit libraries
+purge_3rdparty $destdir/libs/3rdparty/libstdcpp
+
+# Remove duplicate of tinyxml code
+rm -r $destdir/libs/tinyxml
+
 # Avoid lintian warning on source: ancient-libtool wifo/eXosip/scripts/ltmain.sh 1.4.3
 rm $destdir/wifo/eXosip/scripts/ltmain.sh
 
@@ -144,6 +162,7 @@
 echo -n "Writing archive... "
 tar cf $desttar $destdir
 gzip --best $desttar
+rm -r $destdir
 echo "done"
 
 mv -f $desttar.gz "$finaldir"

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=7233&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Sun May 17 23:21:41 2009
@@ -1,9 +1,9 @@
 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
+Index: qutecom-2.2~rc3-hg375+dfsg1/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
-+++ qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-21 10:42:56.000000000 +0000
-@@ -80,7 +80,3 @@
+--- qutecom-2.2~rc3-hg375+dfsg1.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-02-26 10:06:40.000000000 -0800
++++ qutecom-2.2~rc3-hg375+dfsg1/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2009-05-15 21:41:35.000000000 -0700
+@@ -84,7 +84,3 @@
  		RENAME qutecom.png)
  endforeach(size)
  

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7233&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Sun May 17 23:21:41 2009
@@ -1,19 +1,4 @@
-head/cmake-swscale.patch
-head/allow_bound_sign.patch
-head/fix-ringing.patch
-head/background_css.patch
 #generic/curl-openssl-mt-fix.patch
-generic/cmake-install-missing-endif.patch
-generic/imwrapper-safe-reinit.patch
-generic/ffmpeg-api-52.patch
-generic/wengophone-thread-destruction.patch
-generic/boost_1_37.patch
-generic/pixelfromat.patch
-generic/libpurple_debug.patch
-#generic/accept_certificate.patch
-generic/fix-ring-pulseaudio.patch
-generic/fix-alsa-mixer.patch
-generic/gcc-4.4.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=7233&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Sun May 17 23:21:41 2009
@@ -45,7 +45,7 @@
 
 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.*$$//')
+UPVERSION:=$(shell echo $(SRCVERSION) | sed -e 's/-svn.*$$//' -e 's/[\.+]dfsg.*$$//')
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"

More information about the Pkg-voip-commits mailing list