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

[Samuel Mimram]

Author: smimram
Date: 2006-04-13 11:50:47 +0000 (Thu, 13 Apr 2006)
New Revision: 1573

Added:
   linphone/trunk/debian/patches/private_config.dpatch
Modified:
   linphone/trunk/debian/README.Debian
   linphone/trunk/debian/changelog
   linphone/trunk/debian/patches/00list
Log:
Moving configuration file.

Modified: linphone/trunk/debian/README.Debian
===================================================================
--- linphone/trunk/debian/README.Debian	2006-04-12 18:24:16 UTC (rev 1572)
+++ linphone/trunk/debian/README.Debian	2006-04-13 11:50:47 UTC (rev 1573)
@@ -1,3 +1,9 @@
+Location of configuration file changed between 1.3.3-1 and 1.3.5-1 versions
+---------------------------------------------------------------------------
+If you want to keep your old settings, you should type the following command:
+mv ~/.gnome2/linphone ~/.gnome2_private/linphone
+
+
 Converting the address book entries between versions 0.12.2 and 1.0.0
 ---------------------------------------------------------------------
 You seem to have lost your address book while updating linphone?
@@ -32,4 +38,4 @@
 
 Sorry for the inconveniences caused by this change.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 10 Apr 2005 17:59:31 +0200
+ -- Samuel Mimram <smimram at debian.org>  Thu, 13 Apr 2006 13:49:36 +0200

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2006-04-12 18:24:16 UTC (rev 1572)
+++ linphone/trunk/debian/changelog	2006-04-13 11:50:47 UTC (rev 1573)
@@ -5,10 +5,12 @@
 
   [ Samuel Mimram ]
   * New upstream release.
+  * Added private_config.dpatch to move configuration file from ~/.gnome2 to
+    ~/.gnome2_private since it can contain passwords, closes: #361913.
   * Updated desktop_icon.dpatch to correct the location of the icon in the
-    linphone.desktop file, closes: #346435. 
+    linphone.desktop file, closes: #346435.
 
- -- Samuel Mimram <smimram at debian.org>  Wed, 12 Apr 2006 14:57:01 +0000
+ -- Samuel Mimram <smimram at debian.org>  Thu, 13 Apr 2006 11:45:54 +0000
 
 linphone (1.3.3-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2006-04-12 18:24:16 UTC (rev 1572)
+++ linphone/trunk/debian/patches/00list	2006-04-13 11:50:47 UTC (rev 1573)
@@ -4,3 +4,4 @@
 10mscodec_null_strcmp
 link_vorbis
 gcc-4.1
+private_config

Added: linphone/trunk/debian/patches/private_config.dpatch
===================================================================
--- linphone/trunk/debian/patches/private_config.dpatch	2006-04-12 18:24:16 UTC (rev 1572)
+++ linphone/trunk/debian/patches/private_config.dpatch	2006-04-13 11:50:47 UTC (rev 1573)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## private_config.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Move configuration file from ~/.gnome2/linphone to
+## DP: ~/.gnome2_private/linphone since it can contain passwords and other
+## DP: private informations.
+
+ at DPATCH@
+diff -urNad linphone-1.3.5~/console/linphonec.c linphone-1.3.5/console/linphonec.c
+--- linphone-1.3.5~/console/linphonec.c	2006-03-16 17:17:40.000000000 +0000
++++ linphone-1.3.5/console/linphonec.c	2006-04-13 11:42:03.000000000 +0000
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	free(old_cfg_cli);
+-	old_cfg_gui = g_strdup_printf("%s/.gnome2/linphone", home);
++	old_cfg_gui = g_strdup_printf("%s/.gnome2_private/linphone", home);
+ 
+ 	/*
+ 	 * If the *OLD* GUI configurations exist copy it to
+diff -urNad linphone-1.3.5~/gnome/linphone.c linphone-1.3.5/gnome/linphone.c
+--- linphone-1.3.5~/gnome/linphone.c	2005-12-07 16:43:53.000000000 +0000
++++ linphone-1.3.5/gnome/linphone.c	2006-04-13 11:42:26.000000000 +0000
+@@ -342,7 +342,7 @@
+ void linphone_gnome_init(LinphoneGnomeUI *ui,LinphoneCore *lc)
+ {
+ 	gchar *configfile_name =
+-			g_strdup_printf ("%s/.gnome2/linphone", getenv ("HOME"));
++			g_strdup_printf ("%s/.gnome2_private/linphone", getenv ("HOME"));
+ 	linphone_gnome_ui_init(ui,lc);
+ 	linphone_gnome_ui_show(ui);
+ 	linphone_core_init(lc,&linphone_gnome_vtable,configfile_name,(gpointer)ui);
+diff -urNad linphone-1.3.5~/share/C/linphone.1 linphone-1.3.5/share/C/linphone.1
+--- linphone-1.3.5~/share/C/linphone.1	2005-03-04 16:57:31.000000000 +0000
++++ linphone-1.3.5/share/C/linphone.1	2006-04-13 11:40:38.000000000 +0000
+@@ -24,7 +24,7 @@
+ Output internal messages on stdout, this is useful for debugging.
+ .SH "FILES"
+ .LP 
+-\fI~/.gnome2/linphone\fP 
++\fI~/.gnome2_private/linphone\fP 
+ .br 
+ This is where linphone reads its config information. You do not have to modify or edit this file.
+ .br 


Property changes on: linphone/trunk/debian/patches/private_config.dpatch
___________________________________________________________________
Name: svn:executable
   + *