--- gtkpod-0.99.16.orig/debian/gtkpod-data.install
+++ gtkpod-0.99.16/debian/gtkpod-data.install
@@ -0,0 +1 @@
+debian/tmp/usr/share usr
--- gtkpod-0.99.16.orig/debian/gtkpod.pod
+++ gtkpod-0.99.16/debian/gtkpod.pod
@@ -0,0 +1,87 @@
+=head1 NAME
+
+gtkpod - GTK2 based software for managing songs and playlists on an Apple iPod
+
+=head1 SYNOPSIS
+
+B<gtkpod> [B<-h>] [B<-c>] [B<-o>] [B<-m> I<path>] [B<-p> I<filename>] [B<--hash> I<filename>] 
+
+=head1 DESCRIPTION
+
+This manual page briefly describes the gtkpod command.
+
+=head1 OPTIONS
+
+B<gtkpod> supports the following options:
+
+=over 4
+
+=item B<-h>, B<--help>
+
+Displays the help message.
+
+=item B<-m>, B<--mountpoint> I<path>
+
+Define the mountpoint of your iPod.
+
+=item B<-p> I<filename>
+
+Increment playcount for file I<filename> by one.
+
+=item B<--hash> I<filename>
+
+Print gtkpod hash for file I<filename>.
+
+=back
+
+=head1 FILES
+
+=over 4
+
+=item F<~/.gtkpod/prefs>
+
+Per user configuration file. Should normally only updated through
+the program itself.
+
+=item F</etc/gtkpod/prefs>
+
+Global configuration file. Used if no configuration file exist for the user
+starting gtkpod.
+
+=item F<~/.gtkpod/gtkpod.in>
+
+If this file exists, gtkpod will try to execute it at startup
+This is done before attempting to mount the iPod directory (optional)
+or read the iTunesDB (optional)).
+
+=item F<~/.gtkpod/gtkpod.out>
+
+If this file exists, gtkpod will try to execute it while exiting the
+program. This is done after attempting to unmount the iPod directory
+(optional) and sending the "eject" command to the iPod (optional).
+
+=item F</etc/gtkpod/gtkpod.in>, F</etc/gtkpod/gtkpod.out>
+
+Used instead of the per user scripts if the former ones don't exist
+and these do.
+
+=back
+
+=head1 AUTHOR
+
+ Jorg Schuler <jcsjcs at users.sourceforge.net>
+ Corey Donohoe <atmos at atmos.org>
+ Adrian Ulrich <pab at blinkenlights.ch>
+ and others
+
+This manpage was written by Frank Lichtenheld <frank@lichtenheld>.
+
+=head1 COPYRIGHT AND LICENCE
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+On Debian systems, a copy of the GNU General Public License may be
+found in /usr/share/common-licenses/GPL.
--- gtkpod-0.99.16.orig/debian/gtkpod-data.links
+++ gtkpod-0.99.16/debian/gtkpod-data.links
@@ -0,0 +1 @@
+/usr/share/gtkpod/doc /usr/share/doc/gtkpod-data/html
--- gtkpod-0.99.16.orig/debian/changelog
+++ gtkpod-0.99.16/debian/changelog
@@ -0,0 +1,380 @@
+gtkpod (0.99.16-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    - Migrated from hal + gnome-vfs to gio; removed obsolete dependencies
+      accordingly.
+  * Dropped patches merged upstream:
+    - 10_fix_translations.dpatch
+    - 30_svn_dynamic_libmp4v2.dpatch
+  * debian/control:
+    - Added versioned build-dependency on intltool.
+    - Dropped gtkpod-aac transitional package.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Sat, 15 May 2010 00:10:29 +0700
+
+gtkpod (0.99.14-2ubuntu4) lucid; urgency=low
+
+  * 30_svn_dynamic_libmp4v2.dpatch:
+    - Corrected alternate name for MP4SetMetadataTempo.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Thu, 05 Nov 2009 15:48:18 +0600
+
+gtkpod (0.99.14-2ubuntu3) karmic; urgency=low
+
+  * debian/control:
+    - Actually add a gtkpod-aac transitional package (not added in -2ubuntu2).
+    - Removed recommends on libmp4v2-0 (universe packages shouldn't recommend
+      multiverse packages). Not adding to suggests because faac already depends
+      on it and is in suggests.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Mon, 11 May 2009 22:10:44 +0700
+
+gtkpod (0.99.14-2ubuntu2) karmic; urgency=low
+
+  * Added debian/patches/30_svn_dynamic_libmp4v2.dpatch:
+    - My patch from upstream SVN to detect and load libmp4v2 dynamically.
+  * debian/control:
+    - Add gtkpod-aac as transitional package. This will remove the need for a
+      separate gtkpod-aac source package in multiverse.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Sun, 10 May 2009 22:07:56 +0700
+
+gtkpod (0.99.14-2ubuntu1) karmic; urgency=low
+
+  * Merged from Debian unstable, remaining Ubuntu changes:
+    + debian/gtkpod-icon-32x32.xpm:
+      - Updated for new upstream icon.
+    + debian/patches/20_convert_common_script.dpatch:
+      - Fix bashism in audio file conversion script.
+    + debian/control:
+      - Version Replaces for gtkpod-data, since 0.99.14-0ubuntuX did not
+        include a gtkpod-data package.
+      - Remove build-dependency on libgnomecanvas2-dev: upstream replaced
+        libgnomecanvas with cairo.
+      - Make gtkpod-data conflict with gtkpod-aac for now.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Tue, 28 Apr 2009 22:43:36 +0700
+
+gtkpod (0.99.14-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Frank Lichtenheld <djpig@debian.org>  Mon, 09 Mar 2009 23:53:41 +0100
+
+gtkpod (0.99.14-1) experimental; urgency=low
+
+  * New upstream release
+    + drop patch 10_usage--auto, applied upstream
+    + drop patch 20_scripts_bashisms, applied upstream
+    + bump libgpod-dev build-dependency to >= 0.7.0
+    + drop debian/gtkpod.desktop and use upstream's
+      version
+    + do not generate manpage from debian/gtkpod.pod and
+      use upstream's version. Since debian/gtkpod.pod is
+      the original source and upstream only includes the
+      generated groff file, I leave the POD file in the
+      source.
+  * Reorganise packaging. Move arch-indep data to
+    gtkpod-data package and rewrite debian/rules to
+    use dh.
+  * Fix watch file to use SF.net redirector implicetly
+  * Bump Standards-Version to 3.8.0
+    + Add debian README.source about dpatch
+  * Add new patch 10_fix_translations for a broken string
+    in the German translation
+
+ -- Frank Lichtenheld <djpig@debian.org>  Thu, 26 Feb 2009 18:13:27 +0100
+
+gtkpod (0.99.14-0ubuntu2) jaunty; urgency=low
+
+  * Fix menu item icon (LP: #351681):
+    - debian/gtkpod.desktop: Update to the new icon path
+    - debian/gtkpod-icon-32x32.xpm: Remove un-needed file
+    - debian/install: Remove installation of old icon
+
+ -- David Futcher <bobbo@ubuntu.com>  Tue, 31 Mar 2009 16:23:30 +0100
+
+gtkpod (0.99.14-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release:
+    - Includes my upstream HIG improvements. (LP: #1701)
+    - Using libgpod 0.7.0. (LP: #331032)
+  * Removed pod2man call from debian/rules, manpage included upstream.
+  * Removed 10_usage--auto.dpatch, applied upstream.
+  * Removed 20_scripts_bashisms.dpatch, applied upstream.
+  * Added 10_convert-common-script.dpatch by mettle to fix conversion of
+    audio files. (LP: #309320)
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Wed, 18 Feb 2009 20:07:42 +0600
+
+gtkpod (0.99.12-3) unstable; urgency=low
+
+  * Add 20_scripts_bashisms. This fixes bashisms in
+    the helper scripts or at least makes them explicetly
+    bash scripts. Reported by Raphael Geissert. (Closes: #489605)
+  * Remove the obsolete Suggest on recode, all scripts use
+    iconv nowadays.
+  * Add some new Recommends/Suggests for the convert-* scripts.
+    Addresses at least part of LP #193722
+  * Update copyright file.
+
+ -- Frank Lichtenheld <djpig@debian.org>  Thu, 10 Jul 2008 23:45:04 +0200
+
+gtkpod (0.99.12-2) unstable; urgency=low
+
+  * Call dh_icons. Suggested by Sikon (Closes: #466126)
+  * Bump debhelper compat level to 6 and adapt
+    build-dependencies.
+  * Add 10_usage--auto.dpatch. -a/--auto was removed, so
+    don't advertise it in the usage output. Also adapt
+    the man page. (Closes: #466127)
+
+ -- Frank Lichtenheld <djpig@debian.org>  Thu, 17 Apr 2008 20:25:51 +0200
+
+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@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@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@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@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@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@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@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@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@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@debian.org>  Thu, 30 Nov 2006 23:12:32 +0100
+
+gtkpod (0.99.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Frank Lichtenheld <djpig@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@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@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@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@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@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@debian.org>  Fri, 11 Mar 2005 18:50:52 +0100
+
+gtkpod (0.87.3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Frank Lichtenheld <djpig@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@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@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@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@debian.org.
+
+ -- Quôc Peyrot <chojin@debian.org>  Tue,  3 Feb 2004 07:15:04 +0000
+
+gtkpod (0.51-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Quôc Peyrot <chojin@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@debian.org>  Tue, 22 Apr 2003 05:16:37 +0000
--- gtkpod-0.99.16.orig/debian/gtkpod.install
+++ gtkpod-0.99.16/debian/gtkpod.install
@@ -0,0 +1,2 @@
+usr/bin usr
+debian/gtkpod-icon-32x32.xpm usr/share/pixmaps
--- gtkpod-0.99.16.orig/debian/watch
+++ gtkpod-0.99.16/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/gtkpod/gtkpod-(.+)\.tar\.gz
--- gtkpod-0.99.16.orig/debian/gtkpod-data.dirs
+++ gtkpod-0.99.16/debian/gtkpod-data.dirs
@@ -0,0 +1 @@
+usr/share/pixmaps
--- gtkpod-0.99.16.orig/debian/rules
+++ gtkpod-0.99.16/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+
+build-stamp: patch-stamp
+	dh build
+	touch build-stamp
+
+clean: unpatch
+	dh clean
+
+install: build
+	dh install --before dh_installdocs
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_installexamples -i
+	dh install --after dh_installexamples
+
+binary-indep: build install
+	dh binary-indep
+
+binary-arch: build install
+	dh binary-arch
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- gtkpod-0.99.16.orig/debian/gtkpod.lintian-overrides
+++ gtkpod-0.99.16/debian/gtkpod.lintian-overrides
@@ -0,0 +1,2 @@
+# in gtkpod-data
+gtkpod: binary-without-manpage usr/bin/gtkpod
--- gtkpod-0.99.16.orig/debian/gtkpod-data.lintian-overrides
+++ gtkpod-0.99.16/debian/gtkpod-data.lintian-overrides
@@ -0,0 +1,3 @@
+# gtkpod-data is only useful together with gtkpod
+gtkpod-data: python-script-but-no-python-dep ./usr/share/gtkpod/scripts/sync-palm-jppy.py
+gtkpod-data: desktop-command-not-in-package /usr/share/applications/gtkpod.desktop gtkpod
--- gtkpod-0.99.16.orig/debian/gtkpod.links
+++ gtkpod-0.99.16/debian/gtkpod.links
@@ -0,0 +1 @@
+/usr/share/doc/gtkpod-data /usr/share/doc/gtkpod
--- gtkpod-0.99.16.orig/debian/gtkpod.menu
+++ gtkpod-0.99.16/debian/gtkpod.menu
@@ -0,0 +1,3 @@
+?package(gtkpod):needs="X11" section="Applications/Sound" \
+  title="gtkpod" command="/usr/bin/gtkpod" \
+  icon="/usr/share/pixmaps/gtkpod-icon-32x32.xpm"
--- gtkpod-0.99.16.orig/debian/gtkpod-data.docs
+++ gtkpod-0.99.16/debian/gtkpod-data.docs
@@ -0,0 +1 @@
+README
--- gtkpod-0.99.16.orig/debian/clean
+++ gtkpod-0.99.16/debian/clean
@@ -0,0 +1,2 @@
+gtkpod.1
+pixmaps/gtkpod.glade*
--- gtkpod-0.99.16.orig/debian/copyright
+++ gtkpod-0.99.16/debian/copyright
@@ -0,0 +1,168 @@
+This package was debianized by Quôc Peyrot <chojin@debian.org> on
+Tue, 22 Apr 2003 05:16:37 +0000.
+
+It was downloaded from http://gtkpod.sourceforge.net/ 
+
+Upstream Authors: 
+Jorg Schuler <jcsjcs at users.sourceforge.net>
+Corey Donohoe <atmos at atmos.org>
+Adrian Ulrich <pab at blinkenlights.ch>
+
+Copyright:
+
+Unless otherwise noted:
+	Copyright © 2002-2007 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+src/getopt*.{c,h}:
+	Copyright © 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
+        	Free Software Foundation, Inc.
+
+	This file is part of the GNU C Library.
+	The GNU C Library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public
+        License as published by the Free Software Foundation; either
+        version 2.1 of the License, or (at your option) any later version.
+
+        On Debian GNU/Linux systems, the complete text of the GNU Lesser
+        General Public License can be found in
+        `/usr/share/common-licenses/LGPL'.
+src/itdb.h:
+	Copyright © 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+	Most of the code in this file has been ported from the perl
+	script "mktunes.pl" (part of the gnupod-tools collection) written
+	by Adrian Ulrich <pab at blinkenlights.ch>
+
+	The code contained in this file is free software; you can redistribute
+	it and/or modify it under the terms of the GNU Lesser General Public
+	License as published by the Free Software Foundation; either version
+	2.1 of the License, or (at your option) any later version.
+src/misc.c:
+	Copyright © 2004      Ero Carrera <ero at dkbza.org>
+	Copyright © 2002-2007 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/wavfile.{c,h}:
+	Copyright © 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas,
+        	              Thomas Nilsson and 4Front Technologies
+	Copyright © 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/prefs_window.{c,h},
+src/md5.{c,h},
+src/file_export.c,
+src/context_menus.{c,h},
+src/sort_window.{c,h}:
+	Copyright © 2002-2003 Corey Donohoe <atmos at atmos dot org>
+	Copyright © 2002-2007 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/mp3file.c:
+	Copyright © 2000-2001 Cedric Tefft <cedric@earthling.net>
+	Copyright © 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
+	Copyright © 2004 Jens Taprogge <jens.taprogge at post.rwth-aachen.de>
+src/mp4file.c:
+	Copyright © 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+	 Note: code for mp4_get_file_info() is based on mp4info.cpp of the
+	 mpeg4ip project
+src/fileselection.{c,h}:
+	Copyright © 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+	Copyright © 2005      James Liggett <jrliggett at cox dot net>
+src/oggfile.c:
+	Copyright © 2007 Marc d[r]eadlock <m.dreadlock at gmail com>
+src/display_photo.{c,h},
+src/display_coverart.{c,h},
+src/fetchcover.{c,h},
+src/stock_icons.{c,h}:
+	Copyright © 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+src/sha1.{c,h}:
+	Copyright © 2002      Corey Donohoe <atmos at atmos.org>
+	Copyright © 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
+src/prefs.{c,h}:
+	Copyright © 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
+	Copyright © 2006      James Liggett <jrliggett at cox.net>
+src/help.{c,h},
+src/infodlg.{c,h},
+src/prefsdlg.c:
+	Copyright © 2007 Matvey Kozhev <sikon at users sourceforge net>
+src/rb_cell_renderer_rating.{c,h}:
+	Copyright © 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
+	Copyright © 2002  Olivier Martin <oleevye@wanadoo.fr>
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Library General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+src/rb_rating_helper.{c,h}:
+	Copyright © 2004 Christophe Fergeau <teuf@gnome.org>
+scripts/mab2vcard:
+	Copyright © 2004 Jamie Zawinski <jwz at jwz dot org>
+	Copyright ©      Clinton Gormley <perl at traveljury dot com>
+
+	Permission to use, copy, modify, distribute, and sell this software
+	and its documentation for any purpose is hereby granted without fee,
+	provided that the above copyright notice appear in all copies and
+	that both that copyright notice and this permission notice appear in
+	supporting documentation.  No representations are made about the
+	suitability of this software for any purpose.  It is provided "as
+	is" without express or implied warranty.
+scripts/sync-abook.sh,
+scripts/sync-webcalendar.sh:
+	Copyright © 2005 Daniel Kercher
+scripts/sync-evocalendar.sh,
+scripts/sync-kaddressbook.sh,
+scripts/sync-korganizer.sh,
+scripts/sync-notes.sh,
+scripts/sync-tomboy.sh:
+	Copyright © 2004 Markus Gaugusch <markus at gaugusch dot at>
+scripts/sync-evolution.sh,
+scripts/sync-thunderbird.sh:
+	Copyright © 2004 Clinton Gormley <clint at traveljury dot com>
+scripts/sync-knotes.sh:
+	Copyright © 2005 Sebastian Scherer <basti at andrew.cmu.edu>
+scripts/sync-ldif.sh:
+	Copyright © <sberidot at libertysurf dot fr>
+scripts/sync-palm-jppy.py:
+	Copyright © 2005 Nick Piper <nick at nickpiper dot co dot uk>
+scripts/sync-thunderbird-nano.sh:
+	Copyright © 2006 Paul Oremland <paul at oremland dot net>
+doc/*:
+	Copyright © 2007 gtkpod wiki contributors
+	Permission is granted to copy, distribute and/or modify this
+	document under the terms of the GNU Free Documentation
+	License (GFDL), Version 1.2 or any later version published
+	by the Free Software Foundation with no Invariant Sections,
+	no Front-Cover Texts, and no Back-Cover Texts.
+
+	On Debian GNU/Linux systems, the complete text of the GNU Free
+	Documentation License can be found in
+	`/usr/share/common-licenses/GFDL'.
+
+The gtkpod icon is based on the gnome-icon-theme-extras project and licensed
+under the GPL v2. Originally created by Ryan Collier, modified by
+Rodney Dawes <dobey.pwns@gmail.com>.
+("multimedia-player-apple-ipod-video-white")
+
+This project uses icons from the Rhythmbox (http://rhythmbox.org) project,
+licensed under the GPL v2 or later:
+* data/tunes_playlist_icon-48.png
+
+This project uses icons from the F-Spot (http://f-spot.org) project,
+licensed under the GPL v2 or later:
+* data/photo-toolbar-album.png
+* data/photo-toolbar-photos.png
+
+
+iTunes and iPod are trademarks of Apple.
+
+This product is not supported/written/published by Apple!
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- gtkpod-0.99.16.orig/debian/compat
+++ gtkpod-0.99.16/debian/compat
@@ -0,0 +1 @@
+7
--- gtkpod-0.99.16.orig/debian/README.source
+++ gtkpod-0.99.16/debian/README.source
@@ -0,0 +1,26 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
--- gtkpod-0.99.16.orig/debian/gtkpod-icon-32x32.xpm
+++ gtkpod-0.99.16/debian/gtkpod-icon-32x32.xpm
@@ -0,0 +1,194 @@
+/* XPM */
+static char * gtkpod_icon_32x32_xpm[] = {
+"32 32 159 2",
+"  	c None",
+". 	c #C2C2C2",
+"+ 	c #AAAAAA",
+"@ 	c #FCFCFC",
+"# 	c #FEFEFE",
+"$ 	c #EFEFEF",
+"% 	c #8A8B8B",
+"& 	c #868787",
+"* 	c #E9E9E9",
+"= 	c #C7C7C7",
+"- 	c #79899D",
+"; 	c #B5C1D4",
+"> 	c #7F98B8",
+", 	c #819EBE",
+"' 	c #84A5C4",
+") 	c #91B1CE",
+"! 	c #A3C0D9",
+"~ 	c #B3CDE1",
+"{ 	c #C0D5E6",
+"] 	c #9CABB7",
+"^ 	c #A2B0BB",
+"/ 	c #C0D0E0",
+"( 	c #B2C5D9",
+"_ 	c #607996",
+": 	c #A4A4A4",
+"< 	c #7D93B3",
+"[ 	c #809ABA",
+"} 	c #83A1C1",
+"| 	c #86A8C8",
+"1 	c #99BAD5",
+"2 	c #ADCAE0",
+"3 	c #BFD7E9",
+"4 	c #94A1AB",
+"5 	c #0E0E0F",
+"6 	c #000000",
+"7 	c #131415",
+"8 	c #91A6B9",
+"9 	c #677F9B",
+"0 	c #28303A",
+"a 	c #425061",
+"b 	c #738EAA",
+"c 	c #87ABCA",
+"d 	c #9EBFD9",
+"e 	c #B3D0E5",
+"f 	c #ACC0CE",
+"g 	c #121314",
+"h 	c #798692",
+"i 	c #7088A4",
+"j 	c #A3A3A3",
+"k 	c #7287A5",
+"l 	c #1B2128",
+"m 	c #161B20",
+"n 	c #212A31",
+"o 	c #4C5D69",
+"p 	c #A6C1D4",
+"q 	c #8E9FAA",
+"r 	c #8894A0",
+"s 	c #748CA6",
+"t 	c #7D94B4",
+"u 	c #252D36",
+"v 	c #84A3C3",
+"w 	c #7B9AB8",
+"x 	c #39454E",
+"y 	c #9CB6C9",
+"z 	c #8A9BA7",
+"A 	c #A0B0C0",
+"B 	c #738AA4",
+"C 	c #7C93B3",
+"D 	c #252D37",
+"E 	c #82A0C0",
+"F 	c #86A7C7",
+"G 	c #93B5D1",
+"H 	c #A7C5DE",
+"I 	c #A5BCCE",
+"J 	c #5B6B77",
+"K 	c #010202",
+"L 	c #49535E",
+"M 	c #657C97",
+"N 	c #252C36",
+"O 	c #819DBD",
+"P 	c #88A9C9",
+"Q 	c #9BBAD4",
+"R 	c #8FB4D1",
+"S 	c #7C9EB8",
+"T 	c #060708",
+"U 	c #222B36",
+"V 	c #C6C6C6",
+"W 	c #242B35",
+"X 	c #7F98B9",
+"Y 	c #829EBE",
+"Z 	c #84A3C2",
+"` 	c #7FA1C3",
+" .	c #5E8BB6",
+"..	c #658CAF",
+"+.	c #0B0E12",
+"@.	c #1A232E",
+"#.	c #7C94B3",
+"$.	c #819CBD",
+"%.	c #4E77A4",
+"&.	c #3E6D9F",
+"*.	c #24384D",
+"=.	c #131C28",
+"-.	c #DEDEDE",
+";.	c #757A81",
+">.	c #7A828C",
+",.	c #5D636B",
+"'.	c #767F8B",
+").	c #2C3B4D",
+"!.	c #2A3B4D",
+"~.	c #22303F",
+"{.	c #202D39",
+"].	c #202A37",
+"^.	c #1D2632",
+"/.	c #1B242F",
+"(.	c #19212B",
+"_.	c #CBCBCB",
+":.	c #FDFDFD",
+"<.	c #F9F9F9",
+"[.	c #F8F8F8",
+"}.	c #F5F5F5",
+"|.	c #FBFBFB",
+"1.	c #F6F6F6",
+"2.	c #F8F9F8",
+"3.	c #F6F5F5",
+"4.	c #F6F6F5",
+"5.	c #EDEDED",
+"6.	c #DFDFDF",
+"7.	c #D9D9D9",
+"8.	c #F5FFFF",
+"9.	c #FFFFFF",
+"0.	c #FEFEFB",
+"a.	c #E3E3E3",
+"b.	c #D7D7D7",
+"c.	c #D7D8D8",
+"d.	c #E1E1E1",
+"e.	c #F4F4F4",
+"f.	c #E7E7E7",
+"g.	c #E5E5E5",
+"h.	c #F7F7F7",
+"i.	c #E0E0E0",
+"j.	c #D6D6D6",
+"k.	c #D8D8D8",
+"l.	c #F3F3F3",
+"m.	c #F0F0F0",
+"n.	c #DADADA",
+"o.	c #E6E6E6",
+"p.	c #DBDBDB",
+"q.	c #EEEEEE",
+"r.	c #DCDCDC",
+"s.	c #FAFAFA",
+"t.	c #ECECEC",
+"u.	c #EBEBEB",
+"v.	c #F2F2F2",
+"w.	c #F1F1F1",
+"x.	c #DDDDDD",
+"y.	c #D4D4D4",
+"z.	c #EFEFEE",
+"A.	c #E2E2E2",
+"B.	c #D5D5D5",
+"                                                                ",
+"              . + + + + + + + + + + + + + + + + .               ",
+"              + @ # # # # # # # # # # # # # # @ +               ",
+"              + $ % & & & & & & & & & & & & & * +               ",
+"              + = - ; > , ' ) ! ~ { ] ^ / ( _ : +               ",
+"              + = - < [ } | 1 2 3 4 5 6 7 8 9 : +               ",
+"              + = - 0 a b c d e f g 6 6 6 h i j +               ",
+"              + = - k l m n o p q 6 6 6 6 r s j +               ",
+"              + = - t u v w x y z 6 6 6 6 A B j +               ",
+"              + = - C D E F G H I J K 6 6 L M j +               ",
+"              + = - C N O v P Q R S T 6 6 6 U j +               ",
+"              + V - C W X Y Z `  ...+.6 6 6 @.j +               ",
+"              + V - C W #.> $.%.&.*.6 6 6 6 =.j +               ",
+"              + -.;.>.,.>.>.'.).!.~.{.].^./.(._.+               ",
+"              + :.<.<.<.<.<.[.}.}.}.}.}.}.}.}.|.+               ",
+"              + :.<.<.<.<.<.<.1.2.3.4.}.}.}.}.|.+               ",
+"              + :.<.<.<.<.5.6.7.8.9.9.0.}.}.}.|.+               ",
+"              + :.<.<.<.a.b.b.b.b.b.c.d.e.e.e.|.+               ",
+"              + :.[.[.f.b.b.b.b.b.b.b.b.g.e.e.|.+               ",
+"              + :.[.h.7.b.b.b.i.i.j.b.b.k.l.e.|.+               ",
+"              + :.[.m.n.n.b.o.9.9.g.b.n.p.5.e.|.+               ",
+"              + :.[.q.r.p.b.5.@ s.t.b.p.r.u.l.|.+               ",
+"              + :.[.v.b.b.b.6.w.9.o.b.n.n.m.l.|.+               ",
+"              + :.[.[.x.b.b.b.k.i.b.b.b.7.h.y.$ +               ",
+"              + :.[.[.m.b.b.b.b.b.b.b.b.f.[.z.$ +               ",
+"              + :.h.h.1.* 7.b.-.b.b.b.a.<.<.w.9.+               ",
+"              + :.h.}.v.v.m.f.A.7.6.5.<.<.<.# q.+               ",
+"              + @ e.v.v.v.v.v.v.1.<.<.<.<.<.g.w.+               ",
+"              + @ 1.1.1.1.1.1.1.1.1.B.l.f.z.9.|.+               ",
+"              . + + + + + + + + + + + + + + + + .               ",
+"                                                                ",
+"                                                                "};
--- gtkpod-0.99.16.orig/debian/control
+++ gtkpod-0.99.16/debian/control
@@ -0,0 +1,48 @@
+Source: gtkpod
+Section: sound
+Priority: extra
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
+Uploaders: Frank Lichtenheld <djpig@debian.org>, Nico Golde <nion@debian.org>
+Build-Depends: debhelper (>= 7), dpatch,
+ gettext, flex, autotools-dev, perl, libxml-parser-perl,
+ libgtk2.0-dev, libglade2-dev, libcurl4-gnutls-dev,
+ libid3tag0-dev, libvorbis-dev, libflac-dev,
+ libgpod-dev (>= 0.7.0), intltool (>= 0.33)
+Standards-Version: 3.8.0
+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}, ${misc:Depends},
+ gtkpod-data (= ${source:Version})
+Recommends: id3v2, vorbis-tools,
+Suggests: mp3gain, python, perl, faad,
+# not in Debian:
+          faac, lame
+Conflicts: gtkpod-aac (<< 0.99.14-1)
+Replaces: gtkpod-aac (<< 0.99.14-1)
+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.
+
+Package: gtkpod-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: gtkpod
+Conflicts: gtkpod-aac (<< 0.99.14-1)
+Replaces: gtkpod (<< 0.99.14-1)
+Description: architecture-independent files for gtkpod
+ 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.
+ .
+ This package contains documentation, translations and images for
+ gtkpod.
--- gtkpod-0.99.16.orig/debian/patches/00list
+++ gtkpod-0.99.16/debian/patches/00list
@@ -0,0 +1,3 @@
+01_mountpoint
+20_convert_common_script
+
--- gtkpod-0.99.16.orig/debian/patches/20_convert_common_script.dpatch
+++ gtkpod-0.99.16/debian/patches/20_convert_common_script.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_convert_common_script.dpatch by mettle
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gtkpod-0.99.14~/scripts/gtkpod-convert-common.sh gtkpod-0.99.14/scripts/gtkpod-convert-common.sh
+--- gtkpod-0.99.14~/scripts/gtkpod-convert-common.sh	2009-01-18 11:52:32.000000000 +0600
++++ gtkpod-0.99.14/scripts/gtkpod-convert-common.sh	2009-02-18 20:25:44.000000000 +0600
+@@ -51,7 +51,7 @@
+ # Determine decoder
+ 
+ # Convert the source extension to lowercase.
+-filetype=`echo ${infile_extension}| tr [:upper:] [:lower:]`
++filetype=`echo ${infile_extension}| tr '[:upper:]' '[:lower:]'`
+ case "$filetype" in
+ 	flac)	decoder="flac" ; options="-d -c --"  ;;
+ 	oga|ogg|ogv|ogx)
--- gtkpod-0.99.16.orig/debian/patches/01_mountpoint.dpatch
+++ gtkpod-0.99.16/debian/patches/01_mountpoint.dpatch
@@ -0,0 +1,276 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_mountpoint.dpatch by Nico Golde <nion@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@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/");