[Pkg-gtkpod-devel] r297 - in gtkpod/tags: . 0.99.12-1/debian 0.99.12-1/debian/patches

nion at alioth.debian.org nion at alioth.debian.org
Mon Jan 14 11:56:41 UTC 2008


Author: nion
Date: 2008-01-14 11:56:40 +0000 (Mon, 14 Jan 2008)
New Revision: 297

Added:
   gtkpod/tags/0.99.12-1/
   gtkpod/tags/0.99.12-1/debian/changelog
   gtkpod/tags/0.99.12-1/debian/control
   gtkpod/tags/0.99.12-1/debian/patches/00list
   gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch
Removed:
   gtkpod/tags/0.99.12-1/debian/changelog
   gtkpod/tags/0.99.12-1/debian/control
   gtkpod/tags/0.99.12-1/debian/patches/00list
   gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch
   gtkpod/tags/0.99.12-1/debian/patches/02_missing_fclose.dpatch
   gtkpod/tags/0.99.12-1/debian/patches/03_itdb-set-local-to-imported.dpatch
Log:
tagging 0.99.12-1

Copied: gtkpod/tags/0.99.12-1 (from rev 293, gtkpod/trunk)

Deleted: gtkpod/tags/0.99.12-1/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/changelog	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,234 +0,0 @@
-gtkpod (0.99.10-5) unstable; urgency=low
-
-  * Add changing mountpoint as well in prefs.c
-    to 01_mountpoint (Closes: #452056).
-  * Removed NEWS file as its last entry was before sarge.
-
- -- Nico Golde <nion at debian.org>  Tue, 20 Nov 2007 14:22:12 +0100
-
-gtkpod (0.99.10-4) unstable; urgency=low
-
-  * Switched from Xs-Vcs to Vcs control field, dpkg supports them now.
-  * Switched from old Homepage tag to the new Homepage control field.
-  * New dependency on dpatch as we don't want to modify the source
-    directly any longer.
-  * Added previously modified source code as dpatch patches:
-    01_mountpoint, 02_missing_fclose
-  * Included 03_itdb-set-local-to-imported.dpatch to fix inability to import
-    into local repos (Closes: #451749).
-
- -- Nico Golde <nion at debian.org>  Tue, 13 Nov 2007 16:18:58 +0100
-
-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
-  * Update menu entry according to new menu policy
-  * Lintian: Don't ignore all errors from "make distclean"
-
- -- Frank Lichtenheld <djpig at debian.org>  Tue, 10 Jul 2007 00:25:04 +0200
-
-gtkpod (0.99.10-1) experimental; urgency=low
-
-  * New upstream release
-    - Allows resizing the preferences dialog (Closes: #428011)
-  * Update man page debian/gtkpod.pod
-
- -- Frank Lichtenheld <djpig at debian.org>  Thu, 28 Jun 2007 02:12:56 +0200
-
-gtkpod (0.99.8-3) unstable; urgency=low
-
-  [ Frank Lichtenheld ]
-  * Upload to unstable (Closes: #391812)
-  * Change Maintainer to pkg-gtkpod-devel list. Add myself
-    and Nico as Uploaders
-  * Add Vcs-{Svn,Browser} fields
-
-  [ Nico Golde ]
-  * Added Homepage tag to control.
-  * Bumped compat level since debhelper >= 5 is in etch.
-
- -- Nico Golde <nion at debian.org>  Mon, 07 May 2007 17:40:39 +0200
-
-gtkpod (0.99.8-2) experimental; urgency=low
-
-  * Adapt for libgpod >= 0.4.2 (Patch by upstream).
-
- -- Frank Lichtenheld <djpig at debian.org>  Sat, 10 Feb 2007 14:22:53 +0100
-
-gtkpod (0.99.8-1) experimental; urgency=low
-
-  * New upstream release
-    + Update libgpod-dev build-dependency to (>= 0.4.0)
-      and remove conflict against libgpod0
-      (upload to experimental because this version isn't
-       available in unstable yet)
-    + Change /mnt/ipod to /media/ipod as usual in new scripts
-  * Bump Standards-Version to 3.7.2 (no changes).
-  * Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
-    (Closes: #395120)
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Dec 2006 18:38:05 +0100
-
-gtkpod (0.99.4-2) unstable; urgency=low
-
-  * Add conflict against libgpod0 >= 0.4.0
-    to quiten up the BTS a bit.
-  * Bump Standards-Version to 3.7.2 (no changes).
-  * Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
-    (Closes: #395120)
-
- -- Frank Lichtenheld <djpig at debian.org>  Thu, 30 Nov 2006 23:12:32 +0100
-
-gtkpod (0.99.4-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Frank Lichtenheld <djpig at debian.org>  Sat,  8 Apr 2006 21:45:22 +0200
-
-gtkpod (0.99.2-1) unstable; urgency=low
-
-  * New upstream release (Closes: #343856)
-    + Fixes sorting bug (Closes: #330082)
-  * Add build-depends on libgpod-dev
-  * Add build-depends on flex
-  * Add suggests on python since one of the scripts uses it
-  * Update FSF address in debian/copyright
-
- -- Frank Lichtenheld <djpig at debian.org>  Thu, 29 Dec 2005 17:38:38 +0100
-
-gtkpod (0.94.0-1) unstable; urgency=low
-
-  * New upstream release (Closes: #319408)
-    - support for new iTunes and new firmware version
-      (Closes: #317701)
-  * Add watch file, by  Filippo Giunchedi (Closes: #318760)
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Jul 2005 13:23:13 +0200
-
-gtkpod (0.93.1-1) unstable; urgency=low
-
-  * New upstream release (Closes: #316399)
-    - New build-dependency libglade2-dev
-  * Bump Standards-Version to 3.6.2, no changes needed
-  * Don't create glade files as absolute links as that fails miserably
-    in a packaging situation
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri,  1 Jul 2005 02:24:13 +0200
-
-gtkpod (0.88.2-1) unstable; urgency=low
-
-  * New upstream release
-    - Fixes typo in preferences dialog reported by Michael Shields
-      (Closes: #289087)
-    - Included additional sync script previously offered for
-      download separatly (Closes: #302361)
-  * Include typo fixes for the German translation by Jens Seidel
-    (Closes: #314053)
-  * Add build dependency on gettext even though many other build
-    dependecies already get it for us. We shouldn't rely on that
-  * Fix syntax error in sync-notes.sh and change paths from
-    /mnt/ipod to /media/ipod as usual
-  * Add Suggests on recode as it is used in the scripts
-  * Replace the outdated, buggy, and GFDL licensed man page written in
-    docbook by the former Debian maintainer with an updated, more
-    extensive, GPL licensed version written in POD by me. Replace
-    build-depends on docbook-to-man by build-depends on perl.
-  * Rework copyright file to be more precise about which file is
-    copyrighted by whom
-  * Fix path to scripts in preferences window
-  * Replace ScsiEject code in src/misc.c with my new version from the
-    eject package which uses the newer SG ioctl interface. Add new
-    header check for scsi/sg.h to configure.in and regenerate configure
-    and config.h.in.
-  
- -- Frank Lichtenheld <djpig at debian.org>  Thu, 16 Jun 2005 18:28:41 +0200
-
-gtkpod (0.88.1-1) unstable; urgency=low
-
-  * New upstream release
-    - fixes the iPod Shuffle support (Closes: #299768)
-      Thanks to Jörg Kurlbaum for pointing this out 
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri, 18 Mar 2005 13:15:17 +0100
-
-gtkpod (0.88-1) unstable; urgency=low
-
-  * New upstream version (Closes: #299053)
-  * Fix FTBFS with gcc-4.0; patch by Andreas Jochens
-    (Closes: #298273)
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri, 11 Mar 2005 18:50:52 +0100
-
-gtkpod (0.87.3-1) unstable; urgency=low
-
-  * New upstream version
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri,  4 Mar 2005 14:35:13 -0800
-
-gtkpod (0.85.0-1) unstable; urgency=low
-
-  * New maintainer (Closes: #287988)
-    Acknowledge my own NMU (Closes: #264682, #268340, #230898, #275363)
-  * Apply patch by Andreas Jochens to let gtkpod compile
-    with gcc-4.0 (Closes: #286926)
-
- -- Frank Lichtenheld <djpig at debian.org>  Fri,  7 Jan 2005 01:01:58 +0100
-
-gtkpod (0.85.0-0.1) unstable; urgency=low
-
-  * NMU since maintainer is unresponsive to any contact
-    attempts for a log time now.
-  * New upstream release (Closes: #264682)
-  * debian/control:
-    + Shorten short description (Closes: #268340)
-    + Suggest mp3gain (Closes: #230898)
-    + Adjust debhelper build-dependency so that we can use dh_desktop
-  * debian/rules: Tidy up.
-  * debian/docs: Don't install empty NEWS file
-  * debian/menu:
-    + Quote values
-    + Use xpm icon created from the 32x32 icon
-  * debian/gtkpod.sgml: fix some <arg> vs. <option> mistakes
-  * debian/gtkpod.desktop: add .desktop file
-  * Change all occourences of /mnt/ipod to /media/ipod (Closes: #275363)
-    add a NEWS.Debian file to document this.
-  * Fix UTF-8 characters in several files
-  * Don't issue warning about not beeing able to "unsort" a table.
-    It's quite annyoing and the user has no possibility to fix it.
-
- -- Frank Lichtenheld <djpig at debian.org>  Thu,  9 Dec 2004 18:17:17 +0100
-
-gtkpod (0.72-2-2) unstable; urgency=low
-
-  * Fix build dependencies (libid3tag0-dev).
-  * Change priority to extra.
-
- -- Quôc Peyrot <chojin at debian.org>  Sat,  7 Feb 2004 05:14:03 +0000
-
-gtkpod (0.72-2-1) unstable; urgency=low
-
-  * New upstream release. Closes: #216155.
-  * Update policy revision to 3.6.1 (use UTF-8).
-  * Change the debian maintainer email to chojin at debian.org.
-
- -- Quôc Peyrot <chojin at debian.org>  Tue,  3 Feb 2004 07:15:04 +0000
-
-gtkpod (0.51-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Quôc Peyrot <chojin at debian.org>  Sat, 17 May 2003 04:15:02 +0000
-
-gtkpod (0.50-1) unstable; urgency=low
-
-  * Initial Release. Closes: #182289.
-
- -- Quôc Peyrot <chojin at debian.org>  Tue, 22 Apr 2003 05:16:37 +0000

Copied: gtkpod/tags/0.99.12-1/debian/changelog (from rev 294, gtkpod/trunk/debian/changelog)
===================================================================
--- gtkpod/tags/0.99.12-1/debian/changelog	                        (rev 0)
+++ gtkpod/tags/0.99.12-1/debian/changelog	2008-01-14 11:56:40 UTC (rev 297)
@@ -0,0 +1,247 @@
+gtkpod (0.99.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjust build-dependency on libgpod, >= 0.6.0 is now needed.
+  * Bumped Standards version, no changes needed.
+  * Updating 01_mountpoint.dpatch cause it did no longer apply.
+  * Remove 03_itdb-set-local-to-imported.dpatch, included upstream.
+  * Remove 02_missing_fclose.dpatch, not needed anymore. Upstream source code
+    changed and the function does not have a local FILE stream that needs to be
+    closed anymore.
+
+ -- Nico Golde <nion at debian.org>  Sun, 13 Jan 2008 17:24:33 +0100
+
+gtkpod (0.99.10-5) unstable; urgency=low
+
+  * Add changing mountpoint as well in prefs.c
+    to 01_mountpoint (Closes: #452056).
+  * Removed NEWS file as its last entry was before sarge.
+
+ -- Nico Golde <nion at debian.org>  Tue, 20 Nov 2007 14:22:12 +0100
+
+gtkpod (0.99.10-4) unstable; urgency=low
+
+  * Switched from Xs-Vcs to Vcs control field, dpkg supports them now.
+  * Switched from old Homepage tag to the new Homepage control field.
+  * New dependency on dpatch as we don't want to modify the source
+    directly any longer.
+  * Added previously modified source code as dpatch patches:
+    01_mountpoint, 02_missing_fclose
+  * Included 03_itdb-set-local-to-imported.dpatch to fix inability to import
+    into local repos (Closes: #451749).
+
+ -- Nico Golde <nion at debian.org>  Tue, 13 Nov 2007 16:18:58 +0100
+
+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
+  * Update menu entry according to new menu policy
+  * Lintian: Don't ignore all errors from "make distclean"
+
+ -- Frank Lichtenheld <djpig at debian.org>  Tue, 10 Jul 2007 00:25:04 +0200
+
+gtkpod (0.99.10-1) experimental; urgency=low
+
+  * New upstream release
+    - Allows resizing the preferences dialog (Closes: #428011)
+  * Update man page debian/gtkpod.pod
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 28 Jun 2007 02:12:56 +0200
+
+gtkpod (0.99.8-3) unstable; urgency=low
+
+  [ Frank Lichtenheld ]
+  * Upload to unstable (Closes: #391812)
+  * Change Maintainer to pkg-gtkpod-devel list. Add myself
+    and Nico as Uploaders
+  * Add Vcs-{Svn,Browser} fields
+
+  [ Nico Golde ]
+  * Added Homepage tag to control.
+  * Bumped compat level since debhelper >= 5 is in etch.
+
+ -- Nico Golde <nion at debian.org>  Mon, 07 May 2007 17:40:39 +0200
+
+gtkpod (0.99.8-2) experimental; urgency=low
+
+  * Adapt for libgpod >= 0.4.2 (Patch by upstream).
+
+ -- Frank Lichtenheld <djpig at debian.org>  Sat, 10 Feb 2007 14:22:53 +0100
+
+gtkpod (0.99.8-1) experimental; urgency=low
+
+  * New upstream release
+    + Update libgpod-dev build-dependency to (>= 0.4.0)
+      and remove conflict against libgpod0
+      (upload to experimental because this version isn't
+       available in unstable yet)
+    + Change /mnt/ipod to /media/ipod as usual in new scripts
+  * Bump Standards-Version to 3.7.2 (no changes).
+  * Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
+    (Closes: #395120)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Dec 2006 18:38:05 +0100
+
+gtkpod (0.99.4-2) unstable; urgency=low
+
+  * Add conflict against libgpod0 >= 0.4.0
+    to quiten up the BTS a bit.
+  * Bump Standards-Version to 3.7.2 (no changes).
+  * Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
+    (Closes: #395120)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 30 Nov 2006 23:12:32 +0100
+
+gtkpod (0.99.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Frank Lichtenheld <djpig at debian.org>  Sat,  8 Apr 2006 21:45:22 +0200
+
+gtkpod (0.99.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #343856)
+    + Fixes sorting bug (Closes: #330082)
+  * Add build-depends on libgpod-dev
+  * Add build-depends on flex
+  * Add suggests on python since one of the scripts uses it
+  * Update FSF address in debian/copyright
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 29 Dec 2005 17:38:38 +0100
+
+gtkpod (0.94.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #319408)
+    - support for new iTunes and new firmware version
+      (Closes: #317701)
+  * Add watch file, by  Filippo Giunchedi (Closes: #318760)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Jul 2005 13:23:13 +0200
+
+gtkpod (0.93.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #316399)
+    - New build-dependency libglade2-dev
+  * Bump Standards-Version to 3.6.2, no changes needed
+  * Don't create glade files as absolute links as that fails miserably
+    in a packaging situation
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri,  1 Jul 2005 02:24:13 +0200
+
+gtkpod (0.88.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes typo in preferences dialog reported by Michael Shields
+      (Closes: #289087)
+    - Included additional sync script previously offered for
+      download separatly (Closes: #302361)
+  * Include typo fixes for the German translation by Jens Seidel
+    (Closes: #314053)
+  * Add build dependency on gettext even though many other build
+    dependecies already get it for us. We shouldn't rely on that
+  * Fix syntax error in sync-notes.sh and change paths from
+    /mnt/ipod to /media/ipod as usual
+  * Add Suggests on recode as it is used in the scripts
+  * Replace the outdated, buggy, and GFDL licensed man page written in
+    docbook by the former Debian maintainer with an updated, more
+    extensive, GPL licensed version written in POD by me. Replace
+    build-depends on docbook-to-man by build-depends on perl.
+  * Rework copyright file to be more precise about which file is
+    copyrighted by whom
+  * Fix path to scripts in preferences window
+  * Replace ScsiEject code in src/misc.c with my new version from the
+    eject package which uses the newer SG ioctl interface. Add new
+    header check for scsi/sg.h to configure.in and regenerate configure
+    and config.h.in.
+  
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 16 Jun 2005 18:28:41 +0200
+
+gtkpod (0.88.1-1) unstable; urgency=low
+
+  * New upstream release
+    - fixes the iPod Shuffle support (Closes: #299768)
+      Thanks to Jörg Kurlbaum for pointing this out 
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 18 Mar 2005 13:15:17 +0100
+
+gtkpod (0.88-1) unstable; urgency=low
+
+  * New upstream version (Closes: #299053)
+  * Fix FTBFS with gcc-4.0; patch by Andreas Jochens
+    (Closes: #298273)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 11 Mar 2005 18:50:52 +0100
+
+gtkpod (0.87.3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri,  4 Mar 2005 14:35:13 -0800
+
+gtkpod (0.85.0-1) unstable; urgency=low
+
+  * New maintainer (Closes: #287988)
+    Acknowledge my own NMU (Closes: #264682, #268340, #230898, #275363)
+  * Apply patch by Andreas Jochens to let gtkpod compile
+    with gcc-4.0 (Closes: #286926)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri,  7 Jan 2005 01:01:58 +0100
+
+gtkpod (0.85.0-0.1) unstable; urgency=low
+
+  * NMU since maintainer is unresponsive to any contact
+    attempts for a log time now.
+  * New upstream release (Closes: #264682)
+  * debian/control:
+    + Shorten short description (Closes: #268340)
+    + Suggest mp3gain (Closes: #230898)
+    + Adjust debhelper build-dependency so that we can use dh_desktop
+  * debian/rules: Tidy up.
+  * debian/docs: Don't install empty NEWS file
+  * debian/menu:
+    + Quote values
+    + Use xpm icon created from the 32x32 icon
+  * debian/gtkpod.sgml: fix some <arg> vs. <option> mistakes
+  * debian/gtkpod.desktop: add .desktop file
+  * Change all occourences of /mnt/ipod to /media/ipod (Closes: #275363)
+    add a NEWS.Debian file to document this.
+  * Fix UTF-8 characters in several files
+  * Don't issue warning about not beeing able to "unsort" a table.
+    It's quite annyoing and the user has no possibility to fix it.
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu,  9 Dec 2004 18:17:17 +0100
+
+gtkpod (0.72-2-2) unstable; urgency=low
+
+  * Fix build dependencies (libid3tag0-dev).
+  * Change priority to extra.
+
+ -- Quôc Peyrot <chojin at debian.org>  Sat,  7 Feb 2004 05:14:03 +0000
+
+gtkpod (0.72-2-1) unstable; urgency=low
+
+  * New upstream release. Closes: #216155.
+  * Update policy revision to 3.6.1 (use UTF-8).
+  * Change the debian maintainer email to chojin at debian.org.
+
+ -- Quôc Peyrot <chojin at debian.org>  Tue,  3 Feb 2004 07:15:04 +0000
+
+gtkpod (0.51-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Quôc Peyrot <chojin at debian.org>  Sat, 17 May 2003 04:15:02 +0000
+
+gtkpod (0.50-1) unstable; urgency=low
+
+  * Initial Release. Closes: #182289.
+
+ -- Quôc Peyrot <chojin at debian.org>  Tue, 22 Apr 2003 05:16:37 +0000

Deleted: gtkpod/tags/0.99.12-1/debian/control
===================================================================
--- gtkpod/trunk/debian/control	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/control	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,21 +0,0 @@
-Source: gtkpod
-Section: sound
-Priority: extra
-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), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch
-Standards-Version: 3.7.2
-Homepage: http://www.gtkpod.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
-
-Package: gtkpod
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: mp3gain, recode, python
-Description: manage songs and playlists on an Apple iPod
- gtkpod is a platform independent GUI for Apple's iPod using GTK2. It
- allows you to upload songs and playlists to your iPod. It supports ID3
- tag editing, multiple charsets for ID3 tags, detects duplicate songs,
- allows offline modification of the database with later synchronisation,
- and more.

Copied: gtkpod/tags/0.99.12-1/debian/control (from rev 294, gtkpod/trunk/debian/control)
===================================================================
--- gtkpod/tags/0.99.12-1/debian/control	                        (rev 0)
+++ gtkpod/tags/0.99.12-1/debian/control	2008-01-14 11:56:40 UTC (rev 297)
@@ -0,0 +1,21 @@
+Source: gtkpod
+Section: sound
+Priority: extra
+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), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.6.0), libcurl4-gnutls-dev, libhal-dev, dpatch
+Standards-Version: 3.7.3
+Homepage: http://www.gtkpod.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
+
+Package: gtkpod
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: mp3gain, recode, python
+Description: manage songs and playlists on an Apple iPod
+ gtkpod is a platform independent GUI for Apple's iPod using GTK2. It
+ allows you to upload songs and playlists to your iPod. It supports ID3
+ tag editing, multiple charsets for ID3 tags, detects duplicate songs,
+ allows offline modification of the database with later synchronisation,
+ and more.

Deleted: gtkpod/tags/0.99.12-1/debian/patches/00list
===================================================================
--- gtkpod/trunk/debian/patches/00list	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/patches/00list	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,3 +0,0 @@
-01_mountpoint
-02_missing_fclose
-03_itdb-set-local-to-imported

Copied: gtkpod/tags/0.99.12-1/debian/patches/00list (from rev 294, gtkpod/trunk/debian/patches/00list)
===================================================================
--- gtkpod/tags/0.99.12-1/debian/patches/00list	                        (rev 0)
+++ gtkpod/tags/0.99.12-1/debian/patches/00list	2008-01-14 11:56:40 UTC (rev 297)
@@ -0,0 +1 @@
+01_mountpoint

Deleted: gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,276 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_mountpoint.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~/README trunk/README
---- trunk~/README	2007-11-18 16:47:22.000000000 +0100
-+++ trunk/README	2007-11-20 14:20:36.000000000 +0100
-@@ -52,7 +52,7 @@
- 1) If your iPod is not mounted automatically when connecting it to
-    your computer follow steps 1-7 in the "Connecting your iPod to a
-    Linux box" (basically you need to get the iPod partition mounted to
--   /mnt/ipod).  In most cases this should not be necessary any more
-+   /media/ipod).  In most cases this should not be necessary any more
-    these days.
- 
- 2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will
-@@ -699,13 +699,13 @@
-    (Obviously you need to change the filesystem type from 'vfat' to
-    'hfsplus' when you use an HFS formatted iPod.)
- 
--   Then simply add a link from /mnt/ipod:
-+   Then simply add a link from /media/ipod:
- 
--   ln -s /var/autofs/removable/ipod /mnt/ipod
-+   ln -s /var/autofs/removable/ipod /media/ipod
- 
- 
- Now your system is configured to mount the iPod every time you access
--/mnt/ipod and to unmount it again after two seconds of inactivity. You
-+/media/ipod and to unmount it again after two seconds of inactivity. You
- won't have to worry about doing mounting/unmouting yourself any more.
- 
- 
-@@ -750,19 +750,19 @@
-     *                            -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) 
- 
- 
--3) Create /mnt/ipod:
-+3) Create /media/ipod:
- 
--   mkdir /mnt/ipod
-+   mkdir /media/ipod
- 
- 4) Add a line to /etc/fstab. You should edit uid to match your user
-    id. Also, /dev/sda2 may not be appropriate, if you have other scsi
-    devices.
- 
--/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,errors=remount 0 0
-+/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,errors=remount 0 0
- 
-    (For HFS this line should read
- 
--/dev/sda  /mnt/ipod  hfsplus  rw,user,noauto,exec  0  0
-+/dev/sda  /media/ipod  hfsplus  rw,user,noauto,exec  0  0
- 
-     please note that it's just '/dev/sda')
- 
-@@ -770,7 +770,7 @@
- NOTE: Some users have had problems with newer versions of mount(newer than
- mount-2.11h) The following fstab entry might work better for you.
- 
--/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
-+/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
- 
- 5) Install the hotplug utilities
-    (http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')
-@@ -819,13 +819,13 @@
- 
- 7) Mount the iPod hard drive
- 
--   mount /mnt/ipod
-+   mount /media/ipod
- 
- 8) do whatever you need to do (e.g. start gtkpod, see below)
- 
- 9) Unmount the iPod:
- 
--    umount /mnt/ipod
-+    umount /media/ipod
- 
- 10) Unload the module sbp2 (as most likely as root):
- 
-@@ -874,19 +874,19 @@
-     *                          -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)
-     *                          -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) 
- 
--3) Create /mnt/ipod:
-+3) Create /media/ipod:
- 
--   mkdir /mnt/ipod
-+   mkdir /media/ipod
- 
- 4) Add a line to /etc/fstab. You should edit uid to match your user
-    id. Also, /dev/sda2 may not be appropriate, if you have other scsi
-    devices.
- 
--/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime 0 0
-+/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime 0 0
- 
-    (For HFS this line should read
- 
--/dev/sda  /mnt/ipod  hfsplus  rw,user,noauto,exec  0  0
-+/dev/sda  /media/ipod  hfsplus  rw,user,noauto,exec  0  0
- 
-     please note that it's just '/dev/sda')
- 
-@@ -894,7 +894,7 @@
- NOTE: Some users have had problems with newer versions of mount(newer than
- mount-2.11h) The following fstab entry might work better for you.
- 
--/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
-+/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
- 
- NOTE: You can add ",umask=0" to the options to make the iPod
- readable/writable for all users.
-@@ -934,13 +934,13 @@
- 
- 7) Mount the iPod hard drive
- 
--   mount /mnt/ipod
-+   mount /media/ipod
- 
- 8) do whatever you need to do (e.g. start gtkpod, see below)
- 
- 9) Unmount the iPod:
- 
--    umount /mnt/ipod
-+    umount /media/ipod
- 
- 10) Unload the module sbp2 (as most likely as root):
- 
-@@ -974,7 +974,7 @@
- - since the iPod's hdd was already spun up, the SCSI subsystem now
-   recognizes it and mounts it as /dev/sda
- 
--- You can then mount /dev/sda2 to /mnt/ipod as normal."
-+- You can then mount /dev/sda2 to /media/ipod as normal."
- 
- On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had
- any problem whatsoever getting the iPod to work. With IEEE it was
-@@ -1030,10 +1030,10 @@
- /**********/
- Add a line similar to the below to your /etc/fstab, this will enable users
- to mount the ipod with read/write capabilities.  Example line assumes your
--ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda
-+ipod mount point is /media/ipod and your ipod is detected as /dev/sda
- 
- ------------------------------- Begin Here ---------------------------------
--/dev/sda2       /mnt/ipod       vfat    rw,user,noauto          0       0
-+/dev/sda2       /media/ipod       vfat    rw,user,noauto          0       0
- ------------------------------- End Here -----------------------------------
- 
- 
-diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh
---- trunk~/scripts/sync-abook.sh	2007-11-18 16:28:19.000000000 +0100
-+++ trunk/scripts/sync-abook.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -9,7 +9,7 @@
- #
- # with the following defaults: 
- 
--IPOD_MOUNT='/mnt/ipod'				# mount point of ipod
-+IPOD_MOUNT='/media/ipod'				# mount point of ipod
- DATAFILE='~/.abook/addressbook'	                # the abook db
- ENCODING_FROM=UTF-8                             # encoding used by abook
- ENCODING=ISO-8859-15                            # encoding used by ipod
-diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh
---- trunk~/scripts/sync-evocalendar.sh	2007-11-18 16:28:23.000000000 +0100
-+++ trunk/scripts/sync-evocalendar.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -10,7 +10,7 @@
- #
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
- 
- #the path to a script that will be passed the ical information from STDIN and filter, if needed
- #FILTER_SCRIPT=
-diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
---- trunk~/scripts/sync-evolution.sh	2007-11-18 16:28:26.000000000 +0100
-+++ trunk/scripts/sync-evolution.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -13,7 +13,7 @@
- #
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod         # mountpoint of ipod
- EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin'                        # additional path
- ENCODING=ISO-8859-15         # encoding used by ipod
- 
-diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh
---- trunk~/scripts/sync-kaddressbook.sh	2007-11-18 16:28:29.000000000 +0100
-+++ trunk/scripts/sync-kaddressbook.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -9,7 +9,7 @@
- #
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
- DATAFILE=~/.kde/share/apps/kabc/std.vcf       # vcard file
- ENCODING=ISO-8859-15                          # encoding used by ipod
- 
-diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh
---- trunk~/scripts/sync-korganizer.sh	2007-11-18 16:28:35.000000000 +0100
-+++ trunk/scripts/sync-korganizer.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -9,7 +9,7 @@
- #
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
- DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
- ENCODING=ISO-8859-15                          # encoding used by ipod
- 
-diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
---- trunk~/scripts/sync-ldif.sh	2007-11-19 18:49:28.000000000 +0100
-+++ trunk/scripts/sync-ldif.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -15,7 +15,7 @@
- # differently...This is still Chinese for me!! :)
- 
- export LDIFAMILYNAME=contactIPOD	# Filenames will look like $LDIFAMILYNAMEXX.vcf, X=[0-9]
--export IPOD_MOUNT=/mnt/ipod		# Mount point of the ipod
-+export IPOD_MOUNT=/media/ipod		# Mount point of the ipod
- declare LDIFILE=addressbook.ldif	# default filename 'addressbook.ldif'
- declare ENCODING=ISO-8859-15            # To try others encodings : 'iconv --list'
- declare DELETE="NO"			# To delete old .vcf files by default? 'NO'!!
-diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
---- trunk~/scripts/sync-thunderbird-nano.sh	2007-11-18 16:28:43.000000000 +0100
-+++ trunk/scripts/sync-thunderbird-nano.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -25,7 +25,7 @@
- 
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod         # mountpoint of ipod
- ENCODING=ISO-8859-15         # encoding used by ipod
- NAME=thunderbird             # default file export name
- FILE_FLAG=''		     # flag used to determine end of file
-diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh
---- trunk~/scripts/sync-thunderbird.sh	2007-11-18 16:28:46.000000000 +0100
-+++ trunk/scripts/sync-thunderbird.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -18,7 +18,7 @@
- 
- # with the following defaults: 
- 
--IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
-+IPOD_MOUNT=/media/ipod         # mountpoint of ipod
- ENCODING=ISO-8859-15         # encoding used by ipod
- NAME=thunderbird             # default file export name
- 
-diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh
---- trunk~/scripts/sync-webcalendar.sh	2007-11-18 16:28:52.000000000 +0100
-+++ trunk/scripts/sync-webcalendar.sh	2007-11-20 14:20:36.000000000 +0100
-@@ -9,7 +9,7 @@
- # with the following defaults:
- 
- # mount point of ipod
--IPOD_MOUNT='/mnt/ipod'
-+IPOD_MOUNT='/media/ipod'
- # uri for webcalendar (example)
- DATAFILE='https://somewhere.local/calendar.ics'
- # calendar name
-diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
---- trunk~/src/prefs.c	2007-11-18 16:45:09.000000000 +0100
-+++ trunk/src/prefs.c	2007-11-20 14:20:44.000000000 +0100
-@@ -178,7 +178,7 @@
-     prefs_set_int("delete_file", TRUE);
-     prefs_set_int("delete_local_file", TRUE);
-     prefs_set_int("delete_database", TRUE);
--    prefs_set_string("initial_mountpoint", "/mnt/ipod");
-+    prefs_set_string("initial_mountpoint", "/media/ipod");
-     prefs_set_string ("path_play_now", "xmms %s");
-     prefs_set_string ("path_play_enqueue", "xmms -e %s");
-     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");

Copied: gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch (from rev 294, gtkpod/trunk/debian/patches/01_mountpoint.dpatch)
===================================================================
--- gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch	                        (rev 0)
+++ gtkpod/tags/0.99.12-1/debian/patches/01_mountpoint.dpatch	2008-01-14 11:56:40 UTC (rev 297)
@@ -0,0 +1,276 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_mountpoint.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~/README trunk/README
+--- trunk~/README	2008-01-13 17:22:28.000000000 +0100
++++ trunk/README	2008-01-13 17:37:38.000000000 +0100
+@@ -53,7 +53,7 @@
+ 1) If your iPod is not mounted automatically when connecting it to
+    your computer follow steps 1-7 in the "Connecting your iPod to a
+    Linux box" (basically you need to get the iPod partition mounted to
+-   /mnt/ipod).  In most cases this should not be necessary any more
++   /media/ipod).  In most cases this should not be necessary any more
+    these days.
+ 
+ 2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will
+@@ -737,13 +737,13 @@
+    (Obviously you need to change the filesystem type from 'vfat' to
+    'hfsplus' when you use an HFS formatted iPod.)
+ 
+-   Then simply add a link from /mnt/ipod:
++   Then simply add a link from /media/ipod:
+ 
+-   ln -s /var/autofs/removable/ipod /mnt/ipod
++   ln -s /var/autofs/removable/ipod /media/ipod
+ 
+ 
+ Now your system is configured to mount the iPod every time you access
+-/mnt/ipod and to unmount it again after two seconds of inactivity. You
++/media/ipod and to unmount it again after two seconds of inactivity. You
+ won't have to worry about doing mounting/unmouting yourself any more.
+ 
+ 
+@@ -788,19 +788,19 @@
+     *                            -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) 
+ 
+ 
+-3) Create /mnt/ipod:
++3) Create /media/ipod:
+ 
+-   mkdir /mnt/ipod
++   mkdir /media/ipod
+ 
+ 4) Add a line to /etc/fstab. You should edit uid to match your user
+    id. Also, /dev/sda2 may not be appropriate, if you have other scsi
+    devices.
+ 
+-/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,errors=remount 0 0
++/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,errors=remount 0 0
+ 
+    (For HFS this line should read
+ 
+-/dev/sda  /mnt/ipod  hfsplus  rw,user,noauto,exec  0  0
++/dev/sda  /media/ipod  hfsplus  rw,user,noauto,exec  0  0
+ 
+     please note that it's just '/dev/sda')
+ 
+@@ -808,7 +808,7 @@
+ NOTE: Some users have had problems with newer versions of mount(newer than
+ mount-2.11h) The following fstab entry might work better for you.
+ 
+-/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
++/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
+ 
+ 5) Install the hotplug utilities
+    (http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')
+@@ -857,13 +857,13 @@
+ 
+ 7) Mount the iPod hard drive
+ 
+-   mount /mnt/ipod
++   mount /media/ipod
+ 
+ 8) do whatever you need to do (e.g. start gtkpod, see below)
+ 
+ 9) Unmount the iPod:
+ 
+-    umount /mnt/ipod
++    umount /media/ipod
+ 
+ 10) Unload the module sbp2 (as most likely as root):
+ 
+@@ -912,19 +912,19 @@
+     *                          -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)
+     *                          -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) 
+ 
+-3) Create /mnt/ipod:
++3) Create /media/ipod:
+ 
+-   mkdir /mnt/ipod
++   mkdir /media/ipod
+ 
+ 4) Add a line to /etc/fstab. You should edit uid to match your user
+    id. Also, /dev/sda2 may not be appropriate, if you have other scsi
+    devices.
+ 
+-/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime 0 0
++/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime 0 0
+ 
+    (For HFS this line should read
+ 
+-/dev/sda  /mnt/ipod  hfsplus  rw,user,noauto,exec  0  0
++/dev/sda  /media/ipod  hfsplus  rw,user,noauto,exec  0  0
+ 
+     please note that it's just '/dev/sda')
+ 
+@@ -932,7 +932,7 @@
+ NOTE: Some users have had problems with newer versions of mount(newer than
+ mount-2.11h) The following fstab entry might work better for you.
+ 
+-/dev/sda2	/mnt/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
++/dev/sda2	/media/ipod	vfat rw,user,noauto,noatime,shortname=winnt 0 0
+ 
+ NOTE: You can add ",umask=0" to the options to make the iPod
+ readable/writable for all users.
+@@ -972,13 +972,13 @@
+ 
+ 7) Mount the iPod hard drive
+ 
+-   mount /mnt/ipod
++   mount /media/ipod
+ 
+ 8) do whatever you need to do (e.g. start gtkpod, see below)
+ 
+ 9) Unmount the iPod:
+ 
+-    umount /mnt/ipod
++    umount /media/ipod
+ 
+ 10) Unload the module sbp2 (as most likely as root):
+ 
+@@ -1012,7 +1012,7 @@
+ - since the iPod's hdd was already spun up, the SCSI subsystem now
+   recognizes it and mounts it as /dev/sda
+ 
+-- You can then mount /dev/sda2 to /mnt/ipod as normal."
++- You can then mount /dev/sda2 to /media/ipod as normal."
+ 
+ On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had
+ any problem whatsoever getting the iPod to work. With IEEE it was
+@@ -1068,10 +1068,10 @@
+ /**********/
+ Add a line similar to the below to your /etc/fstab, this will enable users
+ to mount the ipod with read/write capabilities.  Example line assumes your
+-ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda
++ipod mount point is /media/ipod and your ipod is detected as /dev/sda
+ 
+ ------------------------------- Begin Here ---------------------------------
+-/dev/sda2       /mnt/ipod       vfat    rw,user,noauto          0       0
++/dev/sda2       /media/ipod       vfat    rw,user,noauto          0       0
+ ------------------------------- End Here -----------------------------------
+ 
+ 
+diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh
+--- trunk~/scripts/sync-abook.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-abook.sh	2008-01-13 17:38:11.000000000 +0100
+@@ -9,7 +9,7 @@
+ #
+ # with the following defaults: 
+ 
+-IPOD_MOUNT='/mnt/ipod'				# mount point of ipod
++IPOD_MOUNT='/media/ipod'				# mount point of ipod
+ DATAFILE='~/.abook/addressbook'	                # the abook db
+ ENCODING_FROM=UTF-8                             # encoding used by abook
+ ENCODING=ISO-8859-15                            # encoding used by ipod
+diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh
+--- trunk~/scripts/sync-evocalendar.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evocalendar.sh	2008-01-13 17:38:13.000000000 +0100
+@@ -10,7 +10,7 @@
+ #
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
++IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
+ 
+ #the path to a script that will be passed the ical information from STDIN and filter, if needed
+ #FILTER_SCRIPT=
+diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
+--- trunk~/scripts/sync-evolution.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evolution.sh	2008-01-13 17:38:16.000000000 +0100
+@@ -13,7 +13,7 @@
+ #
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
++IPOD_MOUNT=/media/ipod         # mountpoint of ipod
+ ENCODING=ISO-8859-15         # encoding used by ipod
+ 
+ # try to find the path to evolution-addressbook-export
+diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh
+--- trunk~/scripts/sync-kaddressbook.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-kaddressbook.sh	2008-01-13 17:38:18.000000000 +0100
+@@ -9,7 +9,7 @@
+ #
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
++IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
+ DATAFILE=~/.kde/share/apps/kabc/std.vcf       # vcard file
+ ENCODING=ISO-8859-15                          # encoding used by ipod
+ 
+diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh
+--- trunk~/scripts/sync-korganizer.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-korganizer.sh	2008-01-13 17:38:23.000000000 +0100
+@@ -9,7 +9,7 @@
+ #
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod                          # mountpoint of ipod
++IPOD_MOUNT=/media/ipod                          # mountpoint of ipod
+ DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
+ ENCODING=ISO-8859-15                          # encoding used by ipod
+ 
+diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
+--- trunk~/scripts/sync-ldif.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-ldif.sh	2008-01-13 17:38:25.000000000 +0100
+@@ -15,7 +15,7 @@
+ # differently...This is still Chinese for me!! :)
+ 
+ export LDIFAMILYNAME=contactIPOD	# Filenames will look like $LDIFAMILYNAMEXX.vcf, X=[0-9]
+-export IPOD_MOUNT=/mnt/ipod		# Mount point of the ipod
++export IPOD_MOUNT=/media/ipod		# Mount point of the ipod
+ declare LDIFILE=addressbook.ldif	# default filename 'addressbook.ldif'
+ declare ENCODING=ISO-8859-15            # To try others encodings : 'iconv --list'
+ declare DELETE="NO"			# To delete old .vcf files by default? 'NO'!!
+diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
+--- trunk~/scripts/sync-thunderbird-nano.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird-nano.sh	2008-01-13 17:38:32.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
++IPOD_MOUNT=/media/ipod         # mountpoint of ipod
+ ENCODING=ISO-8859-15         # encoding used by ipod
+ NAME=thunderbird             # default file export name
+ FILE_FLAG=''		     # flag used to determine end of file
+diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh
+--- trunk~/scripts/sync-thunderbird.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird.sh	2008-01-13 17:38:34.000000000 +0100
+@@ -18,7 +18,7 @@
+ 
+ # with the following defaults: 
+ 
+-IPOD_MOUNT=/mnt/ipod         # mountpoint of ipod
++IPOD_MOUNT=/media/ipod         # mountpoint of ipod
+ ENCODING=ISO-8859-15         # encoding used by ipod
+ NAME=thunderbird             # default file export name
+ 
+diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh
+--- trunk~/scripts/sync-webcalendar.sh	2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-webcalendar.sh	2008-01-13 17:38:38.000000000 +0100
+@@ -9,7 +9,7 @@
+ # with the following defaults:
+ 
+ # mount point of ipod
+-IPOD_MOUNT='/mnt/ipod'
++IPOD_MOUNT='/media/ipod'
+ # uri for webcalendar (example)
+ DATAFILE='https://somewhere.local/calendar.ics'
+ # calendar name
+diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
+--- trunk~/src/prefs.c	2008-01-13 17:22:24.000000000 +0100
++++ trunk/src/prefs.c	2008-01-13 17:38:56.000000000 +0100
+@@ -179,7 +179,7 @@
+     prefs_set_int("delete_file", TRUE);
+     prefs_set_int("delete_local_file", TRUE);
+     prefs_set_int("delete_database", TRUE);
+-    prefs_set_string("initial_mountpoint", "/mnt/ipod");
++    prefs_set_string("initial_mountpoint", "/media/ipod");
+     prefs_set_string ("path_play_now", "xmms %s");
+     prefs_set_string ("path_play_enqueue", "xmms -e %s");
+     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");

Deleted: gtkpod/tags/0.99.12-1/debian/patches/02_missing_fclose.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/02_missing_fclose.dpatch	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/patches/02_missing_fclose.dpatch	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_missing_fclose.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 gtkpod-0.99.10~/src/mp3file.c gtkpod-0.99.10/src/mp3file.c
---- gtkpod-0.99.10~/src/mp3file.c	2007-06-27 21:29:33.000000000 +0200
-+++ gtkpod-0.99.10/src/mp3file.c	2007-11-18 14:02:07.000000000 +0100
-@@ -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;
- 

Deleted: gtkpod/tags/0.99.12-1/debian/patches/03_itdb-set-local-to-imported.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch	2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/tags/0.99.12-1/debian/patches/03_itdb-set-local-to-imported.dpatch	2008-01-14 11:56:40 UTC (rev 297)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## itdb-set-local-to-imported.dpatch by John Dong <jdong at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set local iTunesDB's imported status to TRUE
-## DP: Stolen-from: Upstream SVN revno 1596
-## DP:  Resolves a bug where a fresh Local repository refuses to accept
-## DP:  new track additions, such as LP #145506
-
- at DPATCH@
-diff -urNad gtkpod-aac-0.99.10~/src/display_itdb.c gtkpod-aac-0.99.10/src/display_itdb.c
---- gtkpod-aac-0.99.10~/src/display_itdb.c	2007-06-27 15:29:33.000000000 -0400
-+++ gtkpod-aac-0.99.10/src/display_itdb.c	2007-11-16 23:59:54.000000000 -0500
-@@ -998,8 +998,16 @@
- 	    itdb_playlist_set_mpl (pl);
- 	    itdb_playlist_add (itdb, pl, -1);
- 
--	    eitdb->data_changed = FALSE;
--	    eitdb->itdb_imported = FALSE;
-+           if ((type & GP_ITDB_TYPE_PODCASTS) || (type & GP_ITDB_TYPE_LOCAL))
-+             {
-+               eitdb->data_changed = TRUE;
-+               eitdb->itdb_imported = TRUE;
-+             }
-+           else
-+             {
-+               eitdb->data_changed = FALSE;
-+               eitdb->itdb_imported = FALSE;
-+             }
- 	}
- 	else
- 	{




More information about the Pkg-gtkpod-devel mailing list