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

[Mikael Magnusson]

Author: mikma-guest
Date: 2007-04-20 21:00:32 +0000 (Fri, 20 Apr 2007)
New Revision: 3440

Modified:
   yxa/trunk/debian/changelog
   yxa/trunk/debian/control
   yxa/trunk/debian/patches/yxa_yaws.dpatch
   yxa/trunk/debian/rules
Log:
New upstream release: 1.0rc1
Update to erlang 11.b.4 and downgrade to yaws 1.65 (in unstable)



Modified: yxa/trunk/debian/changelog
===================================================================
--- yxa/trunk/debian/changelog	2007-04-20 20:01:58 UTC (rev 3439)
+++ yxa/trunk/debian/changelog	2007-04-20 21:00:32 UTC (rev 3440)
@@ -1,5 +1,5 @@
-yxa (0.91+20070220svn-1) UNRELEASED; urgency=low
+yxa (1.0~rc1-1) UNRELEASED; urgency=low
   * Initial release (Closes: #377617)
 
- -- Mikael Magnusson <mikma at users.sourceforge.net>  Mon, 25 Sep 2006 16:46:38 +0200
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Fri, 20 Apr 2007 22:31:23 +0200
 

Modified: yxa/trunk/debian/control
===================================================================
--- yxa/trunk/debian/control	2007-04-20 20:01:58 UTC (rev 3439)
+++ yxa/trunk/debian/control	2007-04-20 21:00:32 UTC (rev 3440)
@@ -4,17 +4,19 @@
 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.2) | erlang-base-hipe (>= 1:11.b.2), erlang-dev (>=
- 1:11.b.2), erlang-nox (>= 1:11.b.2), yaws (= 1.66)
+ (>= 1:11.b.4) | erlang-base-hipe (>= 1:11.b.4), erlang-dev (>=
+ 1:11.b.4), erlang-nox (>= 1:11.b.4), yaws (>= 1.65)
+Build-Conflicts: yaws (>= 1.66)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 
 Package: yxa
 Architecture: any
-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.66)
+Depends: ${shlibs:Depends}, ${misc:Depends}, erlang-base (>= 1:11.b.4)
+ | erlang-base-hipe (>= 1:11.b.4), erlang-nox (>= 1:11.b.4), yaws (>= 1.65)
 Pre-Depends: adduser
+Conflicts: yaws (>= 1.66)
 Description: SIP software written in Erlang
  Yxa is SIP software written in Erlang  (Erlang is a programming language
  written by Ericsson).

Modified: yxa/trunk/debian/patches/yxa_yaws.dpatch
===================================================================
--- yxa/trunk/debian/patches/yxa_yaws.dpatch	2007-04-20 20:01:58 UTC (rev 3439)
+++ yxa/trunk/debian/patches/yxa_yaws.dpatch	2007-04-20 21:00:32 UTC (rev 3440)
@@ -28,9 +28,9 @@
 @@ -0,0 +1,6 @@
 +%% Erlang OTP R11B-1 library versions
 +{release, {"YXA embedded Yaws web server","0.0"}, {erts, "5.2"},
-+ [{kernel,"2.11.2"},
-+  {stdlib,"1.14.2"},
-+  {yaws, "1.66"},
++ [{kernel,"2.11.4"},
++  {stdlib,"1.14.4"},
++  {yaws, "1.65"},
 +  {yxa_yaws, "0.0"}]}.
 diff -urNad /dev/null yxa-0.91/yaws/src/yxa_yaws_app.erl
 --- /dev/null	1970-01-01 01:00:00.000000000 +0100

Modified: yxa/trunk/debian/rules
===================================================================
--- yxa/trunk/debian/rules	2007-04-20 20:01:58 UTC (rev 3439)
+++ yxa/trunk/debian/rules	2007-04-20 21:00:32 UTC (rev 3440)
@@ -25,6 +25,14 @@
 	CFLAGS += -O2
 endif
 
+#
+# Upstream versions can be formatted in different ways.
+#
+# 1. Release:               1.0~rc1
+# 2. Snapshot:              0.91+20061205
+# 3. Subversion trunk date: 0.91+20070220svn-1
+#
+
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
@@ -34,7 +42,8 @@
 SVNREV := {$(shell echo $(DEBVERSION) | sed -e 's/^.*+//' | sed -e 's/svn-.*//')}
 else
 ifeq (,$(findstring +2,$(UPVERSION)))
-URL := http://www.stacken.kth.se/project/yxa/download/yxa-$(UPVERSION).tar.gz
+TARVERSION:=$(shell echo $(UPVERSION) | sed -e 's/~//')
+URL := http://www.stacken.kth.se/project/yxa/download/yxa-$(TARVERSION).tar.gz
 else
 TARVERSION:=$(shell echo $(UPVERSION) | sed -e 's/^.*\+\([0-9]\{4\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1-\2-\3/')
 URL := http://www.stacken.kth.se/project/yxa/download/snapshots/yxa-$(TARVERSION).tar.gz