[Pkg-voip-commits] r2727 - in yxa/trunk/debian: . patches

[Mikael Magnusson]

Author: mikma-guest
Date: 2006-11-23 13:03:20 +0100 (Thu, 23 Nov 2006)
New Revision: 2727

Removed:
   yxa/trunk/debian/patches/process_branch_result.dpatch
Modified:
   yxa/trunk/debian/changelog
   yxa/trunk/debian/control
   yxa/trunk/debian/get-orig-source.sh
   yxa/trunk/debian/patches/00list
   yxa/trunk/debian/patches/yxa_yaws.dpatch
Log:
* Run autoconf and clean up cache directory after svn export.
* Update to Erlang/OTP R11B-2


Modified: yxa/trunk/debian/changelog
===================================================================
--- yxa/trunk/debian/changelog	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/changelog	2006-11-23 12:03:20 UTC (rev 2727)
@@ -1,5 +1,4 @@
-yxa (0.91+20060922-1) UNRELEASED; urgency=low
-
+yxa (0.91+20061124svn-1) UNRELEASED; urgency=low
   * Initial release (Closes: #377617)
 
  -- Mikael Magnusson <mikma at users.sourceforge.net>  Mon, 25 Sep 2006 16:46:38 +0200

Modified: yxa/trunk/debian/control
===================================================================
--- yxa/trunk/debian/control	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/control	2006-11-23 12:03:20 UTC (rev 2727)
@@ -4,14 +4,14 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, erlang-base
- (>= 1:11.b.1) | erlang-base-hipe (>= 1:11.b.1), erlang-dev (>=
- 1:11.b.1), erlang-nox (>= 1:11.b.1), yaws (>= 1.65)
+ (>= 1:11.b.2) | erlang-base-hipe (>= 1:11.b.2), erlang-dev (>=
+ 1:11.b.2), erlang-nox (>= 1:11.b.2), yaws (>= 1.65)
 Standards-Version: 3.7.2
 
 Package: yxa
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, erlang-base (>= 1:11.b.1)
- | erlang-base-hipe (>= 1:11.b.1), erlang-nox (>= 1:11.b.1), yaws (>= 1.65)
+Depends: ${shlibs:Depends}, ${misc:Depends}, erlang-base (>= 1:11.b.2)
+ | erlang-base-hipe (>= 1:11.b.2), erlang-nox (>= 1:11.b.2), yaws (>= 1.65)
 Pre-Depends: adduser
 Description: SIP software written in Erlang
  Yxa is SIP software written in Erlang  (Erlang is a programming language

Modified: yxa/trunk/debian/get-orig-source.sh
===================================================================
--- yxa/trunk/debian/get-orig-source.sh	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/get-orig-source.sh	2006-11-23 12:03:20 UTC (rev 2727)
@@ -13,6 +13,10 @@
 
     echo Downloading ${filename} from ${url} rev ${svnrev}
     svn export -q -r$svnrev --non-interactive $url ../tarballs/${srcdir}
+    echo Autoconf
+    (cd ../tarballs/${srcdir} && autoconf)
+    echo Clean up snapshot
+    rm -rf ../tarballs/${srcdir}/autom4te.cache
     echo Building snapshot tarball
     GZIP=-9 tar -b1 -czf ../tarballs/${filename} -C ../tarballs ${srcdir}
     echo Cleaning up

Modified: yxa/trunk/debian/patches/00list
===================================================================
--- yxa/trunk/debian/patches/00list	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/patches/00list	2006-11-23 12:03:20 UTC (rev 2727)
@@ -2,6 +2,5 @@
 #erlang-otp-rel
 inet_dns
 net_util
-process_branch_result
 yxa_yaws_makefile
 yxa_yaws

Deleted: yxa/trunk/debian/patches/process_branch_result.dpatch
===================================================================
--- yxa/trunk/debian/patches/process_branch_result.dpatch	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/patches/process_branch_result.dpatch	2006-11-23 12:03:20 UTC (rev 2727)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## process_branch_result.dpatch by  <mikma at users.sourceforge.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix bug in process_branch_result, fixed in r1462 by upstream.
-
- at DPATCH@
-diff -urNad yxa-0.91+20060922~/src/sipproxy.erl yxa-0.91+20060922/src/sipproxy.erl
---- yxa-0.91+20060922~/src/sipproxy.erl	2006-06-13 12:04:00.000000000 +0200
-+++ yxa-0.91+20060922/src/sipproxy.erl	2006-10-07 22:28:24.000000000 +0200
-@@ -985,7 +985,8 @@
- 	    NewTarget1 = targetlist:set_state(ThisTarget, NewTState),
- 	    NewTarget2 = targetlist:set_endresult(NewTarget1, SPResponse),	% XXX only do this for final responses?
- 	    NewTargets1 = targetlist:update_target(NewTarget2, Targets),
--	    NewState2 = try_next_destination(Status, ThisTarget, NewTargets1, State),
-+	    NewState1 = State#state{targets=NewTargets1},
-+	    NewState2 = try_next_destination(Status, ThisTarget, NewTargets1, NewState1),
- 	    case (OldTState == NewTState) of
- 		true ->
- 		    ok;	%% No change, don't have to log verbose things

Modified: yxa/trunk/debian/patches/yxa_yaws.dpatch
===================================================================
--- yxa/trunk/debian/patches/yxa_yaws.dpatch	2006-11-23 08:32:07 UTC (rev 2726)
+++ yxa/trunk/debian/patches/yxa_yaws.dpatch	2006-11-23 12:03:20 UTC (rev 2727)
@@ -28,8 +28,8 @@
 @@ -0,0 +1,6 @@
 +%% Erlang OTP R11B-1 library versions
 +{release, {"YXA embedded Yaws web server","0.0"}, {erts, "5.2"},
-+ [{kernel,"2.11.1"},
-+  {stdlib,"1.14.1"},
++ [{kernel,"2.11.2"},
++  {stdlib,"1.14.2"},
 +  {yaws, "1.65"},
 +  {yxa_yaws, "0.0"}]}.
 diff -urNad /dev/null yxa-0.91/yaws/src/yxa_yaws_app.erl