[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.2-1-20-g97959df

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 97959df4273d8625d9c1419aa1fc6f15948ed535
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Thu Dec 23 23:41:15 2010 +0100

    Added 02_fix_config to fix update config breakage

diff --git a/debian/changelog b/debian/changelog
index 00049e0..12fdc17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ monobristol (0.60.3-1) UNRELEASED; urgency=low
     + new parameters: multi, jackstats
     + monoBristol.desktop file with an added Russian line (thanks to Alexandre Prokoudine)
     + bugfix: direct access to sound device (thanks to Takashi Sakamoto)
+  * debian/patches/02_fix_config added to fix update breakage (0.60.2 -> 0.60.3)
 
  -- Stefan Ebner <sebner at ubuntu.com>  Sat, 18 Dec 2010 21:58:29 +0100
 
diff --git a/debian/patches/02_fix_config b/debian/patches/02_fix_config
new file mode 100644
index 0000000..928dcd0
--- /dev/null
+++ b/debian/patches/02_fix_config
@@ -0,0 +1,28 @@
+Description: Fix config breakage on 0.60.2 -> 0.60.3 update
+Author: Stefan Ebner <sebner at ubuntu.com>
+Origin: Stefan Ebner
+Forwarded: done per mail
+Index: monobristol.git/MainWindow.cs
+===================================================================
+--- monobristol.git.orig/MainWindow.cs	2010-12-23 23:37:44.708776001 +0100
++++ monobristol.git/MainWindow.cs	2010-12-23 23:37:56.676776002 +0100
+@@ -29,6 +29,7 @@
+ 		Build ();
+ 		
+ 		//read config files
++		try {
+ 		if (System.IO.File.Exists (System.IO.Directory.GetCurrentDirectory() + "/.monobristol.xml")){
+ 			XmlDocument xmlDocument = new XmlDocument();
+ 			xmlDocument.Load(System.IO.Directory.GetCurrentDirectory() + "/.monobristol.xml");
+@@ -283,6 +284,11 @@
+ 			bapply.Press ();
+ 		}
+ 	}
++		catch 
++		{
++			File.Delete(System.IO.Directory.GetCurrentDirectory() + "/.monobristol.xml");
++		}
++	}
+ 	
+ 	protected void OnDeleteEvent (object sender, DeleteEventArgs a)
+ 	{
diff --git a/debian/patches/series b/debian/patches/series
index c8c66e0..7cefa62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_use_mono-csc
+02_fix_config

-- 
monobristol