[Pkg-gtkpod-devel] r248 - in gtkpod/branches/etch-bpo: debian src

[djpig at alioth.debian.org]

Author: djpig
Date: 2007-09-22 12:06:44 +0000 (Sat, 22 Sep 2007)
New Revision: 248

Modified:
   gtkpod/branches/etch-bpo/debian/changelog
   gtkpod/branches/etch-bpo/debian/gtkpod.desktop
   gtkpod/branches/etch-bpo/src/mp3file.c
Log:
Merge 0.99.10-3 into etch-bpo


Modified: gtkpod/branches/etch-bpo/debian/changelog
===================================================================
--- gtkpod/branches/etch-bpo/debian/changelog	2007-09-17 17:06:02 UTC (rev 247)
+++ gtkpod/branches/etch-bpo/debian/changelog	2007-09-22 12:06:44 UTC (rev 248)
@@ -1,10 +1,18 @@
-gtkpod (0.99.10-2~bpo.1) etch-backports; urgency=low
+gtkpod (0.99.10-3~bpo.1) etch-backports; urgency=low
 
   * Build against etch backports.
     - replace libcurl4-gnutls-dev with libcurl3-gnutls-dev in build-depends
 
  -- Frank Lichtenheld <djpig at debian.org>  Mon, 06 Aug 2007 01:29:01 +0200
 
+gtkpod (0.99.10-3) unstable; urgency=low
+
+  * Added missing fclose() call in mp3file.c to prevent too many open
+    file descriptors (Closes: #441308).
+  * Adapted .desktop file to current freedesktop standards.
+
+ -- Nico Golde <nion at debian.org>  Sun, 09 Sep 2007 20:13:31 +0200
+
 gtkpod (0.99.10-2) unstable; urgency=low
 
   * Upload to unstable

Modified: gtkpod/branches/etch-bpo/debian/gtkpod.desktop
===================================================================
--- gtkpod/branches/etch-bpo/debian/gtkpod.desktop	2007-09-17 17:06:02 UTC (rev 247)
+++ gtkpod/branches/etch-bpo/debian/gtkpod.desktop	2007-09-22 12:06:44 UTC (rev 248)
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=gtkpod
 Icon=gtkpod-icon-32x32.png
 Comment=Manage songs and playlists on your Apple iPod
 Exec=gtkpod
 Terminal=false
 Type=Application
-Categories=Application;AudioVideo;
+Categories=GTK;AudioVideo;

Modified: gtkpod/branches/etch-bpo/src/mp3file.c
===================================================================
--- gtkpod/branches/etch-bpo/src/mp3file.c	2007-09-17 17:06:02 UTC (rev 247)
+++ gtkpod/branches/etch-bpo/src/mp3file.c	2007-09-22 12:06:44 UTC (rev 248)
@@ -2353,6 +2353,7 @@
     gd->gapless_data = totaldatasize - finaleight;
     /* total samples minus pre/postgap */
     gd->samplecount = totalframes * mysamplesperframe - gd->pregap - gd->postgap;
+	fclose(file);
 
     return TRUE;