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

Samuel Mimram smimram at alioth.debian.org
Tue Apr 24 22:21:21 UTC 2007 

Author: smimram
Date: 2007-04-24 22:21:21 +0000 (Tue, 24 Apr 2007)
New Revision: 3462

Removed:
   linphone/trunk/debian/patches/desktop_icon.dpatch
   linphone/trunk/debian/patches/gnome_applet_dir.dpatch
   linphone/trunk/debian/patches/sip-max-forwards.dpatch
Modified:
   linphone/trunk/debian/changelog
   linphone/trunk/debian/linphone.install
   linphone/trunk/debian/patches/00list
Log:
New upstream release.

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/changelog	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,3 +1,13 @@
+linphone (1.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * The gnome applet was removed from upstream sources, not installing it
+    anymore.
+  * Removed desktop_icon.dpatch, gnome_applet_dir.dpatch and
+    sip-max-forwards.dpatch which are either obsolete or integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Apr 2007 23:54:23 +0200
+
 linphone (1.6.0-2) unstable; urgency=low
 
   * Disable arts support, closes: #397815.

Modified: linphone/trunk/debian/linphone.install
===================================================================
--- linphone/trunk/debian/linphone.install	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/linphone.install	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,11 +1,8 @@
 usr/bin/linphone
-usr/lib/bonobo/servers/GNOME_LinphoneApplet.server
-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
 usr/share/gnome/help/linphone
 usr/share/doc/linphone/html

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/patches/00list	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,3 +0,0 @@
-desktop_icon
-gnome_applet_dir
-sip-max-forwards

Deleted: linphone/trunk/debian/patches/desktop_icon.dpatch
===================================================================
--- linphone/trunk/debian/patches/desktop_icon.dpatch	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/patches/desktop_icon.dpatch	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## desktop_icon.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct path in .desktop files.
-
- at DPATCH@
-diff -urNad linphone-1.2.0~/share/linphone_applet.desktop linphone-1.2.0/share/linphone_applet.desktop
---- linphone-1.2.0~/share/linphone_applet.desktop	2002-02-08 08:54:01.000000000 +0100
-+++ linphone-1.2.0/share/linphone_applet.desktop	2006-01-09 00:50:09.000000000 +0100
-@@ -5,5 +5,5 @@
- Comment[de]=Linphone ist ein web-phone.
- Type=Application
- Exec=linphone --applet --activate-goad-server=linphone_applet
--Icon=linphone/linphone2.png
--Terminal=0
-\ No newline at end of file
-+Icon=/usr/share/pixmaps/linphone/linphone2.png
-+Terminal=0
-diff -urNad linphone-1.2.0~/share/linphone.desktop linphone-1.2.0/share/linphone.desktop
---- linphone-1.2.0~/share/linphone.desktop	2003-02-03 17:52:01.000000000 +0100
-+++ linphone-1.2.0/share/linphone.desktop	2006-01-09 00:49:56.000000000 +0100
-@@ -5,6 +5,6 @@
- Comment[de]=Linphone ist ein web-phone.
- Type=Application
- Exec=linphone
--Icon=linphone/linphone2.png
-+Icon=/usr/share/pixmaps/linphone/linphone2.png
- Terminal=0
- Categories=Application;Network;

Deleted: linphone/trunk/debian/patches/gnome_applet_dir.dpatch
===================================================================
--- linphone/trunk/debian/patches/gnome_applet_dir.dpatch	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/patches/gnome_applet_dir.dpatch	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## gnome_applet_dir.dpatch by Samuel Mimram <samuel.mimram at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debian's "default" directory for applets.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/smimram/work/gnu/linphone/1.0/linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in
---- /home/smimram/work/gnu/linphone/1.0/linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in	2003-01-16 22:59:48.000000000 +0100
-+++ linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in	2004-10-25 11:45:01.000000000 +0200
-@@ -2,7 +2,7 @@
- 
- <oaf_server iid="OAFIID:GNOME_LinphoneApplet_Factory"
- 	    type="exe"
--	    location="@LIBEXECDIR@/linphone_applet">
-+	    location="/usr/lib/gnome-applets/linphone_applet">
- 
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:Bonobo/GenericFactory:1.0"/>

Deleted: linphone/trunk/debian/patches/sip-max-forwards.dpatch
===================================================================
--- linphone/trunk/debian/patches/sip-max-forwards.dpatch	2007-04-23 10:23:36 UTC (rev 3461)
+++ linphone/trunk/debian/patches/sip-max-forwards.dpatch	2007-04-24 22:21:21 UTC (rev 3462)
@@ -1,28 +0,0 @@
-#! /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

More information about the Pkg-voip-commits mailing list