[Pkg-voip-commits] r3214 - in linphone/trunk/debian: . patches

[Samuel Mimram]

Author: smimram
Date: 2007-03-08 21:31:43 +0000 (Thu, 08 Mar 2007)
New Revision: 3214

Added:
   linphone/trunk/debian/patches/sip-max-forwards.dpatch
Modified:
   linphone/trunk/debian/changelog
   linphone/trunk/debian/linphone-nox.install
   linphone/trunk/debian/linphone.install
   linphone/trunk/debian/patches/00list
   linphone/trunk/debian/rules
   linphone/trunk/debian/watch
Log:
New upstream release.

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/changelog	2007-03-08 21:31:43 UTC (rev 3214)
@@ -1,9 +1,15 @@
-linphone (1.5.1-2) UNRELEASED; urgency=low
+linphone (1.6.0-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  [ Samuel Mimram ]
+  * New upstream release.
+  * Added sip-max-forwards.dpatch to correctly set SIP maximum forwards
+    number, closes: #413193.
+  * Updated upstream url in watch and rules.
+
+  [ Kilian Krause ]
   * Fix building arch=all in binary-arch target.
 
- -- Kilian Krause <kilian at debian.org>  Wed,  3 Jan 2007 19:40:53 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu,  8 Mar 2007 21:43:06 +0100
 
 linphone (1.5.1-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/linphone-nox.install
===================================================================
--- linphone/trunk/debian/linphone-nox.install	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/linphone-nox.install	2007-03-08 21:31:43 UTC (rev 3214)
@@ -3,4 +3,6 @@
 usr/share/locale/*
 usr/share/man/man1/linphonec.1
 usr/share/man/man1/sipomatic.1
+usr/share/man/cs/man1/linphonec.1
+usr/share/man/cs/man1/sipomatic.1
 usr/share/doc/linphone-nox/html

Modified: linphone/trunk/debian/linphone.install
===================================================================
--- linphone/trunk/debian/linphone.install	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/linphone.install	2007-03-08 21:31:43 UTC (rev 3214)
@@ -1,7 +1,9 @@
 usr/bin/linphone
 usr/lib/bonobo/servers/GNOME_LinphoneApplet.server
-usr/libexec/linphone_applet				/usr/lib/gnome-applets
+usr/libexec/linphone_applet                             /usr/lib/gnome-applets
+usr/libexec/mediastream                                 /usr/lib/gnome-applets
 usr/share/man/man1/linphone.1
+usr/share/man/cs/man1/linphone.1
 usr/share/pixmaps/linphone
 usr/share/applications/linphone.desktop
 usr/share/gnome-2.0/ui/GNOME_LinphoneApplet.xml

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/patches/00list	2007-03-08 21:31:43 UTC (rev 3214)
@@ -1,2 +1,3 @@
 desktop_icon
 gnome_applet_dir
+sip-max-forwards

Added: linphone/trunk/debian/patches/sip-max-forwards.dpatch
===================================================================
--- linphone/trunk/debian/patches/sip-max-forwards.dpatch	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/patches/sip-max-forwards.dpatch	2007-03-08 21:31:43 UTC (rev 3214)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sip-max-forwards.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correctly set max forwards. See #413193.
+
+ at DPATCH@
+diff -urNad linphone-1.6.0~/exosip/jrequest.c linphone-1.6.0/exosip/jrequest.c
+--- linphone-1.6.0~/exosip/jrequest.c	2006-10-19 13:40:21.000000000 +0200
++++ linphone-1.6.0/exosip/jrequest.c	2007-03-08 21:51:59.000000000 +0100
+@@ -222,7 +222,7 @@
+     }
+ 
+   /* always add the Max-Forward header */
+-  osip_message_set_max_forwards(request, "5"); /* a UA should start a request with 70 */
++  osip_message_set_max_forwards(request, "70"); /* a UA should start a request with 70 */
+ 
+ #define MASQUERADE_VIA
+ #ifdef MASQUERADE_VIA
+@@ -841,7 +841,7 @@
+     }
+   
+   /* always add the Max-Forward header */
+-  osip_message_set_max_forwards(request, "5"); /* a UA should start a request with 70 */
++  osip_message_set_max_forwards(request, "70"); /* a UA should start a request with 70 */
+ 
+ 
+   /* even for ACK for 2xx (ACK within a dialog), the branch ID MUST


Property changes on: linphone/trunk/debian/patches/sip-max-forwards.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/rules	2007-03-08 21:31:43 UTC (rev 3214)
@@ -41,7 +41,7 @@
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := linphone_$(UPVERSION).orig.tar.gz
-URL := http://download.savannah.nongnu.org/releases/linphone/stable/source/linphone-$(UPVERSION).tar.gz
+URL := http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-$(UPVERSION).tar.gz
 
 configure-stamp: configure
 	dh_testdir
@@ -123,12 +123,12 @@
 	dh_testdir -i
 	dh_testroot -i
 	dh_installlogrotate -i
+	dh_install -i --sourcedir=debian/tmp
 	dh_installinit -i -- defaults 21
 	dh_installdocs -i
 	dh_installexamples -i -XCVS
 	dh_installcron -i
 	dh_installchangelogs -i ChangeLog
-	dh_install -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
@@ -140,7 +140,7 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installchangelogs -a ChangeLog 
+	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_install -a --sourcedir=debian/tmp --list-missing

Modified: linphone/trunk/debian/watch
===================================================================
--- linphone/trunk/debian/watch	2007-03-08 17:28:35 UTC (rev 3213)
+++ linphone/trunk/debian/watch	2007-03-08 21:31:43 UTC (rev 3214)
@@ -1,3 +1,3 @@
 version=3
 
-http://download.savannah.nongnu.org/releases/linphone/stable/source/linphone-([\d\w\.]+).tar.gz debian uupdate
+http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-([\d\w\.]+).tar.gz debian uupdate