[Pkg-voip-commits] r8642 - in /qutecom/trunk/debian: changelog get-orig-source.sh watch

[cavedon at alioth.debian.org]

Author: cavedon
Date: Tue Oct 19 18:33:51 2010
New Revision: 8642

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8642
Log:
* New upstream release.
* Update watch file and get-orig-source script for new release.

Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/get-orig-source.sh
    qutecom/trunk/debian/watch

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8642&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Tue Oct 19 18:33:51 2010
@@ -1,3 +1,10 @@
+qutecom (2.2+dfsg1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update watch file and get-orig-source script for new release.
+
+ -- Ludovico Cavedon <cavedon at debian.org>  Tue, 19 Oct 2010 10:55:35 -0700
+
 qutecom (2.2~rc3.hg643~dfsg1-1) experimental; urgency=low
 
   * New upstream snapshot. Closes: #590234, #588003. (LP: #605162)

Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=8642&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Tue Oct 19 18:33:51 2010
@@ -17,6 +17,7 @@
 curdir="$PWD"
 destdir=qutecom-$version
 desttar=qutecom_$version.orig.tar
+uptar=qutecom_$upversion.orig.tar.gz
 
 if [ -d "$curdir/../tarballs" ]; then
     finaldir=$curdir/../tarballs
@@ -29,9 +30,8 @@
     exit 0
 fi
 
-workdir="$(mktemp -d)"
+workdir="$(mktemp -d --tmpdir=$(pwd))"
 trap "rm -fr $workdir; echo Aborted." EXIT
-
 
 # Download sources
 if [ -d $workdir/$destdir ]; then
@@ -49,12 +49,11 @@
         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)
+        filename=$(basename $(uscan --no-symlink --destdir "." --force-download --download-version "$upversion" --dehs | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p'))
         cd $workdir
-        tar zxf "$filename"
-        mv "$dirname" "$destdir"
-        rm "$filename"
+        tar zxf "../$filename"
+        mv [Qq]ute[Cc]om* "$destdir"
+        rm "../$filename"
     fi
     echo "done."
 fi
@@ -73,7 +72,7 @@
 echo "Cleaning tree to remove anything not needed for non-Windows builds..."
 
 # Remove windows binary stuff
-rm -vrf $destdir/wengophone/nsis
+rm -vrf $destdir/qutecom/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

Modified: qutecom/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/watch?rev=8642&op=diff
==============================================================================
--- qutecom/trunk/debian/watch (original)
+++ qutecom/trunk/debian/watch Tue Oct 19 18:33:51 2010
@@ -1,3 +1,3 @@
 version=3
 
-opts="uversionmangle=s/-RC/~rc/,dversionmangle=s/\.dfsg\d+//" http://www.qutecom.com/downloads/qutecom-(.*).tar.gz
+opts="uversionmangle=s/-RC/~rc/,dversionmangle=s/\.dfsg\d+//" http://www.qutecom.com/downloads/[Qq]ute[Cc]om-(.*).tar.gz