[Pkg-gtkpod-devel] r254 - in libgpod/trunk/debian: . patches

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-11-12 21:17:16 +0000 (Mon, 12 Nov 2007)
New Revision: 254

Removed:
   libgpod/trunk/debian/patches/01_strchr_return_value.dpatch
Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/patches/00list
Log:
drop debian/patches/01_strchr_return_value.dpatch, integrated upstream


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2007-11-12 21:04:51 UTC (rev 253)
+++ libgpod/trunk/debian/changelog	2007-11-12 21:17:16 UTC (rev 254)
@@ -1,8 +1,9 @@
 libgpod (0.6.0-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
+    - 01_strchr_return_value.dpatch: drop, integrated upstream 
 
- -- Frank Lichtenheld <djpig at debian.org>  Mon, 12 Nov 2007 22:03:20 +0100
+ -- Frank Lichtenheld <djpig at debian.org>  Mon, 12 Nov 2007 22:15:36 +0100
 
 libgpod (0.5.2-5) UNRELEASED; urgency=low
 

Modified: libgpod/trunk/debian/patches/00list
===================================================================
--- libgpod/trunk/debian/patches/00list	2007-11-12 21:04:51 UTC (rev 253)
+++ libgpod/trunk/debian/patches/00list	2007-11-12 21:17:16 UTC (rev 254)
@@ -1 +0,0 @@
-01_strchr_return_value

Deleted: libgpod/trunk/debian/patches/01_strchr_return_value.dpatch
===================================================================
--- libgpod/trunk/debian/patches/01_strchr_return_value.dpatch	2007-11-12 21:04:51 UTC (rev 253)
+++ libgpod/trunk/debian/patches/01_strchr_return_value.dpatch	2007-11-12 21:17:16 UTC (rev 254)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_strchr_return_value.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/src/itdb_artwork.c trunk/src/itdb_artwork.c
---- trunk~/src/itdb_artwork.c	2007-08-12 20:06:50.000000000 +0200
-+++ trunk/src/itdb_artwork.c	2007-08-16 01:36:33.000000000 +0200
-@@ -408,16 +408,18 @@
- 	g_free (artwork_dir);
-     }
-     /* FIXME: Hack */
--    if( !filename ) {
--	artwork_dir = itdb_get_photos_thumb_dir (device->mountpoint);
-+	if( !filename ) {
-+		artwork_dir = itdb_get_photos_thumb_dir (device->mountpoint);
- 
--	if (artwork_dir)
--	{
--	    filename = itdb_get_path (artwork_dir, strchr( thumb->filename+1, ':') + 1);
--	    g_free (artwork_dir);
--	}
-+		if (artwork_dir) {
-+			gchar *name_on_disk = strchr( thumb->filename+1, ':');
-+			if (name_on_disk) {
-+				filename = itdb_get_path (artwork_dir, name_on_disk + 1);
-+			}
-+			g_free (artwork_dir);
-+		}
- 
--    }
-+	}
-     return filename;
- }
-