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

[nion at alioth.debian.org]

Author: nion
Date: 2007-08-15 23:45:40 +0000 (Wed, 15 Aug 2007)
New Revision: 238

Added:
   libgpod/trunk/debian/patches/
   libgpod/trunk/debian/patches/00list
   libgpod/trunk/debian/patches/01_strchr_return_value.dpatch
Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/control
   libgpod/trunk/debian/rules
Log:
fixed 438142

Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2007-08-06 00:08:16 UTC (rev 237)
+++ libgpod/trunk/debian/changelog	2007-08-15 23:45:40 UTC (rev 238)
@@ -1,3 +1,11 @@
+libgpod (0.5.2-4) unstable; urgency=low
+
+  * Upload to unstable.
+  * Included patch to fix missing check for strchr return
+    value, 01_strchr_return_value.dpatch (Closes: #438126).
+
+ -- Nico Golde <nion at debian.org>  Thu, 16 Aug 2007 01:37:25 +0200
+
 libgpod (0.5.2-3) experimental; urgency=low
 
   * Build a package without artwork support, which

Modified: libgpod/trunk/debian/control
===================================================================
--- libgpod/trunk/debian/control	2007-08-06 00:08:16 UTC (rev 237)
+++ libgpod/trunk/debian/control	2007-08-15 23:45:40 UTC (rev 238)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
 Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen, dpatch
 Standards-Version: 3.7.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/libgpod/trunk/

Added: libgpod/trunk/debian/patches/00list
===================================================================
--- libgpod/trunk/debian/patches/00list	                        (rev 0)
+++ libgpod/trunk/debian/patches/00list	2007-08-15 23:45:40 UTC (rev 238)
@@ -0,0 +1 @@
+01_strchr_return_value

Added: libgpod/trunk/debian/patches/01_strchr_return_value.dpatch
===================================================================
--- libgpod/trunk/debian/patches/01_strchr_return_value.dpatch	                        (rev 0)
+++ libgpod/trunk/debian/patches/01_strchr_return_value.dpatch	2007-08-15 23:45:40 UTC (rev 238)
@@ -0,0 +1,37 @@
+#! /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;
+ }
+ 


Property changes on: libgpod/trunk/debian/patches/01_strchr_return_value.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: libgpod/trunk/debian/rules
===================================================================
--- libgpod/trunk/debian/rules	2007-08-06 00:08:16 UTC (rev 237)
+++ libgpod/trunk/debian/rules	2007-08-15 23:45:40 UTC (rev 238)
@@ -4,6 +4,8 @@
 SONAME=2
 VERSION=
 
+include /usr/share/dpatch/dpatch.make
+
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -30,7 +32,7 @@
 	mkdir -p $(dir $@)
 	cd $(dir $@) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_INVOKE) --with-python=no --disable-gdk-pixbuf $(DEB_CONFIGURE_EXTRA_FLAGS)
 
-configure-stamp: build/libgpod$(SONAME)/config.status build/libgpod$(SONAME)-nogtk/config.status
+configure-stamp: patch-stamp build/libgpod$(SONAME)/config.status build/libgpod$(SONAME)-nogtk/config.status
 	touch $@
 
 
@@ -59,7 +61,7 @@
 install-stamp: build/libgpod$(SONAME)/install-stamp build/libgpod$(SONAME)-nogtk/install-stamp build/python-gpod
 	touch $@
 
-clean:
+clean: unpatch
 	rm -rf build
 	dh_clean
 	rm -rf debian/tmp-nogtk