[Pkg-cli-apps-commits] r3829 - in /packages/f-spot/trunk/debian: changelog patches/fix_deleting_1000_photos.dpatch

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

Author: diocles-guest
Date: Thu Mar 20 18:15:15 2008
New Revision: 3829

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3829
Log:
debian/patches/fix_deleting_1000_photos.dpatch: Use patch from SVN rather than bug tracker.

Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/fix_deleting_1000_photos.dpatch

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3829&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Thu Mar 20 18:15:15 2008
@@ -19,8 +19,7 @@
       - Ensure f-spot-sqlite-upgrade will run correctly under shells other
         than bash. (Closes: #464652)
     + debian/patches/fix_deleting_1000_photos.dpatch:
-      - Fix from upstream bug tracker for deleting >1000 photos.
-        (Closes: #462798)
+      - Fix from upstream SVN for deleting >1000 photos. (Closes: #462798)
     + debian/patches/fix_cms_linkage.dpatch:
       - Fix from upstream stable SVN branch for linking Cms.dll against
         libfspot.
@@ -37,7 +36,7 @@
     + Build against libgtkhtml3.16-cil rather than libgtkhtml2.0-cil.
       (Closes: #470822)
 
- -- Tim Retout <tim at retout.co.uk>  Thu, 20 Mar 2008 18:04:03 +0000
+ -- Tim Retout <tim at retout.co.uk>  Thu, 20 Mar 2008 18:12:55 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/fix_deleting_1000_photos.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_deleting_1000_photos.dpatch?rev=3829&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_deleting_1000_photos.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/fix_deleting_1000_photos.dpatch Thu Mar 20 18:15:15 2008
@@ -2,20 +2,20 @@
 ## fix_deleting_1000_photos.dpatch by Tim Retout <tim at retout.co.uk>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from b.g.o. by Lorenzo Milesi <lorenzo.milesi at yetopen.it>
+## DP: Upstream SVN r3754 by Lorenzo Milesi <lorenzo.milesi at yetopen.it>
 ## DP: Fixes Debian bug #462798.
 
 @DPATCH@
 diff -urNad f-spot~/src/PhotoStore.cs f-spot/src/PhotoStore.cs
---- f-spot~/src/PhotoStore.cs	2008-03-09 02:43:50.000000000 +0000
-+++ f-spot/src/PhotoStore.cs	2008-03-09 03:06:16.000000000 +0000
+--- f-spot~/src/PhotoStore.cs	2008-03-15 15:00:06.000000000 +0000
++++ f-spot/src/PhotoStore.cs	2008-03-20 18:11:01.000000000 +0000
 @@ -389,22 +389,16 @@
  	{
  		EmitRemoved (items);
  
 -		StringBuilder query_builder = new StringBuilder ();
 -		StringBuilder tv_query_builder = new StringBuilder ();
-+		ArrayList query_builder = new ArrayList ();
++		ArrayList query_builder = new ArrayList (items.Length);
  		for (int i = 0; i < items.Length; i++) {
 -			if (i > 0) {
 -				query_builder.Append (" OR ");
@@ -31,7 +31,7 @@
 -		Database.ExecuteNonQuery (String.Format ("DELETE FROM photos WHERE {0}", query_builder.ToString ()));
 -		Database.ExecuteNonQuery (String.Format ("DELETE FROM photo_tags WHERE {0}", tv_query_builder.ToString ()));
 -		Database.ExecuteNonQuery (String.Format ("DELETE FROM photo_versions WHERE {0}", tv_query_builder.ToString ()));
-+		String id_list = String.Join ("','", ((String []) query_builder.ToArray (typeof(String))));
++		String id_list = String.Join ("','", ((string []) query_builder.ToArray (typeof (string))));
 +		Database.ExecuteNonQuery (String.Format ("DELETE FROM photos WHERE id IN ('{0}')", id_list));
 +		Database.ExecuteNonQuery (String.Format ("DELETE FROM photo_tags WHERE photo_id IN ('{0}')", id_list));
 +		Database.ExecuteNonQuery (String.Format ("DELETE FROM photo_versions WHERE photo_id IN ('{0}')", id_list));