[Pkg-cli-apps-commits] r3803 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/fix_v8_db_update.dpatch

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

Author: diocles-guest
Date: Wed Mar 12 22:29:13 2008
New Revision: 3803

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3803
Log:
Fix for upgrading from v7 to v8 of the f-spot photo db schema.

Added:
    packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3803&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Wed Mar 12 22:29:13 2008
@@ -24,12 +24,15 @@
     + debian/patches/fix_cms_linkage.dpatch:
       - Fix from upstream stable SVN branch for linking Cms.dll against
         libfspot.
+    + debian/patches/fix_v8_db_update.dpatch:
+      - Fix from upstream stable SVN branch for updating from v7 to v8 of the
+        f-spot photo database.
     + debian/patches/98_autoreconf.dpatch:
       - Move all generated changes from other patches into single patch,
         for easier maintenance. 
   * debian/control: Recommend dbus-x11. (Closes: #459272)
 
- -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 14:42:47 +0000
+ -- Tim Retout <tim at retout.co.uk>  Wed, 12 Mar 2008 22:18:51 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3803&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Wed Mar 12 22:29:13 2008
@@ -4,6 +4,9 @@
 fix_libfspotjpegtran_linkage
 fix_cms_linkage
 link_system_libs
+
+# Bugfix for database updater
+fix_v8_db_update
 
 # Bugfix for bashisms (#464652)
 fix_bashisms

Added: packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch?rev=3803&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch Wed Mar 12 22:29:13 2008
@@ -1,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_v8_db_update.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix updating to v8 of the f-spot photo database.
+## DP: This was applied upstream as SVN revision 3748.
+
+ at DPATCH@
+commit c4aae33d95c62a274bc1e494ca7894883614ac4d
+Author: sdelcroix <sdelcroix at 772769d8-d925-0410-89eb-a6ffa0d40526>
+Date:   Wed Mar 12 08:54:02 2008 +0000
+
+    2008-03-12  Stephane Delcroix  <sdelcroix at novell.com>
+    
+    	* Updater.cs: fixes the dp updating v8 where version names are int.
+    	bgo #521656. Backporting the change from r3747.
+    
+    
+    git-svn-id: http://svn.gnome.org/svn/f-spot/branches/FSPOT_0_4_2_STABLE@3748 772769d8-d925-0410-89eb-a6ffa0d40526
+
+diff --git a/ChangeLog b/ChangeLog
+index 3bc48f0..de13645 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2008-03-12  Stephane Delcroix  <sdelcroix at novell.com>
++
++	* Updater.cs: fixes the dp updating v8 where version names are int.
++	bgo #521656. Backporting the change from r3747.
++
+ 2008-02-12  Lorenzo Milesi <maxxer at yetopen.it>
+ 
+ 	* src/FormClient.cs:
+diff --git a/src/Updater.cs b/src/Updater.cs
+index 0595322..c21ced1 100644
+--- a/src/Updater.cs
++++ b/src/Updater.cs
+@@ -162,13 +162,14 @@ namespace FSpot.Database {
+ 					string uri = photo_uri.Scheme + "://" + 
+ 						photo_uri.Host + 
+ 						System.IO.Path.GetDirectoryName (photo_uri.AbsolutePath) + "/" +
+-						name_without_extension + " (" + (reader [2] as string) + ")" + extension;
++						name_without_extension + " (" + (reader [2]).ToString () + ")" + extension;
++
+ 					ExecuteNonQuery (new DbCommand (
+ 						"INSERT INTO photo_versions (photo_id, version_id, name, uri) " +
+ 						"VALUES (:photo_id, :version_id, :name, :uri)",
+ 						"photo_id", Convert.ToUInt32 (reader [0]),
+ 						"version_id", Convert.ToUInt32 (reader [1]),
+-						"name", (string)(reader [2]),
++						"name", (reader [2]).ToString (),
+ 						"uri", uri));
+ 				}
+ 

Propchange: packages/f-spot/trunk/debian/patches/fix_v8_db_update.dpatch
------------------------------------------------------------------------------
    svn:executable = *