[Pkg-cli-apps-commits] r5386 - in /packages/dfo/trunk/debian: changelog patches/series patches/sqlite.diff

[laney-guest at users.alioth.debian.org]

Author: laney-guest
Date: Sat Jul  2 09:36:50 2011
New Revision: 5386

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5386
Log:
debian/patches/sqlite.diff: Add new patch to use Mono.Data.Sqlite instead
of Mono.Data.SqliteClient; the former works on both 2.6.7 and 2.10.1.
Thanks to Julian Taylor for the patch. (Closes: #631428)

Added:
    packages/dfo/trunk/debian/patches/sqlite.diff
Modified:
    packages/dfo/trunk/debian/changelog
    packages/dfo/trunk/debian/patches/series

Modified: packages/dfo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/dfo/trunk/debian/changelog?rev=5386&op=diff
==============================================================================
--- packages/dfo/trunk/debian/changelog (original)
+++ packages/dfo/trunk/debian/changelog Sat Jul  2 09:36:50 2011
@@ -1,3 +1,11 @@
+dfo (0.8+svn52-6) UNRELEASED; urgency=low
+
+  * debian/patches/sqlite.diff: Add new patch to use Mono.Data.Sqlite instead
+    of Mono.Data.SqliteClient; the former works on both 2.6.7 and 2.10.1.
+    Thanks to Julian Taylor for the patch. (Closes: #631428)
+
+ -- Iain Lane <laney at debian.org>  Sat, 02 Jul 2011 10:29:55 +0100
+
 dfo (0.8+svn52-5) unstable; urgency=low
 
   * debian/control:

Modified: packages/dfo/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/dfo/trunk/debian/patches/series?rev=5386&op=diff
==============================================================================
--- packages/dfo/trunk/debian/patches/series (original)
+++ packages/dfo/trunk/debian/patches/series Sat Jul  2 09:36:50 2011
@@ -1,4 +1,4 @@
 icons_dir.diff
 run.sh.diff
 compile.diff
-
+sqlite.diff

Added: packages/dfo/trunk/debian/patches/sqlite.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/dfo/trunk/debian/patches/sqlite.diff?rev=5386&op=file
==============================================================================
--- packages/dfo/trunk/debian/patches/sqlite.diff (added)
+++ packages/dfo/trunk/debian/patches/sqlite.diff Sat Jul  2 09:36:50 2011
@@ -1,0 +1,37 @@
+Index: dfo-0.8+svn52/compile.sh
+===================================================================
+--- dfo-0.8+svn52.orig/compile.sh	2011-07-02 10:28:57.064550163 +0100
++++ dfo-0.8+svn52/compile.sh	2011-07-02 10:29:05.512832517 +0100
+@@ -1,2 +1,2 @@
+ #!/bin/bash
+-mono-csc -pkg:glade-sharp-2.0 -pkg:gconf-sharp-2.0 -pkg:flickrnet -r:System.Data -r:Mono.Data.SqliteClient.dll -resource:glade/organizer.glade Main.cs *.cs
++mono-csc -pkg:glade-sharp-2.0 -pkg:gconf-sharp-2.0 -pkg:flickrnet -r:System.Data -r:Mono.Data.Sqlite.dll -resource:glade/organizer.glade Main.cs *.cs
+Index: dfo-0.8+svn52/PersistentInformation.cs
+===================================================================
+--- dfo-0.8+svn52.orig/PersistentInformation.cs	2011-07-02 10:29:13.541244906 +0100
++++ dfo-0.8+svn52/PersistentInformation.cs	2011-07-02 10:29:40.406231746 +0100
+@@ -4,7 +4,7 @@
+ using System.Data;
+ using System.IO;
+ using System.Collections;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ 
+ 	public class PersistentInformation
+ 	{
+@@ -258,7 +258,7 @@
+         dbcmd.Dispose();
+         dbcon.Close();
+         return true;
+-      } catch (SqliteSyntaxException ex) {
++      } catch (SqliteException ex) {
+         if (!ex.Message.Contains("already exists")) throw ex;
+         else return false;
+       }
+@@ -2087,4 +2087,4 @@
+ 		    client.Set(HPOSITION, value);
+ 		  }
+ 		}
+-	}
+\ No newline at end of file
++	}