[Pkg-voip-commits] r3762 - wengophone/trunk/debian

[mnencia at alioth.debian.org]

Author: mnencia
Date: 2007-07-18 09:48:56 +0000 (Wed, 18 Jul 2007)
New Revision: 3762

Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/rules
Log:
Another attempt to make get-orig-sources target working


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-07-18 09:17:13 UTC (rev 3761)
+++ wengophone/trunk/debian/changelog	2007-07-18 09:48:56 UTC (rev 3762)
@@ -1,6 +1,6 @@
-wengophone (2.1.1.dfsg-0.1) UNRELEASED; urgency=low
+wengophone (2.1.1.dfsg0-1) UNRELEASED; urgency=low
 
-  * Non-maintainer upload.
+  [ Ludovico Cavedon ]
   * New upstream stable release.
   * Updated copyright file
   * Updated build dependencies
@@ -25,11 +25,14 @@
   * 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 
+    + compiling with gcc/g++ 3.4
   * get-orig-source.sh: added hack to install SVN server certificate
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Mon, 16 Jul 2007 15:40:48 +0200
+  [ Marco Nenciarini ]
+  * debian/rules: made get-oprig-source working for NMUs
 
+ -- Marco Nenciarini <mnencia at debian.org>  Wed, 18 Jul 2007 11:37:13 +0200
+
 wengophone (2.1.0.dfsg-3) unstable; urgency=low
 
   * Added patch cmake-fix-disable-crashreport to really disable

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2007-07-18 09:17:13 UTC (rev 3761)
+++ wengophone/trunk/debian/get-orig-source.sh	2007-07-18 09:48:56 UTC (rev 3762)
@@ -49,6 +49,12 @@
     echo "Uptodate source found ($destdir), skipping download."
 else
     echo -n "Downloading sources... "
+
+    # ugly hack to install dev.openwengo.com certificate 
+    if ! svn --password guest --username guest --non-interactive info http://dev.openwengo.org/svn/openwengo > /dev/null; then
+       echo "p" | svn --password guest --username guest info http://dev.openwengo.org/svn/openwengo > /dev/null
+    fi
+
     svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url $destdir
     echo "done."
 fi

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-07-18 09:17:13 UTC (rev 3761)
+++ wengophone/trunk/debian/rules	2007-07-18 09:48:56 UTC (rev 3762)
@@ -30,8 +30,8 @@
 DEB_DH_MAKESHLIBS_ARGS_wengophone := -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.*$$//')
+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-06-21-wengophone-2.1.1