reverted:
--- gtkpod-0.99.10/debian/watch
+++ gtkpod-0.99.10.orig/debian/watch
@@ -1,3 +0,0 @@
-version=3
-# yes, this is to avoid sf's perverse mirror system
-http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz
reverted:
--- gtkpod-0.99.10/debian/gtkpod.desktop
+++ gtkpod-0.99.10.orig/debian/gtkpod.desktop
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=gtkpod
-Icon=gtkpod-icon-32x32.png
-Comment=Manage songs and playlists on your Apple iPod
-Exec=gtkpod
-Terminal=false
-Type=Application
-Categories=GTK;AudioVideo;
reverted:
--- gtkpod-0.99.10/debian/menu
+++ gtkpod-0.99.10.orig/debian/menu
@@ -1,3 +0,0 @@
-?package(gtkpod):needs="X11" section="Applications/Sound" \
-  title="gtkpod" command="/usr/bin/gtkpod" \
-  icon="/usr/share/pixmaps/gtkpod-icon-32x32.xpm"
reverted:
--- gtkpod-0.99.10/debian/patches/03_itdb-set-local-to-imported.dpatch
+++ gtkpod-0.99.10.orig/debian/patches/03_itdb-set-local-to-imported.dpatch
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## itdb-set-local-to-imported.dpatch by John Dong <jdong@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
-
-@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
- 	{
reverted:
--- gtkpod-0.99.10/debian/patches/00list
+++ gtkpod-0.99.10.orig/debian/patches/00list
@@ -1,3 +0,0 @@
-01_mountpoint
-02_missing_fclose
-03_itdb-set-local-to-imported
reverted:
--- gtkpod-0.99.10/debian/patches/01_mountpoint.dpatch
+++ gtkpod-0.99.10.orig/debian/patches/01_mountpoint.dpatch
@@ -1,276 +0,0 @@
-#! /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	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/");
reverted:
--- gtkpod-0.99.10/debian/patches/02_missing_fclose.dpatch
+++ gtkpod-0.99.10.orig/debian/patches/02_missing_fclose.dpatch
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_missing_fclose.dpatch by Nico Golde <nion@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@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;
- 
reverted:
--- gtkpod-0.99.10/debian/docs
+++ gtkpod-0.99.10.orig/debian/docs
@@ -1 +0,0 @@
-README
reverted:
--- gtkpod-0.99.10/debian/changelog
+++ gtkpod-0.99.10.orig/debian/changelog
@@ -1,240 +0,0 @@
-gtkpod (0.99.10-5build1) hardy; urgency=low
-
-  * Rebuild for libgpod2 -> libgpod3 transition (LP: #172755).
-
- -- Michael Bienia <geser@ubuntu.com>  Sat, 08 Dec 2007 16:56: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
reverted:
--- gtkpod-0.99.10/debian/control
+++ gtkpod-0.99.10.orig/debian/control
@@ -1,21 +0,0 @@
-Source: gtkpod
-Section: sound
-Priority: extra
-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
-Uploaders: Frank Lichtenheld <djpig@debian.org>, Nico Golde <nion@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.
reverted:
--- gtkpod-0.99.10/debian/gtkpod.pod
+++ gtkpod-0.99.10.orig/debian/gtkpod.pod
@@ -1,91 +0,0 @@
-=head1 NAME
-
-gtkpod - GTK2 based software for managing songs and playlists on an Apple iPod
-
-=head1 SYNOPSIS
-
-B<gtkpod> [B<-h>] [B<-a>] [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>.
-
-=item B<-a>, B<--auto>
-
-Import database automatically after start.
-
-=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.
reverted:
--- gtkpod-0.99.10/debian/gtkpod-icon-32x32.xpm
+++ gtkpod-0.99.10.orig/debian/gtkpod-icon-32x32.xpm
@@ -1,253 +0,0 @@
-/* XPM */
-static char * gtkpod_icon_32x32_xpm[] = {
-"32 32 218 2",
-"  	c None",
-". 	c #CACACA",
-"+ 	c #C8C8C8",
-"@ 	c #C6C6C6",
-"# 	c #C4C4C4",
-"$ 	c #C3C3C3",
-"% 	c #C1C1C1",
-"& 	c #BFBFBF",
-"* 	c #BDBDBD",
-"= 	c #BCBCBC",
-"- 	c #BABABA",
-"; 	c #B9B9B9",
-"> 	c #B7B7B7",
-", 	c #B5B5B5",
-"' 	c #B3B3B3",
-") 	c #B1B1B1",
-"! 	c #ADADAD",
-"~ 	c #ABABAB",
-"{ 	c #E5E5E5",
-"] 	c #E2E2E2",
-"^ 	c #E1E1E1",
-"/ 	c #DFDFDF",
-"( 	c #DEDEDE",
-"_ 	c #DCDCDC",
-": 	c #DBDBDB",
-"< 	c #D9D9D9",
-"[ 	c #D8D8D8",
-"} 	c #D6D6D6",
-"| 	c #D5D5D5",
-"1 	c #D3D3D3",
-"2 	c #D2D2D2",
-"3 	c #D0D0D0",
-"4 	c #CFCFCF",
-"5 	c #CCCCCC",
-"6 	c #A6A6A6",
-"7 	c #E7E7E7",
-"8 	c #E2E3E2",
-"9 	c #DADCDB",
-"0 	c #D8DBDA",
-"a 	c #D8DAD9",
-"b 	c #D6D8D7",
-"c 	c #D4D7D6",
-"d 	c #D4D6D5",
-"e 	c #D2D5D3",
-"f 	c #D1D3D2",
-"g 	c #CFD2D1",
-"h 	c #CED0CF",
-"i 	c #CDCFCE",
-"j 	c #CCCECD",
-"k 	c #D0D1D1",
-"l 	c #D1D1D1",
-"m 	c #A1A1A1",
-"n 	c #E4E4E4",
-"o 	c #B6C1BC",
-"p 	c #879D93",
-"q 	c #869C92",
-"r 	c #859C92",
-"s 	c #B2BBB7",
-"t 	c #CDCDCD",
-"u 	c #9C9C9C",
-"v 	c #E3E3E3",
-"w 	c #A8B6B0",
-"x 	c #849B91",
-"y 	c #6E8179",
-"z 	c #6F827A",
-"A 	c #A6B3AD",
-"B 	c #CBCBCB",
-"C 	c #969696",
-"D 	c #E0E0E0",
-"E 	c #A7B5AF",
-"F 	c #839A90",
-"G 	c #38423E",
-"H 	c #2E3532",
-"I 	c #7F958B",
-"J 	c #A5B2AC",
-"K 	c #C9C9C9",
-"L 	c #909090",
-"M 	c #A7B5AE",
-"N 	c #82988F",
-"O 	c #535F5A",
-"P 	c #434D49",
-"Q 	c #A4B1AB",
-"R 	c #C7C7C7",
-"S 	c #8B8B8B",
-"T 	c #DDDDDD",
-"U 	c #A5B3AD",
-"V 	c #63756D",
-"W 	c #72867E",
-"X 	c #39433F",
-"Y 	c #82998F",
-"Z 	c #A3AFAA",
-"` 	c #C5C5C5",
-" .	c #858585",
-"..	c #DADADA",
-"+.	c #A5B3AC",
-"@.	c #81988E",
-"#.	c #56655E",
-"$.	c #7C9188",
-"%.	c #7B9087",
-"&.	c #2D3431",
-"*.	c #A2AEA9",
-"=.	c #C2C2C2",
-"-.	c #7F7F7F",
-";.	c #D7D7D7",
-">.	c #A4B2AC",
-",.	c #788A82",
-"'.	c #72857D",
-").	c #687971",
-"!.	c #61706A",
-"~.	c #788C83",
-"{.	c #A1ADA8",
-"].	c #797979",
-"^.	c #A3B1AB",
-"/.	c #7D9188",
-"(.	c #778C83",
-"_.	c #62716A",
-":.	c #5B6B65",
-"<.	c #6D7E77",
-"[.	c #80968C",
-"}.	c #A0ACA7",
-"|.	c #C0C0C0",
-"1.	c #BEBEBE",
-"2.	c #747474",
-"3.	c #D4D4D4",
-"4.	c #A2B0AA",
-"5.	c #9FABA6",
-"6.	c #6E6E6E",
-"7.	c #B0B9B5",
-"8.	c #8EA299",
-"9.	c #8DA199",
-"0.	c #8DA198",
-"a.	c #8CA098",
-"b.	c #8CA097",
-"c.	c #A8B0AD",
-"d.	c #BBBBBB",
-"e.	c #686868",
-"f.	c #CBCCCC",
-"g.	c #C3C6C5",
-"h.	c #C1C4C3",
-"i.	c #C0C3C2",
-"j.	c #BFC2C0",
-"k.	c #BEC0BF",
-"l.	c #BCBFBE",
-"m.	c #BBBEBD",
-"n.	c #BABDBB",
-"o.	c #B8BBBA",
-"p.	c #B7BAB9",
-"q.	c #B6B9B8",
-"r.	c #B5B8B7",
-"s.	c #B9BABA",
-"t.	c #B8B8B8",
-"u.	c #636363",
-"v.	c #CECECE",
-"w.	c #B6B6B6",
-"x.	c #5C5C5C",
-"y.	c #575757",
-"z.	c #9A9A9A",
-"A.	c #A3A3A3",
-"B.	c #ACACAC",
-"C.	c #B0B0B0",
-"D.	c #A8A8A8",
-"E.	c #B2B2B2",
-"F.	c #515151",
-"G.	c #888888",
-"H.	c #9E9E9E",
-"I.	c #999999",
-"J.	c #AFAFAF",
-"K.	c #4B4B4B",
-"L.	c #A2A2A2",
-"M.	c #454545",
-"N.	c #9F9F9F",
-"O.	c #404040",
-"P.	c #F0F0F0",
-"Q.	c #A9A9A9",
-"R.	c #3A3A3A",
-"S.	c #EAEAEA",
-"T.	c #E9E9E9",
-"U.	c #ECECEC",
-"V.	c #A7A7A7",
-"W.	c #343434",
-"X.	c #A4A4A4",
-"Y.	c #2E2E2E",
-"Z.	c #8C8C8C",
-"`.	c #EBEBEB",
-" +	c #F2F2F2",
-".+	c #292929",
-"++	c #F4F4F4",
-"@+	c #A0A0A0",
-"#+	c #232323",
-"$+	c #F7F7F7",
-"%+	c #1E1E1E",
-"&+	c #B4B4B4",
-"*+	c #F6F6F6",
-"=+	c #181818",
-"-+	c #E6E6E6",
-";+	c #EFEFEF",
-">+	c #F3F3F3",
-",+	c #9B9B9B",
-"'+	c #121212",
-")+	c #AEAEAE",
-"!+	c #AAAAAA",
-"~+	c #989898",
-"{+	c #0C0C0C",
-"]+	c #A5A5A5",
-"^+	c #979797",
-"/+	c #939393",
-"(+	c #060606",
-"_+	c #767676",
-":+	c #030303",
-"<+	c #737373",
-"[+	c #717171",
-"}+	c #707070",
-"|+	c #6D6D6D",
-"1+	c #6B6B6B",
-"2+	c #6A6A6A",
-"3+	c #696969",
-"4+	c #676767",
-"5+	c #5E5E5E",
-"                  . + @ # $ % & * = - ; > , ' ) ! ~             ",
-"                { ] ^ / ( _ : < [ } | 1 2 3 4 5 - 6             ",
-"              7 7 8 9 0 a b c d e f g h i j k l 5 m             ",
-"              { n o p q q q q q r r r r r p s 4 t u             ",
-"              v ] w x x x x x y z x x x x x A t B C             ",
-"              ^ D E x x x x F G H I x x x x J . K L             ",
-"              / ( M x x x x N O P y x x x x Q K R S             ",
-"              T : U x x x x V W y X Y x x x Z @ `  .            ",
-"              : ..+.x x x @.#.$.%.&.I x x x *.# =.-.            ",
-"              < ;.>.x x x ,.'.).y !.~.x x x {.=.% ].            ",
-"              ;.| ^.x x x /.(._.:.<.[.x x x }.|.1.2.            ",
-"              3.1 4.x x x x F F F F x x x x 5.1.= 6.            ",
-"              2 l 7.8.9.9.0.0.0.a.b.b.b.b.b.c.d.- e.            ",
-"              3 4 f.g.h.i.j.k.l.m.n.o.p.q.r.s.; t.u.            ",
-"              v.5 B . + R 5 3.;.} 2 R 1.d.- t.> w.x.            ",
-"              B . K R t [ 2 * ' ' = v.1 # t.w., ' y.            ",
-"              . + R % 1 w.z.A.B.) C.D., v.w., ' E.F.            ",
-"              + @ K 5 G.H.> * =.@ . v.& I.= * ) J.K.            ",
-"              ` ` } , L.; * =.@ . v.1 ;.v.t.4 ' ! M.            ",
-"              $ + l N.> * % R 3 2 2 ;.: / ` t d.~ O.            ",
-"              % 5 @ 6 * % @ T P.{ 4 ../ v ( ` # Q.R.            ",
-"              & v.= w.=.@ 5 S.T.^ =.v.v 7 U.K B V.W.            ",
-"              * 5 1.& @ . B 1 T < ! $ 7 U.P.2 B X.Y.            ",
-"              - R + d.. v.4 E.> ! Z.: `.P. +2 $ A..+            ",
-"              t.|.3 d.v.2 } t ~ X.v.`.P.++S.< w.@+#+            ",
-"              w.> 5 ` 4 } : / v 7 U.P.++$+^ 3 6 H.%+            ",
-"              &+' - 2 ; ;./ v 7 `.P.++*+_ ;.&+H.u =+            ",
-"              E.) C.A.d.1 : -+`.;+>+>+T.v.,+H.,+z.'+            ",
-"              C.)+! !+t.1 : ^ v { `.n ..> u z.I.~+{+            ",
-"              ! ! ~ Q.D.~ t.@ 5 5 + t.]+u I.~+^+/+(+            ",
-"              L.Q.Q.V.]+X.A.L.L.m H.,+z.I.^+C /+_+:+            ",
-"                  -._+<+[+}+6.6.|+1+2+3+e.4+4+5+                "};
reverted:
--- gtkpod-0.99.10/debian/copyright
+++ gtkpod-0.99.10.orig/debian/copyright
@@ -1,65 +0,0 @@
-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:
-
-src/getopt*.{c,h}:
-	Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
-        	Free Software Foundation, Inc.
-src/misc.{c,h}:
-	Copyright (C) 1994-2001 Jeff Tranter <tranter at pobox.com>
-	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
-src/dirbrowser.{c,h}:
-	Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas,
-        	                 Thomas Nilsson and 4Front Technologies
-	Copyright (C) 1999-2002  Haavard Kvaalen
-	Copyright (C) 2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
-src/wavfile.{c,h}:
-	Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas,
-        	                 Thomas Nilsson and 4Front Technologies
-	Copyright (C) 2002-2003 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}:
-	Copyright (C) 2002-2003 Corey Donohoe <atmos at atmos dot org>
-src/mp3file.{c,h}:
-	Copyright (C) 2000-2001  Cedric Tefft <cedric@earthling.net>
-	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
-	Copyright (C) 2004 Jens Taprogge <jens.taprogge at post.rwth-aachen.de>
-src/playlist.{c,h}:
-	Copyright (C) 2002 Adrian Ulrich <pab at blinkenlights.ch>
-	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
-src/itunessd.{c,h}:
-	Copyright 2005 Steve Wahl <steve at pro-ns dot net>
-
-All other files:
-	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
-
-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'.
reverted:
--- gtkpod-0.99.10/debian/install
+++ gtkpod-0.99.10.orig/debian/install
@@ -1,2 +0,0 @@
-debian/gtkpod-icon-32x32.xpm usr/share/pixmaps
-debian/gtkpod.desktop usr/share/applications
reverted:
--- gtkpod-0.99.10/debian/compat
+++ gtkpod-0.99.10.orig/debian/compat
@@ -1 +0,0 @@
-5
reverted:
--- gtkpod-0.99.10/debian/dirs
+++ gtkpod-0.99.10.orig/debian/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/pixmaps
reverted:
--- gtkpod-0.99.10/debian/rules
+++ gtkpod-0.99.10.orig/debian/rules
@@ -1,66 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-include /usr/share/dpatch/dpatch.make
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: patch configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-	pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman gtkpod.1
-	dh_install
-	dh_desktop
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/dirs
+++ gtkpod-0.99.12/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/pixmaps
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/docs
+++ gtkpod-0.99.12/debian/docs
@@ -0,0 +1 @@
+README
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/menu
+++ gtkpod-0.99.12/debian/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"
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/control
+++ gtkpod-0.99.12/debian/control
@@ -0,0 +1,22 @@
+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 (>= 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.
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/gtkpod.pod
+++ gtkpod-0.99.12/debian/gtkpod.pod
@@ -0,0 +1,91 @@
+=head1 NAME
+
+gtkpod - GTK2 based software for managing songs and playlists on an Apple iPod
+
+=head1 SYNOPSIS
+
+B<gtkpod> [B<-h>] [B<-a>] [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>.
+
+=item B<-a>, B<--auto>
+
+Import database automatically after start.
+
+=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.
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/rules
+++ gtkpod-0.99.12/debian/rules
@@ -0,0 +1,66 @@
+#!/usr/bin/make -f
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+include /usr/share/dpatch/dpatch.make
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: patch configure
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	$(MAKE)
+	pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installmenu
+	dh_installman gtkpod.1
+	dh_install
+	dh_desktop
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/watch
+++ gtkpod-0.99.12/debian/watch
@@ -0,0 +1,3 @@
+version=3
+# yes, this is to avoid sf's perverse mirror system
+http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/gtkpod-icon-32x32.xpm
+++ gtkpod-0.99.12/debian/gtkpod-icon-32x32.xpm
@@ -0,0 +1,253 @@
+/* XPM */
+static char * gtkpod_icon_32x32_xpm[] = {
+"32 32 218 2",
+"  	c None",
+". 	c #CACACA",
+"+ 	c #C8C8C8",
+"@ 	c #C6C6C6",
+"# 	c #C4C4C4",
+"$ 	c #C3C3C3",
+"% 	c #C1C1C1",
+"& 	c #BFBFBF",
+"* 	c #BDBDBD",
+"= 	c #BCBCBC",
+"- 	c #BABABA",
+"; 	c #B9B9B9",
+"> 	c #B7B7B7",
+", 	c #B5B5B5",
+"' 	c #B3B3B3",
+") 	c #B1B1B1",
+"! 	c #ADADAD",
+"~ 	c #ABABAB",
+"{ 	c #E5E5E5",
+"] 	c #E2E2E2",
+"^ 	c #E1E1E1",
+"/ 	c #DFDFDF",
+"( 	c #DEDEDE",
+"_ 	c #DCDCDC",
+": 	c #DBDBDB",
+"< 	c #D9D9D9",
+"[ 	c #D8D8D8",
+"} 	c #D6D6D6",
+"| 	c #D5D5D5",
+"1 	c #D3D3D3",
+"2 	c #D2D2D2",
+"3 	c #D0D0D0",
+"4 	c #CFCFCF",
+"5 	c #CCCCCC",
+"6 	c #A6A6A6",
+"7 	c #E7E7E7",
+"8 	c #E2E3E2",
+"9 	c #DADCDB",
+"0 	c #D8DBDA",
+"a 	c #D8DAD9",
+"b 	c #D6D8D7",
+"c 	c #D4D7D6",
+"d 	c #D4D6D5",
+"e 	c #D2D5D3",
+"f 	c #D1D3D2",
+"g 	c #CFD2D1",
+"h 	c #CED0CF",
+"i 	c #CDCFCE",
+"j 	c #CCCECD",
+"k 	c #D0D1D1",
+"l 	c #D1D1D1",
+"m 	c #A1A1A1",
+"n 	c #E4E4E4",
+"o 	c #B6C1BC",
+"p 	c #879D93",
+"q 	c #869C92",
+"r 	c #859C92",
+"s 	c #B2BBB7",
+"t 	c #CDCDCD",
+"u 	c #9C9C9C",
+"v 	c #E3E3E3",
+"w 	c #A8B6B0",
+"x 	c #849B91",
+"y 	c #6E8179",
+"z 	c #6F827A",
+"A 	c #A6B3AD",
+"B 	c #CBCBCB",
+"C 	c #969696",
+"D 	c #E0E0E0",
+"E 	c #A7B5AF",
+"F 	c #839A90",
+"G 	c #38423E",
+"H 	c #2E3532",
+"I 	c #7F958B",
+"J 	c #A5B2AC",
+"K 	c #C9C9C9",
+"L 	c #909090",
+"M 	c #A7B5AE",
+"N 	c #82988F",
+"O 	c #535F5A",
+"P 	c #434D49",
+"Q 	c #A4B1AB",
+"R 	c #C7C7C7",
+"S 	c #8B8B8B",
+"T 	c #DDDDDD",
+"U 	c #A5B3AD",
+"V 	c #63756D",
+"W 	c #72867E",
+"X 	c #39433F",
+"Y 	c #82998F",
+"Z 	c #A3AFAA",
+"` 	c #C5C5C5",
+" .	c #858585",
+"..	c #DADADA",
+"+.	c #A5B3AC",
+"@.	c #81988E",
+"#.	c #56655E",
+"$.	c #7C9188",
+"%.	c #7B9087",
+"&.	c #2D3431",
+"*.	c #A2AEA9",
+"=.	c #C2C2C2",
+"-.	c #7F7F7F",
+";.	c #D7D7D7",
+">.	c #A4B2AC",
+",.	c #788A82",
+"'.	c #72857D",
+").	c #687971",
+"!.	c #61706A",
+"~.	c #788C83",
+"{.	c #A1ADA8",
+"].	c #797979",
+"^.	c #A3B1AB",
+"/.	c #7D9188",
+"(.	c #778C83",
+"_.	c #62716A",
+":.	c #5B6B65",
+"<.	c #6D7E77",
+"[.	c #80968C",
+"}.	c #A0ACA7",
+"|.	c #C0C0C0",
+"1.	c #BEBEBE",
+"2.	c #747474",
+"3.	c #D4D4D4",
+"4.	c #A2B0AA",
+"5.	c #9FABA6",
+"6.	c #6E6E6E",
+"7.	c #B0B9B5",
+"8.	c #8EA299",
+"9.	c #8DA199",
+"0.	c #8DA198",
+"a.	c #8CA098",
+"b.	c #8CA097",
+"c.	c #A8B0AD",
+"d.	c #BBBBBB",
+"e.	c #686868",
+"f.	c #CBCCCC",
+"g.	c #C3C6C5",
+"h.	c #C1C4C3",
+"i.	c #C0C3C2",
+"j.	c #BFC2C0",
+"k.	c #BEC0BF",
+"l.	c #BCBFBE",
+"m.	c #BBBEBD",
+"n.	c #BABDBB",
+"o.	c #B8BBBA",
+"p.	c #B7BAB9",
+"q.	c #B6B9B8",
+"r.	c #B5B8B7",
+"s.	c #B9BABA",
+"t.	c #B8B8B8",
+"u.	c #636363",
+"v.	c #CECECE",
+"w.	c #B6B6B6",
+"x.	c #5C5C5C",
+"y.	c #575757",
+"z.	c #9A9A9A",
+"A.	c #A3A3A3",
+"B.	c #ACACAC",
+"C.	c #B0B0B0",
+"D.	c #A8A8A8",
+"E.	c #B2B2B2",
+"F.	c #515151",
+"G.	c #888888",
+"H.	c #9E9E9E",
+"I.	c #999999",
+"J.	c #AFAFAF",
+"K.	c #4B4B4B",
+"L.	c #A2A2A2",
+"M.	c #454545",
+"N.	c #9F9F9F",
+"O.	c #404040",
+"P.	c #F0F0F0",
+"Q.	c #A9A9A9",
+"R.	c #3A3A3A",
+"S.	c #EAEAEA",
+"T.	c #E9E9E9",
+"U.	c #ECECEC",
+"V.	c #A7A7A7",
+"W.	c #343434",
+"X.	c #A4A4A4",
+"Y.	c #2E2E2E",
+"Z.	c #8C8C8C",
+"`.	c #EBEBEB",
+" +	c #F2F2F2",
+".+	c #292929",
+"++	c #F4F4F4",
+"@+	c #A0A0A0",
+"#+	c #232323",
+"$+	c #F7F7F7",
+"%+	c #1E1E1E",
+"&+	c #B4B4B4",
+"*+	c #F6F6F6",
+"=+	c #181818",
+"-+	c #E6E6E6",
+";+	c #EFEFEF",
+">+	c #F3F3F3",
+",+	c #9B9B9B",
+"'+	c #121212",
+")+	c #AEAEAE",
+"!+	c #AAAAAA",
+"~+	c #989898",
+"{+	c #0C0C0C",
+"]+	c #A5A5A5",
+"^+	c #979797",
+"/+	c #939393",
+"(+	c #060606",
+"_+	c #767676",
+":+	c #030303",
+"<+	c #737373",
+"[+	c #717171",
+"}+	c #707070",
+"|+	c #6D6D6D",
+"1+	c #6B6B6B",
+"2+	c #6A6A6A",
+"3+	c #696969",
+"4+	c #676767",
+"5+	c #5E5E5E",
+"                  . + @ # $ % & * = - ; > , ' ) ! ~             ",
+"                { ] ^ / ( _ : < [ } | 1 2 3 4 5 - 6             ",
+"              7 7 8 9 0 a b c d e f g h i j k l 5 m             ",
+"              { n o p q q q q q r r r r r p s 4 t u             ",
+"              v ] w x x x x x y z x x x x x A t B C             ",
+"              ^ D E x x x x F G H I x x x x J . K L             ",
+"              / ( M x x x x N O P y x x x x Q K R S             ",
+"              T : U x x x x V W y X Y x x x Z @ `  .            ",
+"              : ..+.x x x @.#.$.%.&.I x x x *.# =.-.            ",
+"              < ;.>.x x x ,.'.).y !.~.x x x {.=.% ].            ",
+"              ;.| ^.x x x /.(._.:.<.[.x x x }.|.1.2.            ",
+"              3.1 4.x x x x F F F F x x x x 5.1.= 6.            ",
+"              2 l 7.8.9.9.0.0.0.a.b.b.b.b.b.c.d.- e.            ",
+"              3 4 f.g.h.i.j.k.l.m.n.o.p.q.r.s.; t.u.            ",
+"              v.5 B . + R 5 3.;.} 2 R 1.d.- t.> w.x.            ",
+"              B . K R t [ 2 * ' ' = v.1 # t.w., ' y.            ",
+"              . + R % 1 w.z.A.B.) C.D., v.w., ' E.F.            ",
+"              + @ K 5 G.H.> * =.@ . v.& I.= * ) J.K.            ",
+"              ` ` } , L.; * =.@ . v.1 ;.v.t.4 ' ! M.            ",
+"              $ + l N.> * % R 3 2 2 ;.: / ` t d.~ O.            ",
+"              % 5 @ 6 * % @ T P.{ 4 ../ v ( ` # Q.R.            ",
+"              & v.= w.=.@ 5 S.T.^ =.v.v 7 U.K B V.W.            ",
+"              * 5 1.& @ . B 1 T < ! $ 7 U.P.2 B X.Y.            ",
+"              - R + d.. v.4 E.> ! Z.: `.P. +2 $ A..+            ",
+"              t.|.3 d.v.2 } t ~ X.v.`.P.++S.< w.@+#+            ",
+"              w.> 5 ` 4 } : / v 7 U.P.++$+^ 3 6 H.%+            ",
+"              &+' - 2 ; ;./ v 7 `.P.++*+_ ;.&+H.u =+            ",
+"              E.) C.A.d.1 : -+`.;+>+>+T.v.,+H.,+z.'+            ",
+"              C.)+! !+t.1 : ^ v { `.n ..> u z.I.~+{+            ",
+"              ! ! ~ Q.D.~ t.@ 5 5 + t.]+u I.~+^+/+(+            ",
+"              L.Q.Q.V.]+X.A.L.L.m H.,+z.I.^+C /+_+:+            ",
+"                  -._+<+[+}+6.6.|+1+2+3+e.4+4+5+                "};
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/changelog
+++ gtkpod-0.99.12/debian/changelog
@@ -0,0 +1,250 @@
+gtkpod (0.99.12-0ubuntu1) hardy; urgency=low
+
+  * New upstream release (LP: #178688).
+  * debian/patches:
+    - Fixed 01_mountpoint.dpatch for this release.
+    - Dropped 02_missing_fclose.dpatch, fixed upstream.
+    - Dropped 03_itdb-set-local-to-imported.dpatch, fixed upstream.
+
+ -- Matvey Kozhev <sikon@lucidfox.org>  Wed, 26 Dec 2007 11:32:14 +0600
+
+gtkpod (0.99.10-5build1) hardy; urgency=low
+
+  * Rebuild for libgpod2 -> libgpod3 transition (LP: #172755).
+  
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 08 Dec 2007 16:56: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
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/compat
+++ gtkpod-0.99.12/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/patches/01_mountpoint.dpatch
+++ gtkpod-0.99.12/debian/patches/01_mountpoint.dpatch
@@ -0,0 +1,275 @@
+#! /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	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,6 +13,6 @@
+ #
+ # 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
+ 
+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/");
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/patches/00list
+++ gtkpod-0.99.12/debian/patches/00list
@@ -0,0 +1 @@
+01_mountpoint
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/patches/02_missing_fclose.dpatch
+++ gtkpod-0.99.12/debian/patches/02_missing_fclose.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_missing_fclose.dpatch by Nico Golde <nion@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@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;
+ 
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/patches/03_itdb-set-local-to-imported.dpatch
+++ gtkpod-0.99.12/debian/patches/03_itdb-set-local-to-imported.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## itdb-set-local-to-imported.dpatch by John Dong <jdong@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
+
+@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
+ 	{
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/copyright
+++ gtkpod-0.99.12/debian/copyright
@@ -0,0 +1,65 @@
+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:
+
+src/getopt*.{c,h}:
+	Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
+        	Free Software Foundation, Inc.
+src/misc.{c,h}:
+	Copyright (C) 1994-2001 Jeff Tranter <tranter at pobox.com>
+	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/dirbrowser.{c,h}:
+	Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas,
+        	                 Thomas Nilsson and 4Front Technologies
+	Copyright (C) 1999-2002  Haavard Kvaalen
+	Copyright (C) 2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/wavfile.{c,h}:
+	Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas,
+        	                 Thomas Nilsson and 4Front Technologies
+	Copyright (C) 2002-2003 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}:
+	Copyright (C) 2002-2003 Corey Donohoe <atmos at atmos dot org>
+src/mp3file.{c,h}:
+	Copyright (C) 2000-2001  Cedric Tefft <cedric@earthling.net>
+	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+	Copyright (C) 2004 Jens Taprogge <jens.taprogge at post.rwth-aachen.de>
+src/playlist.{c,h}:
+	Copyright (C) 2002 Adrian Ulrich <pab at blinkenlights.ch>
+	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+src/itunessd.{c,h}:
+	Copyright 2005 Steve Wahl <steve at pro-ns dot net>
+
+All other files:
+	Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+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'.
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/install
+++ gtkpod-0.99.12/debian/install
@@ -0,0 +1,2 @@
+debian/gtkpod-icon-32x32.xpm usr/share/pixmaps
+debian/gtkpod.desktop usr/share/applications
only in patch2:
unchanged:
--- gtkpod-0.99.12.orig/debian/gtkpod.desktop
+++ gtkpod-0.99.12/debian/gtkpod.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=gtkpod
+Icon=gtkpod-icon-32x32.png
+Comment=Manage songs and playlists on your Apple iPod
+Exec=gtkpod
+Terminal=false
+Type=Application
+Categories=GTK;AudioVideo;