Diff of the two buildlogs:

--
--- b1/build.log	2020-03-06 21:49:50.606492022 +0000
+++ b2/build.log	2020-03-06 21:50:12.706066096 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri Mar  6 09:47:02 -12 2020
-I: pbuilder-time-stamp: 1583531222
+I: Current time: Fri Apr  9 18:12:51 +14 2021
+I: pbuilder-time-stamp: 1617941571
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -18,7 +18,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Sun Jul 30 05:00:07 2017 -12
+gpgv: Signature made Mon Jul 31 07:00:07 2017 +14
 gpgv:                using RSA key 46A2DFE28C087B294E6FD92481280AA087BAFB0E
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./gnupod-tools_0.99.8-5.dsc
@@ -27,6 +27,18 @@
 dpkg-source: info: applying gnupod-tools_0.99.8-5.diff.gz
 I: using fakeroot in build.
 I: Installing the build-deps
+I: user script /srv/workspace/pbuilder/33590/tmp/hooks/D01_modify_environment starting
+disorder-fs debug: Running on profitbricks-build16-i386.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash'
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/33590/tmp/hooks/D01_modify_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -167,7 +179,7 @@
 Get: 81 http://deb.debian.org/debian buster/main i386 libxml-simple-perl all 2.25-1 [72.0 kB]
 Get: 82 http://deb.debian.org/debian buster/main i386 quilt all 0.65-3 [318 kB]
 Get: 83 http://deb.debian.org/debian buster/main i386 rename all 1.10-1 [17.2 kB]
-Fetched 26.9 MB in 5s (5196 kB/s)
+Fetched 26.9 MB in 0s (78.9 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:i386.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19231 files and directories currently installed.)
@@ -542,7 +554,7 @@
 fakeroot is already the newest version (1.23-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/gnupod-tools-0.99.8/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b
+I: Running cd /build/gnupod-tools-0.99.8/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b
 dpkg-buildpackage: info: source package gnupod-tools
 dpkg-buildpackage: info: source version 0.99.8-5
 dpkg-buildpackage: info: source distribution unstable
@@ -561,9 +573,692 @@
 tar -xzf gnupod-0.99.8.tgz
 test -d gnupod-0.99.8
 sh /build/gnupod-tools-0.99.8/debian/maintenance/01patch_rename.sh gnupod-0.99.8 0.99.8
+Patched gnupod-0.99.8/man/mktunes.pl.1.gz
+--- gnupod-0.99.8/CHANGES	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.228980103 +1400
+@@ -46,7 +46,7 @@
+   NEW: Set addtime to a fixed value when doing autotests.
+   NEW: Added check for "autotest" file at the ipod mountpoint.
+   NEW: The connection hash was expanded by a "autotest" key.
+-  NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.pl.
++  NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.
+ 
+ 
+ *** OLD STUFF ***
+@@ -118,7 +118,7 @@
+ -------
+ - Added README_FIRMWARE.txt file
+ - Added compilation-patch, thanks to Ray Lortie
+-- Rewrote mktunes.pl to be faster and more readable :-)
++- Rewrote mktunes to be faster and more readable :-)
+ - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) )
+   
+   Apple attempted to lockout non-iTunes software by implementing an obscure
+@@ -161,8 +161,8 @@
+ - Raised video-bitrate for on-the-fly converting
+ - Added configuration option 'automktunes'. Setting
+   'automktunes = 1' inside ~/.gnupodrc eliminates the need
+-  to call mktunes.pl after adding/deleting/renaming songs because GNUpod
+-  will call mktunes.pl itself.
++  to call mktunes after adding/deleting/renaming songs because GNUpod
++  will call mktunes itself.
+ - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect
+   written mhip size. Playlist parsing has also been rewritten and cleaned up.
+ - Bugfix: Do not detect PCM files as movies when using --decode
+@@ -222,7 +222,7 @@
+ - gnupod_addsong.pl can now fetch podcast-rss feeds!
+   Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
+ 
+-- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl
++- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes
+ 
+ - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
+   Thanks to Chris Abajian for reporting this issue.
+@@ -292,7 +292,7 @@
+ - Added support for m4a 'gnre' tags
+ 
+ - Fixed some iPod-Shuffle issues
+-   * mktunes.pl removes the iTunesShuffle leftover
++   * mktunes removes the iTunesShuffle leftover
+ 
+ - Remove TARGET-File if File::Copy() failed for any reason
+    => Better handling of 'disk full' but still not perfect
+@@ -473,7 +473,7 @@
+ 
+ - Changed rating-schema to match SPL-Rating
+   -> Rating 5 is now 100 (newrating=oldrating*20)
+-  mktunes.pl will drop old (= now invalid) ratings,
++  mktunes will drop old (= now invalid) ratings,
+   no autoconvert... sorry.. but does anyone care?
+ 
+ - gnupod_addsong.pl understands ID3v2.2 tags
+@@ -557,7 +557,7 @@
+         a 'feature' of iTunes)
+   * Added 'eq syntax check', you can use (since 0.90) 
+     'eq="#!#NUMBER#!#' to specify the EQ-Setting per song.
+-    mktunes.pl will now check if this syntax is correct.
++    mktunes will now check if this syntax is correct.
+     (You'll see a warning if it failed)
+   * Fixed get_string() to handle null-size strings correct
+   * Changed some internal things (using hrefs.. etc)
+@@ -576,7 +576,7 @@
+   * Added paranoia checks (stricter parsing)
+   * Added SPL-Read code (BETA!)
+ 
+-mktunes.pl
++mktunes
+   * Added SPL-Write support
+   * regex-matches are sorted by id
+ 
+@@ -611,13 +611,13 @@
+   * Added '--france' switch (Limit volume to 100 db for
+     1.x Firmware)
+ 
+-mktunes.pl
++mktunes
+   * New Playlist-Code.. MUCH faster now
+     (Wow.. again? no.. the code of 0.90 was
+      VERY slow with many files (~3000) and more
+      than ~15 big playlists)
+   * Added '--volume' switch: Adjust the volume on the iPod!
+-    Use something like 'mktunes.pl --volume 70' to boost
++    Use something like 'mktunes --volume 70' to boost
+     the volume by 70% (same as volume="70" in the GNUtunesDB)
+ 
+ XMLhelper.pm
+@@ -671,9 +671,9 @@
+ - Rewritten Playlistcode for tunes2pod.pl
+ - tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
+   if it can't find the iTunesDB
+-- mktunes.pl uses now binmode(), maybe this helps
++- mktunes uses now binmode(), maybe this helps
+   RedHat 8 ? .. (and win32 ;) )
+-- mktunes.pl is now *much* faster!!
++- mktunes is now *much* faster!!
+ - the GNUtunesDB written by gnupod_delete.pl looks
+   nicer now :) (id= is now always the first element..)
+ 
+@@ -698,7 +698,7 @@
+   written by MusicMatch
+ - Playlists are now sorted on the iPod as they are found
+   in the GNUtunesDB - file
+-- mktunes.pl no longer accepts <playlist..> when </file> was
++- mktunes no longer accepts <playlist..> when </file> was
+   not found.
+ - gnupod_addsong.pl handles long filenames now better
+ - Timestamp should now be set correct
+--- gnupod-0.99.8/FAQ	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/FAQ.new	2021-04-09 18:13:08.232980103 +1400
+@@ -60,13 +60,13 @@
+  1 Mount the iPod (eg. /mnt/ipod)
+  2 run gnupod_INIT.pl -m /mnt/ipod
+  3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
+- 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
++ 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
+  5 umount the iPod and enjoy!
+ 
+  If you add more songs, repeat step 1-5 (without step 2!) :
+  1 Mount the iPod
+  2 use gnupod_addsong.pl
+- 3 build the database with mktunes.pl
++ 3 build the database with mktunes
+  4 umount
+ 
+ Please read the README file and the info page
+@@ -83,7 +83,7 @@
+ 
+ But there are some GNUpod 'forks'
+ 
+-- GTKpod     http://gtkpod.sf.net ('Inspired' by mktunes.pl / iTunesDB.pm)
++- GTKpod     http://gtkpod.sf.net ('Inspired' by mktunes / iTunesDB.pm)
+ - Rhythmbox  http://www.rhythmbox.org/ (Uses GTKpod code)
+ 
+ (<ironic>..and some companies created commercial iPod apps.. and i'm sure
+@@ -166,7 +166,7 @@
+ To fix it:
+ - Open the GNUtunesDB.xml (/mnt/ipod/iPod_Control/.gnupod/)
+ - Search the faulty entries, fix them and save
+-- Run mktunes.pl to update the iPod.
++- Run mktunes to update the iPod.
+ 
+ 
+ 10. Why?
+@@ -190,7 +190,7 @@
+ But the iTunesDB-format isn't so complicated if you know how to
+ write the specific parts and how you'll have to assemble
+ them.
+-Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes.pl
++Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes
+ 
+ ..or feel free to ask me questions about it:
+ <pab at blinkenlights.ch>
+--- gnupod-0.99.8/src/mktunes.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new	2021-04-09 18:13:08.236980103 +1400
+@@ -37,7 +37,7 @@
+ my %opts    = ();
+ 
+ 
+-print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
++print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
+ 
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s");
+@@ -140,7 +140,7 @@
+ 	my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: mktunes.pl [-h] [-m directory] [-v VALUE]
++Usage: mktunes [-h] [-m directory] [-v VALUE]
+ 
+    -h, --help              display this help and exit
+        --version           output version information and exit
+@@ -159,7 +159,7 @@
+ # Displays current version
+ sub version {
+ die << "EOF";
+-mktunes.pl (gnupod) ###__VERSION__###
++mktunes (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2007
+ 
+ This is free software; see the source for copying conditions.  There is NO
+--- gnupod-0.99.8/src/ext/Mktunes.pm	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new	2021-04-09 18:13:08.240980103 +1400
+@@ -327,7 +327,7 @@
+ 		} 
+ 		
+ 		unless(GNUpod::XMLhelper::get_splpref($name)->{liveupdate}) {
+-			warn "mktunes.pl: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
++			warn "mktunes: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
+ 		}
+ 	
+ 		if(my $id = $item->{splcont}->{id}) { #We found an old id with disabled liveupdate, add it like a normal playlist:
+--- gnupod-0.99.8/src/ext/FooBar.pm	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new	2021-04-09 18:13:08.244980103 +1400
+@@ -119,10 +119,10 @@
+ }
+ 
+ #######################################################################
+-# Call mktunes.pl
++# Call mktunes
+ sub StartAutoMkTunes {
+ 	my($con) = @_;
+-	my $XBIN = "$con->{bindir}/mktunes.pl";
++	my $XBIN = "$con->{bindir}/mktunes";
+ 	if(-x $XBIN) {
+ 		{
+ 			local  $ENV{IPOD_MOUNTPOINT} = $con->{mountpoint};
+--- gnupod-0.99.8/src/gnupod_search.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new	2021-04-09 18:13:08.248980103 +1400
+@@ -264,7 +264,7 @@
+                             u = UnixPath n = Songnum  G = podcastguid R = podcastrss
+                             d = dbid
+        --rename=KEY=VAL    Change tags on found songs. Example: --rename="ARTIST=Foo Bar"
+-       --artwork=FILE      Set FILE as Cover for found files, do not forget to run mktunes.pl
++       --artwork=FILE      Set FILE as Cover for found files, do not forget to run mktunes
+ 
+ Note: * Argument for title/artist/album/etc has to be UTF8 encoded, *not* latin1!
+       * Use '>3' to search all values above 3, use '<3' to search for values below 3
+--- gnupod-0.99.8/src/gnupod_INIT.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2021-04-09 18:13:08.252980103 +1400
+@@ -120,9 +120,9 @@
+   $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
+  }
+  else {
+- #No iTunesDB, run mktunes.pl
+-  print "No iTunesDB found, running mktunes.pl\n";
+-  my @mktunescmd = ("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}");
++ #No iTunesDB, run mktunes
++  print "No iTunesDB found, running mktunes\n";
++  my @mktunescmd = ("$con->{bindir}/mktunes", "-m" ,"$opts{mount}");
+   if ($opts{'fwguid'}) { push @mktunescmd, "-g", "$opts{fwguid}"; } 
+   $t2pfail = system(@mktunescmd);
+  }
+@@ -150,12 +150,12 @@
+        --version           output version information and exit
+    -m, --mount=directory   iPod mountpoint, default is \$IPOD_MOUNTPOINT
+    -d, --disable-convert   Don't try to convert an existing iTunesDB
+-   -g, --fwguid=HEXVAL     FirewireGuid / Serial of connected iPod (passed to mktunes.pl)
++   -g, --fwguid=HEXVAL     FirewireGuid / Serial of connected iPod (passed to mktunes)
+    -f, --france            Limit volume to 100dB (For French-Law/People)
+                            Maximal-volume without this is ~104dB (VERY LOUD)
+                            *WARNING* This works only for iPods running
+                            Firmware 1.x (1st & 2nd generation)
+-                           You can also use mktunes.pl '--volume PERCENT'
++                           You can also use mktunes '--volume PERCENT'
+                            to adjust the volume (Works with Firmware 1.x AND 2.x)
+        --noask             Do not wait for any user input
+ 
+--- gnupod-0.99.8/src/gnupod_addsong.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2021-04-09 18:13:08.256980103 +1400
+@@ -206,11 +206,11 @@
+ 		#Use fixed addtime for autotests
+ 		$fh->{addtime} = int($connection->{autotest} ? 42 : time())+MACTIME;
+ 		
+-		#Ugly workaround to avoid a warning while running mktunes.pl:
++		#Ugly workaround to avoid a warning while running mktunes:
+ 		#All (?) int-values returned by wtf_is won't go above 0xffffffff
+ 		#Thats fine because almost everything inside an mhit can handle this.
+ 		#But bpm and srate are limited to 0xffff
+-		# -> We fix this silently to avoid ugly warnings while running mktunes.pl
++		# -> We fix this silently to avoid ugly warnings while running mktunes
+ 		$fh->{bpm}   = 0xFFFF if $fh->{bpm}   > 0xFFFF;
+ 		$fh->{srate} = 0xFFFF if $fh->{srate} > 0xFFFF;
+ 
+--- gnupod-0.99.8/src/gnupod_otgsync.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2021-04-09 18:13:08.260980103 +1400
+@@ -129,9 +129,9 @@
+ sub newfile {
+ 	my($el) =  @_;
+ 
+-	#This has to be 'in-sync' with the mktunes.pl method
++	#This has to be 'in-sync' with the mktunes method
+ 	# (GNUtunesDB_id <-> iTunesDB_id)
+-	# in mktunes.pl, every <file.. will create a new
++	# in mktunes, every <file.. will create a new
+ 	# id, like here :)
+ 	
+ 	push(@keeper, int($el->{file}->{id}));
+--- gnupod-0.99.8/README.developer	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.developer.new	2021-04-09 18:13:08.264980103 +1400
+@@ -6,9 +6,9 @@
+ Minimal testing:
+ > gnupod_INIT.pl /mnt/empty
+ > gnupod_addsong
+-> mktunes.pl
++> mktunes
+ > tunes2pod.pl --force
+-> mktunes.pl
++> mktunes
+ > check if your ipod can read the result
+ 
+ Release checklist
+--- gnupod-0.99.8/README.about_m4a	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.about_m4a.new	2021-04-09 18:13:08.268980103 +1400
+@@ -30,6 +30,6 @@
+ Now you can add the file using gnupod_addsong.pl
+ 
+ # gnupod_addsong.pl file.m4a
+-# mktunes.pl
++# mktunes
+ 
+ :)
+--- gnupod-0.99.8/BUGS	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/BUGS.new	2021-04-09 18:13:08.272980103 +1400
+@@ -5,5 +5,5 @@
+ * GNUpod doen't like audible.com files (I'll have to look at this later...)
+ * gnupod_addsong.pl --restore doesn't remove the '\d+_' prefix from
+   files without tags
+-* mktunes.pl -v 0 doesn't overwrite config value
++* mktunes -v 0 doesn't overwrite config value
+ See -> TODO
+--- gnupod-0.99.8/README	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.276980103 +1400
+@@ -34,10 +34,10 @@
+ gnupod_check.pl     Check for 'zombie' files
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+ gnupod_search.pl    Search ;)
+-mktunes.pl          Convert the GNUtunesDB.xml to a iTunesDB
++mktunes          Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod.pl        Convert the iTunesDB into a GNUtunesDB.xml
+ 
+-You'll have to use mktunes.pl if you added/deleted/changed something
++You'll have to use mktunes if you added/deleted/changed something
+ on the iPod.
+ 
+ 
+--- gnupod-0.99.8/doc/gnupod.info	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.280980103 +1400
+@@ -338,8 +338,8 @@
+ 
+    Setup Firewire (or USB) as described in 'Using FireWire with
+ GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
+-Mount the iPod and run `mktunes.pl' to bring the device into a 'clean'
+-state. Unmount the iPod after mktunes.pl finishes but do *not* unplug
++Mount the iPod and run `mktunes' to bring the device into a 'clean'
++state. Unmount the iPod after mktunes finishes but do *not* unplug
+ the iPod. Ready? Ok, we assume your iPod is `/dev/sda':
+ 
+    First you need to get a new Firmware image.  Checkout the latest
+@@ -545,7 +545,7 @@
+    This example searches all files from 'Alfred Neumann', changes the
+ artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
+ 
+-   Don't forget to run mktunes.pl!
++   Don't forget to run mktunes!
+ 
+    You could also edit the GNUtunesDB.xml with a text editor :-)
+ 
+@@ -635,7 +635,7 @@
+         <iregex artist="John Doe" />
+       </playlist>
+ 
+-   Such a playlist will show up as a Podcast after running mktunes.pl
++   Such a playlist will show up as a Podcast after running mktunes
+ 
+    gnupod_addsong.pl can also download podcasts and create such
+ playlists itself:
+@@ -679,7 +679,7 @@
+      # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+      gnupod_search.pl --artwork cover.jpg --album Katamari
+ 
+-   don't forget to run `mktunes.pl' afterwards.
++   don't forget to run `mktunes' afterwards.
+ 
+    Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod
+ does not inject the artwork into the id3-header of the file.  If iTunes
+@@ -692,28 +692,28 @@
+ 4.10 Unplug the iPod
+ ====================
+ 
+-Before umounting the iPod, you have to call `mktunes.pl' which will
++Before umounting the iPod, you have to call `mktunes' which will
+ parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+ 
+    Simply run
+-     mktunes.pl -m /mnt/ipod
++     mktunes -m /mnt/ipod
+ 
+-   Note: Since GNUpod 0.91, mktunes.pl has a '-volume' option which you
++   Note: Since GNUpod 0.91, mktunes has a '-volume' option which you
+ can use to boost the Volume.
+ 
+-     mktunes.pl -m /mnt/ipod --volume 40
++     mktunes -m /mnt/ipod --volume 40
+ 
+    This would adjust the volume +40 percent. (You can also use '-100'
+ to get a silent iPod ;) )
+ 
+-   After `mktunes.pl' is done, you can umount the iPod and remove the
++   After `mktunes' is done, you can umount the iPod and remove the
+ sbp2 module
+      umount /mnt/ipod
+      rmmod sbp2
+ 
+    Added songs won't be visible on the iPod if you did not run
+-mktunes.pl before umounting the iPod.  (If you forgot to run
+-`mktunes.pl' before unpluging/umounting, simply mount the iPod again
++mktunes before umounting the iPod.  (If you forgot to run
++`mktunes' before unpluging/umounting, simply mount the iPod again
+ and run it)
+ 
+ 
+@@ -803,7 +803,7 @@
+ should be autodetected on GNU/Linux (via `/proc/bus/usb/devices') and
+ Solaris (via `prtconf -v').  If GNUpod somehow fails to find the
+ correct serial number of your iPod you'll have to specify the correct
+-value using the `--fwguid' switch of `mktunes.pl'.
++value using the `--fwguid' switch of `mktunes'.
+ 
+ 
+ File: gnupod.info,  Node: Problems,  Next: GNU Free Documentation License,  Prev: Using GNUpod,  Up: Top
+@@ -840,17 +840,17 @@
+ understand by humans and easy to edit by hand.
+ 
+    Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and
+-converted into an XML File (the GNUtunesDB).  `mktunes.pl' does the
++converted into an XML File (the GNUtunesDB).  `mktunes' does the
+ opposite: it parses the XML file and creates an iTunesDB (for the iPod
+ and iTunes)
+ 
+-   Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB
++   Only mktunes and tunes2pod.pl have to worry about the iTunesDB
+ format: all other tools (gnupod_addsong.pl for example) only have to
+ deal with the XML file called GNUtunesDB.
+ 
+    It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
+ everytime you change the GNUtunesDB (by hand or using
+-gnupod_something.pl) you'll have to run `mktunes.pl'.
++gnupod_something.pl) you'll have to run `mktunes'.
+ 
+    If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
+ `tunes2pod.pl' *before* using any other GNUpod commands.
+--- gnupod-0.99.8/doc/gnupod.html	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.284980103 +1400
+@@ -475,7 +475,7 @@
+ </P><P>
+ 
+ Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
+-Mount the iPod and run <CODE>mktunes.pl</CODE> to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes 
++Mount the iPod and run <CODE>mktunes</CODE> to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes 
+ but do *not* unplug the iPod. Ready? Ok, we assume your iPod is <CODE>/dev/sda</CODE>:
+ </P><P>
+ 
+@@ -784,7 +784,7 @@
+ sets the rating to 5 Stars (5*20=100)
+ </P><P>
+ 
+-Don't forget to run mktunes.pl!
++Don't forget to run mktunes!
+ </P><P>
+ 
+ You could also edit the GNUtunesDB.xml with a text editor :-)
+@@ -911,7 +911,7 @@
+  &#60;/playlist&#62;
+ </pre></td></tr></table></P><P>
+ 
+-Such a playlist will show up as a Podcast after running mktunes.pl
++Such a playlist will show up as a Podcast after running mktunes
+ </P><P>
+ 
+ gnupod_addsong.pl can also download podcasts and create such playlists itself:
+@@ -967,7 +967,7 @@
+ gnupod_search.pl --artwork cover.jpg --album Katamari
+ </pre></td></tr></table></P><P>
+ 
+-don't forget to run <CODE>mktunes.pl</CODE> afterwards.
++don't forget to run <CODE>mktunes</CODE> afterwards.
+ </P><P>
+ 
+ Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
+@@ -992,32 +992,32 @@
+ <!--docid::SEC18::-->
+ <P>
+ 
+-Before umounting the iPod, you have to call <CODE>mktunes.pl</CODE> which will 
++Before umounting the iPod, you have to call <CODE>mktunes</CODE> which will 
+ parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+ </P><P>
+ 
+ Simply run
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes.pl -m /mnt/ipod
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes -m /mnt/ipod
+ </pre></td></tr></table></P><P>
+ 
+-Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to 
++Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to 
+ boost the Volume.
+ </P><P>
+ 
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes.pl -m /mnt/ipod --volume 40
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes -m /mnt/ipod --volume 40
+ </pre></td></tr></table></P><P>
+ 
+ This would adjust the volume +40 percent. (You can also use '-100' to get 
+ a silent iPod ;) )
+ </P><P>
+ 
+-After <CODE>mktunes.pl</CODE> is done, you can umount the iPod and remove the sbp2 module
++After <CODE>mktunes</CODE> is done, you can umount the iPod and remove the sbp2 module
+ <TABLE><tr><td>&nbsp;</td><td class=example><pre>umount /mnt/ipod
+ rmmod sbp2
+ </pre></td></tr></table></P><P>
+ 
+-Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. 
+-(If you forgot to run <CODE>mktunes.pl</CODE> before unpluging/umounting, simply mount the iPod again and run it)
++Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. 
++(If you forgot to run <CODE>mktunes</CODE> before unpluging/umounting, simply mount the iPod again and run it)
+ </P><P>
+ 
+ <A NAME="Recovering files"></A>
+@@ -1147,7 +1147,7 @@
+ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
+ value such as: <CODE>000ba3100310abcf</CODE> and should be autodetected on GNU/Linux (via <CODE>/proc/bus/usb/devices</CODE>) and Solaris (via <CODE>prtconf -v</CODE>).
+ If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the <CODE>--fwguid</CODE> switch 
+-of <CODE>mktunes.pl</CODE>.
++of <CODE>mktunes</CODE>.
+ </P><P>
+ 
+ <A NAME="Problems"></A>
+@@ -1213,16 +1213,16 @@
+ 
+ Everytime you run <CODE>tunes2pod.pl</CODE>, the iTunesDB will get parsed and converted into an 
+ XML File (the GNUtunesDB). 
+-<CODE>mktunes.pl</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
++<CODE>mktunes</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
+ iPod and iTunes)
+ </P><P>
+ 
+-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
++Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
+ (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+ </P><P>
+ 
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
+-GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes.pl</CODE>.
++GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes</CODE>.
+ </P><P>
+ 
+ If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod.pl</CODE> *before* 
+--- gnupod-0.99.8/doc/gnupod.texi	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.288980103 +1400
+@@ -359,7 +359,7 @@
+ Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
+ 
+ Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
+-Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes 
++Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes 
+ but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}:
+ 
+ First you need to get a new Firmware image. 
+@@ -561,7 +561,7 @@
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+ sets the rating to 5 Stars (5*20=100)
+ 
+-Don't forget to run mktunes.pl!
++Don't forget to run mktunes!
+ 
+ You could also edit the GNUtunesDB.xml with a text editor :-)
+ 
+@@ -669,7 +669,7 @@
+  </playlist>
+ @end example
+ 
+-Such a playlist will show up as a Podcast after running mktunes.pl
++Such a playlist will show up as a Podcast after running mktunes
+ 
+ gnupod_addsong.pl can also download podcasts and create such playlists itself:
+ 
+@@ -718,7 +718,7 @@
+ gnupod_search.pl --artwork cover.jpg --album Katamari
+ @end example
+ 
+-don't forget to run @code{@w{mktunes.pl}} afterwards.
++don't forget to run @code{@w{mktunes}} afterwards.
+ 
+ Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
+ If iTunes finds such a file (while scanning / changing tags) the artwork may get dropped.
+@@ -727,32 +727,32 @@
+ @node Unplug the iPod
+ @section Unplug the iPod
+ 
+-Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will 
++Before umounting the iPod, you have to call @code{@w{mktunes}} which will 
+ parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+ 
+ Simply run
+ @example
+-mktunes.pl -m /mnt/ipod
++mktunes -m /mnt/ipod
+ @end example
+ 
+-Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to 
++Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to 
+ boost the Volume.
+ 
+ @example
+-mktunes.pl -m /mnt/ipod --volume 40
++mktunes -m /mnt/ipod --volume 40
+ @end example
+ 
+ This would adjust the volume +40 percent. (You can also use '-100' to get 
+ a silent iPod ;) )
+ 
+-After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module
++After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module
+ @example
+ umount /mnt/ipod
+ rmmod sbp2
+ @end example
+ 
+-Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. 
+-(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it)
++Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. 
++(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it)
+ 
+ 
+ @node Recovering files
+@@ -832,7 +832,7 @@
+ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
+ value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}).
+ If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch 
+-of @code{mktunes.pl}.
++of @code{mktunes}.
+ 
+ @c ===========================================================================================
+ 
+@@ -866,14 +866,14 @@
+ 
+ Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an 
+ XML File (the GNUtunesDB). 
+-@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
++@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
+ iPod and iTunes)
+ 
+-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
++Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
+ (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+ 
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
+-GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
++GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
+ 
+ If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* 
+ using any other GNUpod commands.
+--- gnupod-0.99.8/doc/gnupodrc.example	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new	2021-04-09 18:13:08.292980103 +1400
+@@ -22,9 +22,9 @@
+ ## * nano_4g (the late 2008 nano)
+ # model = video
+ 
+-## Let GNUpod call mktunes.pl itself.
++## Let GNUpod call mktunes itself.
+ ## This may cause a slow-down when dealing with
+-## large databases on slow CPUs because mktunes.pl
++## large databases on slow CPUs because mktunes
+ ## may take some time to complete
+ # automktunes = 1
+ 
+@@ -32,7 +32,7 @@
+ 
+ ##### NON GLOBAL OPTIONS ######
+ 
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Specify the iPods name
+ # mktunes.ipod-name = Wurstli
+ 
+@@ -46,7 +46,7 @@
+ # tunes2pod.force = 1
+ 
+ 
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Set --volume boost to +10 percent 
+ # mktunes.volume = +10
+ ## Enforce iPod serial number:
 Patched gnupod-0.99.8/man/gnupod_check.pl.1.gz
---- gnupod-0.99.8/CHANGES	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:40.122707001 -1200
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.228980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.304980103 +1400
 @@ -258,14 +258,14 @@
    -> Apple lowered the Max. Pathlength from 64 to
       55. GNUpod will now crop after 49 chars (who knows what
@@ -590,8 +1285,59 @@
  
  - I changed the 'build' system. Btw, you can now uninstall
    GNUpod using 'make uninstall' .. but why? :)
---- gnupod-0.99.8/doc/gnupod.info	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:40.138706585 -1200
+--- gnupod-0.99.8/src/gnupod_check.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new	2021-04-09 18:13:08.308980103 +1400
+@@ -32,7 +32,7 @@
+ #Get maximal Pathlength from XMLHelper constant
+ my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
+ 
+-print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
+ 
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
+@@ -121,7 +121,7 @@
+ 	my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path});
+ 	my $id = $el->{file}->{id};
+ 	
+-	my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie";
++	my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie";
+ 	
+ 	$TRACKER{SIZE}+=int($el->{file}->{filesize});
+ 	$TRACKER{TIME}+=int($el->{file}->{time});
+@@ -222,8 +222,8 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_check.pl [-h] [-m directory]
+-gnupod_check.pl checks for 'lost' files
++Usage: gnupod_check [-h] [-m directory]
++gnupod_check checks for 'lost' files
+ 
+    -h, --help              display this help and exit
+        --version           output version information and exit
+@@ -237,7 +237,7 @@
+ 
+ sub version {
+ die << "EOF";
+-gnupod_check.pl (gnupod) ###__VERSION__###
++gnupod_check (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2004
+ 
+ This is free software; see the source for copying conditions.  There is NO
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.276980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.312980103 +1400
+@@ -31,7 +31,7 @@
+ 
+ gnupod_INIT.pl      INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong.pl   Add files
+-gnupod_check.pl     Check for 'zombie' files
++gnupod_check     Check for 'zombie' files
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+ gnupod_search.pl    Search ;)
+ mktunes          Convert the GNUtunesDB.xml to a iTunesDB
+--- gnupod-0.99.8/doc/gnupod.info	2021-04-09 18:13:08.280980103 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.316980103 +1400
 @@ -725,10 +725,10 @@
  If your computer crashed while uploading/deleting songs, you may have
  some 'zombie' files.
@@ -606,8 +1352,8 @@
  GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
  `gnupod_addsong.pl'
  
---- gnupod-0.99.8/doc/gnupod.html	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:40.162705963 -1200
+--- gnupod-0.99.8/doc/gnupod.html	2021-04-09 18:13:08.284980103 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.320980103 +1400
 @@ -1042,11 +1042,11 @@
  have some 'zombie' files.
  </P><P>
@@ -623,8 +1369,8 @@
  you can 'rebuild' an GNUtunesDB using <CODE>gnupod_addsong.pl</CODE>
  </P><P>
  
---- gnupod-0.99.8/doc/gnupod.texi	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:40.170705754 -1200
+--- gnupod-0.99.8/doc/gnupod.texi	2021-04-09 18:13:08.288980103 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.324980103 +1400
 @@ -761,11 +761,11 @@
  If your computer crashed while uploading/deleting songs, you may
  have some 'zombie' files.
@@ -640,60 +1386,334 @@
  you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong.pl}
  
  @example
---- gnupod-0.99.8/README	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:40.178705547 -1200
-@@ -31,7 +31,7 @@
+Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.304980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.336980103 +1400
+@@ -58,8 +58,8 @@
  
- gnupod_INIT.pl      INIT a new iPod (create empty Database + Directories)
- gnupod_addsong.pl   Add files
--gnupod_check.pl     Check for 'zombie' files
-+gnupod_check     Check for 'zombie' files
- gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
- gnupod_search.pl    Search ;)
- mktunes.pl          Convert the GNUtunesDB.xml to a iTunesDB
---- gnupod-0.99.8/src/gnupod_check.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new	2020-03-06 09:49:40.186705339 -1200
-@@ -32,7 +32,7 @@
- #Get maximal Pathlength from XMLHelper constant
- my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
+ I was planning to release GNUpod 1.0, but Heinrich Langos
+ flooded me with patches, many thanks to him:
+-- Fix DBID width in gnupod_search.pl output
+-- Added --bitrate switch to gnupod_search.pl
++- Fix DBID width in gnupod_search output
++- Added --bitrate switch to gnupod_search
+ - Added --podcast-files-limit switch to gnupod_addsong.pl
+ - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
+ - Added --unique switch to extractArtwork.pl
+@@ -209,7 +209,7 @@
+ - QTFile.pm: rseek() now refuses to return more than 1024 kb. Fixes possible out-of-memory problems
+              with broken files.
  
--print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
+-- Fixed an obscure gnupod_search.pl bug causing some weird search results.
++- Fixed an obscure gnupod_search bug causing some weird search results.
  
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
-@@ -121,7 +121,7 @@
- 	my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path});
- 	my $id = $el->{file}->{id};
- 	
--	my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie";
-+	my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie";
- 	
- 	$TRACKER{SIZE}+=int($el->{file}->{filesize});
- 	$TRACKER{TIME}+=int($el->{file}->{time});
-@@ -222,8 +222,8 @@
+ - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
+ 
+@@ -344,7 +344,7 @@
+ 
+ - Rewritten ConverterCore.. shouldn't break anything...
+ 
+-- gnupod_search.pl can now RENAME/Edit tags.
++- gnupod_search can now RENAME/Edit tags.
+   use --rename="artist=New artist Name"
+ 
+ - You can now sort playlists:
+@@ -422,8 +422,8 @@
+ - added tools/m4a-info.pl: Use this tool to read Title/Artist tags
+   from .m4a files (not installed by 'make install')
+ 
+-- You can modify the output of gnupod_search.pl using --view
+-  (See 'gnupod_search.pl --help')
++- You can modify the output of gnupod_search using --view
++  (See 'gnupod_search --help')
+ 
+ - gnupod_addsong.pl checks for wrong extensions
+   (like a mp3-file called 'test.wav'). The iPod wouldn't play
+@@ -598,7 +598,7 @@
+ I hope i didn't break anything.. but...
+ 
+ 
+-gnupod_search.pl:
++gnupod_search:
+   * -d doesn't delete all songs anymore.. hups..
+   * Playlist-Cleanup works now.. (another stupid bug.. :-/) 
+   * Added '--title' switch to usage
+@@ -682,7 +682,7 @@
+ - Fixed 'creating playlists' sample in documentation.
+ - Firmware 1.1.0 can read FAT32, updatet documentation.
+ - gnupod_delete.pl doesn't kill regex playlists anymore (ouch)
+-- gnupod_search.pl supports -g(enre)
++- gnupod_search supports -g(enre)
+  (Thanks to Johan Ruttenberg)
+ 
+ gnuPod 0.26
+--- gnupod-0.99.8/FAQ	2021-04-09 18:13:08.232980103 +1400
++++ gnupod-0.99.8/FAQ.new	2021-04-09 18:13:08.340980103 +1400
+@@ -8,7 +8,7 @@
+ 5 : Does GNUpod support feature $foobar ?
+ 6 : Can i add File-Format $foobar ?
+ 7 : How can i add files recursive?
+-8 : How to get parseable output from gnupod_search.pl?
++8 : How to get parseable output from gnupod_search?
+ 9 : Some Artists/Albums, etc. shows up multiple times
+     on the iPod Browser!
+ 10 : Why?
+@@ -144,13 +144,13 @@
+ (note the '-')
+ 
+ 
+-8. How to get parseable output from gnupod_search.pl
++8. How to get parseable output from gnupod_search
+ ----------------------------------------------------
+ 
+ gnupod_addsong.pl knows the '--view' switch.
+ 
+ Example: 
+-gnupod_search.pl --view=i -l "Cure" 2>/dev/null | tail +4
++gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
+ 
+ (Hmm.. output breaks if On-The-Go data get's synced..)
+ FIXME.. maybe we should have an --out option?
+--- gnupod-0.99.8/AUTHORS	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/AUTHORS.new	2021-04-09 18:13:08.344980103 +1400
+@@ -10,7 +10,7 @@
+  Contributed to the 'old' GNUpod (< 0.9)
+  - gnupod_list.pl
+  - gnupod_renumber.pl
+- - gnupod_search.pl (Most important tool ;) )
++ - gnupod_search (Most important tool ;) )
+ 
+ 
+ And also many thanks to the many other people
+--- gnupod-0.99.8/src/gnupod_search.pl	2021-04-09 18:13:08.248980103 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new	2021-04-09 18:13:08.348980103 +1400
+@@ -38,7 +38,7 @@
+ 
+ 
+ 
+-print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
+ 
+ # WARNING: If you add new options wich don't do matching, change newfile()
+ #
+@@ -241,7 +241,7 @@
  my($rtxt) = @_;
  die << "EOF";
  $rtxt
--Usage: gnupod_check.pl [-h] [-m directory]
--gnupod_check.pl checks for 'lost' files
-+Usage: gnupod_check [-h] [-m directory]
-+gnupod_check checks for 'lost' files
+-Usage: gnupod_search.pl [-h] [-m directory] File1 File2 ...
++Usage: gnupod_search [-h] [-m directory] File1 File2 ...
  
     -h, --help              display this help and exit
         --version           output version information and exit
-@@ -237,7 +237,7 @@
+@@ -279,7 +279,7 @@
  
  sub version {
  die << "EOF";
--gnupod_check.pl (gnupod) ###__VERSION__###
-+gnupod_check (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2004
+-gnupod_search.pl (gnupod) ###__VERSION__###
++gnupod_search (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2008
  
  This is free software; see the source for copying conditions.  There is NO
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.312980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.352980103 +1400
+@@ -33,7 +33,7 @@
+ gnupod_addsong.pl   Add files
+ gnupod_check     Check for 'zombie' files
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+-gnupod_search.pl    Search ;)
++gnupod_search    Search ;)
+ mktunes          Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod.pl        Convert the iTunesDB into a GNUtunesDB.xml
+ 
+--- gnupod-0.99.8/doc/gnupod.info	2021-04-09 18:13:08.316980103 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.356980103 +1400
+@@ -512,15 +512,15 @@
+ 4.4 Search files
+ ================
+ 
+-GNUpod includes a tool called `gnupod_search.pl' that helps you search
++GNUpod includes a tool called `gnupod_search' that helps you search
+ for files.
+ 
+    Maybe you would like to search for the artist called 'Schlummiguch'.
+ In this case, run
+-     gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++     gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ 
+-   Note: gnupod_search.pl assumes RegExp input.  Please have a look at
+-`gnupod_search.pl --help' for more information.
++   Note: gnupod_search assumes RegExp input.  Please have a look at
++`gnupod_search --help' for more information.
+ 
+ 
+ File: gnupod.info,  Node: Remove files,  Next: Edit tags,  Prev: Search files,  Up: Using GNUpod
+@@ -528,9 +528,9 @@
+ 4.5 Remove files
+ ================
+ 
+-Removing files is done using `gnupod_search.pl -d'.  To Remove all
++Removing files is done using `gnupod_search -d'.  To Remove all
+ files from the artist 'Schlummiguch', run
+-     gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++     gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
+ 
+ 
+ File: gnupod.info,  Node: Edit tags,  Next: Creating playlists,  Prev: Remove files,  Up: Using GNUpod
+@@ -538,9 +538,9 @@
+ 4.6 Edit tags
+ =============
+ 
+-You can use `gnupod_search.pl' to edit tags (like artist, album, etc..)
++You can use `gnupod_search' to edit tags (like artist, album, etc..)
+ 
+-     gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++     gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
+ 
+    This example searches all files from 'Alfred Neumann', changes the
+ artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
+@@ -674,10 +674,10 @@
+ switch of `gnupod_addsong.pl'. Example:
+      gnupod_addsong.pl --artwork cover.jpg *.mp3
+ 
+-   Use `gnupod_search.pl' to change/add artwork for existing files.
++   Use `gnupod_search' to change/add artwork for existing files.
+ Example:
+      # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+-     gnupod_search.pl --artwork cover.jpg --album Katamari
++     gnupod_search --artwork cover.jpg --album Katamari
+ 
+    don't forget to run `mktunes' afterwards.
+ 
+--- gnupod-0.99.8/doc/gnupod.html	2021-04-09 18:13:08.320980103 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.360980103 +1400
+@@ -722,15 +722,15 @@
+ <!--docid::SEC12::-->
+ <P>
+ 
+-GNUpod includes a tool called <CODE>gnupod_search.pl</CODE> that helps you search for files.
++GNUpod includes a tool called <CODE>gnupod_search</CODE> that helps you search for files.
+ </P><P>
+ 
+ Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ </pre></td></tr></table></P><P>
+ 
+-Note: gnupod_search.pl assumes RegExp input.
+-Please have a look at <CODE>gnupod_search.pl --help</CODE> for more information.
++Note: gnupod_search assumes RegExp input.
++Please have a look at <CODE>gnupod_search --help</CODE> for more information.
+ </P><P>
+ 
+ <A NAME="Remove files"></A>
+@@ -751,9 +751,9 @@
+ <!--docid::SEC13::-->
+ <P>
+ 
+-Removing files is done using <CODE>gnupod_search.pl -d</CODE>.
++Removing files is done using <CODE>gnupod_search -d</CODE>.
+ To Remove all files from the artist 'Schlummiguch', run
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
+ </pre></td></tr></table></P><P>
+ 
+ <A NAME="Edit tags"></A>
+@@ -774,10 +774,10 @@
+ <!--docid::SEC14::-->
+ <P>
+ 
+-You can use <CODE>gnupod_search.pl</CODE> to edit tags (like artist, album, etc..)
++You can use <CODE>gnupod_search</CODE> to edit tags (like artist, album, etc..)
+ </P><P>
+ 
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
+ </pre></td></tr></table></P><P>
+ 
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+@@ -962,9 +962,9 @@
+ <TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_addsong.pl --artwork cover.jpg *.mp3
+ </pre></td></tr></table></P><P>
+ 
+-Use <CODE>gnupod_search.pl</CODE> to change/add artwork for existing files. Example:
++Use <CODE>gnupod_search</CODE> to change/add artwork for existing files. Example:
+ <TABLE><tr><td>&nbsp;</td><td class=example><pre># Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+-gnupod_search.pl --artwork cover.jpg --album Katamari
++gnupod_search --artwork cover.jpg --album Katamari
+ </pre></td></tr></table></P><P>
+ 
+ don't forget to run <CODE>mktunes</CODE> afterwards.
+--- gnupod-0.99.8/doc/gnupod.texi	2021-04-09 18:13:08.324980103 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.364980103 +1400
+@@ -529,33 +529,33 @@
+ @node Search files
+ @section Search files
+ 
+-GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files.
++GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files.
+ 
+ Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
+ @example
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ @end example
+ 
+-Note: gnupod_search.pl assumes RegExp input.
+-Please have a look at @code{@w{gnupod_search.pl --help}} for more information.
++Note: gnupod_search assumes RegExp input.
++Please have a look at @code{@w{gnupod_search --help}} for more information.
+ 
+ @node Remove files
+ @section Remove files
+ 
+-Removing files is done using @code{@w{gnupod_search.pl -d}}.
++Removing files is done using @code{@w{gnupod_search -d}}.
+ To Remove all files from the artist 'Schlummiguch', run
+ @example
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
+ @end example
+ 
+ 
+ @node Edit tags
+ @section Edit tags
+ 
+-You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..)
++You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..)
+ 
+ @example
+-gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
+ @end example
+ 
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+@@ -712,10 +712,10 @@
+ @end example
+ 
+ 
+-Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example:
++Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example:
+ @example
+ # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+-gnupod_search.pl --artwork cover.jpg --album Katamari
++gnupod_search --artwork cover.jpg --album Katamari
+ @end example
+ 
+ don't forget to run @code{@w{mktunes}} afterwards.
+--- gnupod-0.99.8/doc/gnupodrc.example	2021-04-09 18:13:08.292980103 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new	2021-04-09 18:13:08.368980103 +1400
+@@ -52,7 +52,7 @@
+ ## Enforce iPod serial number:
+ # mktunes.fwguid = 000ba3100310abcf
+ 
+-# *** gnupod_search.pl ***
++# *** gnupod_search ***
+ 
+ ## Always match only once
+ # gnupod_search.match-once = 1
 Created gnupod-0.99.8/man/gnupod_convert_RIFF.pl.1.gz
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:40.122707001 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:40.302702329 -1200
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.336980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.416980103 +1400
 @@ -141,7 +141,7 @@
  - Reduced MP3::Info false-positives: Empty files are
    no longer detected as .mp3 files
@@ -703,8 +1723,8 @@
  - Upgraded from GPLv2 to GPLv3
  
  
---- gnupod-0.99.8/src/ext/FileMagic.pm	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2020-03-06 09:49:40.310702121 -1200
+--- gnupod-0.99.8/src/ext/FileMagic.pm	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2021-04-09 18:13:08.420980103 +1400
 @@ -55,7 +55,7 @@
                    'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
                    'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
@@ -714,38 +1734,15 @@
  
  
  
-Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm	2020-03-06 09:49:40.310702121 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2020-03-06 09:49:40.418699318 -1200
-@@ -51,7 +51,7 @@
- # done!
- #
- 
--my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'},
-+my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
-                   'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
-                   'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
-                   'MAC ' => { encoder=>'gnupod_convert_APE.pl',  ftyp=>'APE' },
 Patched gnupod-0.99.8/man/gnupod_INIT.pl.1.gz
---- gnupod-0.99.8/README.developer	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/README.developer.new	2020-03-06 09:49:40.446698591 -1200
-@@ -4,7 +4,7 @@
- These aren't the droids you're looking for. Move along! :-)
- 
- Minimal testing:
--> gnupod_INIT.pl /mnt/empty
-+> gnupod_INIT /mnt/empty
- > gnupod_addsong
- > mktunes.pl
- > tunes2pod.pl --force
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:40.302702329 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:40.486697553 -1200
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.416980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.432980103 +1400
 @@ -46,7 +46,7 @@
    NEW: Set addtime to a fixed value when doing autotests.
    NEW: Added check for "autotest" file at the ipod mountpoint.
    NEW: The connection hash was expanded by a "autotest" key.
--  NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.pl.
-+  NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.pl.
+-  NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.
++  NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
  
  
  *** OLD STUFF ***
@@ -767,92 +1764,8 @@
    * Added '--france' switch (Limit volume to 100 db for
      1.x Firmware)
  
---- gnupod-0.99.8/tools/extractArtwork.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/extractArtwork.pl.new	2020-03-06 09:49:40.506697035 -1200
-@@ -22,7 +22,7 @@
- my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0);
- 
- $AWDB->LoadArtworkDb;
--GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT.pl?\n");
-+GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT?\n");
- 
- #print Data::Dumper::Dumper($AWDB);
- 
---- gnupod-0.99.8/doc/gnupod.info	2020-03-06 09:49:40.138706585 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:40.534696308 -1200
-@@ -434,14 +434,14 @@
- 
-    If the iPod is freshly formatted or you never used GNUpod before
- with this iPod, run
--     gnupod_INIT.pl -m /mnt/ipod
-+     gnupod_INIT -m /mnt/ipod
- 
--   gnupod_INIT.pl will create the default directory tree and creates an
-+   gnupod_INIT will create the default directory tree and creates an
- empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to
- convert the iTunesDB to an GNUtunesDB)
- 
-    Use
--     gnupod_INIT.pl -m /mnt/ipod --france
-+     gnupod_INIT -m /mnt/ipod --france
- 
-    if you would like to enable the 'EU-Volume-Limit' (=decrease max.
- volume).  This only works for iPods running Firmware 1.x
---- gnupod-0.99.8/doc/gnupod.html	2020-03-06 09:49:40.162705963 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:40.550695893 -1200
-@@ -596,15 +596,15 @@
- </P><P>
- 
- If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT.pl -m /mnt/ipod
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT -m /mnt/ipod
- </pre></td></tr></table></P><P>
- 
--gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB 
-+gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
- (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
- </P><P>
- 
- Use
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT.pl -m /mnt/ipod --france
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT -m /mnt/ipod --france
- </pre></td></tr></table></P><P>
- 
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/doc/gnupod.texi	2020-03-06 09:49:40.170705754 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:40.566695477 -1200
-@@ -455,15 +455,15 @@
- 
- If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
- @example
--gnupod_INIT.pl -m /mnt/ipod
-+gnupod_INIT -m /mnt/ipod
- @end example
- 
--gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB 
-+gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
- (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
- 
- Use
- @example
--gnupod_INIT.pl -m /mnt/ipod --france
-+gnupod_INIT -m /mnt/ipod --france
- @end example
- 
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/README	2020-03-06 09:49:40.178705547 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:40.578695166 -1200
-@@ -29,7 +29,7 @@
- GNUpod commands (cheatsheet)
- ----------------------------
- 
--gnupod_INIT.pl      INIT a new iPod (create empty Database + Directories)
-+gnupod_INIT      INIT a new iPod (create empty Database + Directories)
- gnupod_addsong.pl   Add files
- gnupod_check     Check for 'zombie' files
- gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
---- gnupod-0.99.8/FAQ	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/FAQ.new	2020-03-06 09:49:40.586694958 -1200
+--- gnupod-0.99.8/FAQ	2021-04-09 18:13:08.340980103 +1400
++++ gnupod-0.99.8/FAQ.new	2021-04-09 18:13:08.436980103 +1400
 @@ -58,7 +58,7 @@
     ./configure && make install
   
@@ -860,10 +1773,52 @@
 - 2 run gnupod_INIT.pl -m /mnt/ipod
 + 2 run gnupod_INIT -m /mnt/ipod
   3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
-  4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
+  4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
   5 umount the iPod and enjoy!
---- gnupod-0.99.8/src/gnupod_check.pl	2020-03-06 09:49:40.186705339 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new	2020-03-06 09:49:40.594694751 -1200
+--- gnupod-0.99.8/src/mktunes.pl	2021-04-09 18:13:08.236980103 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new	2021-04-09 18:13:08.440980103 +1400
+@@ -66,7 +66,7 @@
+ 	$mktunes = GNUpod::Mktunes->new(Connection=>$con, iPodName=>$opts{'ipod-name'}, Artwork=>$AWDB);
+ 	
+ 	print "> Parsing XML document...\n";
+-	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT.pl ?");
++	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT ?");
+ 	
+ 	print "\r> ".$mktunes->GetFileCount." files parsed, assembling iTunesDB...\n";
+ 	$mktunes->WriteItunesDB;
+--- gnupod-0.99.8/src/ext/XMLhelper.pm	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/XMLhelper.pm.new	2021-04-09 18:13:08.444980103 +1400
+@@ -69,7 +69,7 @@
+ 		my @aviable_targets     = bsd_glob($xconn->{musicdir}."/*", $xconn->{autotest}?GLOB_NOCASE:GLOB_NOSORT);
+ 		
+ 		unless(int(@aviable_targets)) {
+-			warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT.pl ?\n";
++			warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT ?\n";
+ 			return undef;
+ 		}
+ 		if(length($current_extension) != 0) {
+--- gnupod-0.99.8/src/ext/Mktunes.pm	2021-04-09 18:13:08.240980103 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new	2021-04-09 18:13:08.448980103 +1400
+@@ -20,7 +20,7 @@
+ 	
+ 	sub WriteItunesSD {
+ 		my($self) = @_;
+-		open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
++		open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
+ 		binmode(ITS);
+ 		print ITS GNUpod::iTunesDB::mk_itunes_sd_header({files=>$self->GetFileCount});
+ 		foreach my $item (@{$self->GetFiles}) {
+@@ -43,7 +43,7 @@
+ 		my $outfile = $self->GetConnection->{itunesdb};
+ 		my $tmpfile = $outfile.".$$";
+ 		
+-		open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
++		open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
+ 		binmode(ITUNES);
+ 		print ITUNES GNUpod::iTunesDB::mk_mhbd({});
+ 			$mhbd_size = tell(ITUNES);
+--- gnupod-0.99.8/src/gnupod_check.pl	2021-04-09 18:13:08.308980103 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new	2021-04-09 18:13:08.452980103 +1400
 @@ -52,7 +52,7 @@
  	usage($con->{status}."\n") if $con->{status};
  	
@@ -873,8 +1828,19 @@
  
  	print "Pass 2: Checking Files on the iPod...\n";
  	checkGNUtunes($con);
---- gnupod-0.99.8/src/gnupod_INIT.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2020-03-06 09:49:40.602694543 -1200
+--- gnupod-0.99.8/src/gnupod_search.pl	2021-04-09 18:13:08.348980103 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new	2021-04-09 18:13:08.456980103 +1400
+@@ -89,7 +89,7 @@
+ 	}
+ 	
+ 	pview(undef,1);
+-	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
++	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
+ 	#XML::Parser finished, write new file if we deleted or renamed
+ 	if($dirty) {
+ 		GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}});
+--- gnupod-0.99.8/src/gnupod_INIT.pl	2021-04-09 18:13:08.252980103 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2021-04-09 18:13:08.456980103 +1400
 @@ -28,7 +28,7 @@
  use vars qw(%opts);
  
@@ -911,39 +1877,8 @@
  Copyright (C) Adrian Ulrich 2002-2004
  
  This is free software; see the source for copying conditions.  There is NO
---- gnupod-0.99.8/src/ext/XMLhelper.pm	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new	2020-03-06 09:49:40.610694335 -1200
-@@ -69,7 +69,7 @@
- 		my @aviable_targets     = bsd_glob($xconn->{musicdir}."/*", $xconn->{autotest}?GLOB_NOCASE:GLOB_NOSORT);
- 		
- 		unless(int(@aviable_targets)) {
--			warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT.pl ?\n";
-+			warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT ?\n";
- 			return undef;
- 		}
- 		if(length($current_extension) != 0) {
---- gnupod-0.99.8/src/ext/Mktunes.pm	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new	2020-03-06 09:49:40.618694128 -1200
-@@ -20,7 +20,7 @@
- 	
- 	sub WriteItunesSD {
- 		my($self) = @_;
--		open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
-+		open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
- 		binmode(ITS);
- 		print ITS GNUpod::iTunesDB::mk_itunes_sd_header({files=>$self->GetFileCount});
- 		foreach my $item (@{$self->GetFiles}) {
-@@ -43,7 +43,7 @@
- 		my $outfile = $self->GetConnection->{itunesdb};
- 		my $tmpfile = $outfile.".$$";
- 		
--		open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
-+		open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
- 		binmode(ITUNES);
- 		print ITUNES GNUpod::iTunesDB::mk_mhbd({});
- 			$mhbd_size = tell(ITUNES);
---- gnupod-0.99.8/src/gnupod_addsong.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2020-03-06 09:49:40.650693297 -1200
+--- gnupod-0.99.8/src/gnupod_addsong.pl	2021-04-09 18:13:08.256980103 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2021-04-09 18:13:08.460980103 +1400
 @@ -119,7 +119,7 @@
  				delete($opts{artwork});
  			}
@@ -953,480 +1888,108 @@
  	}
  	
  	# Check volume adjustment options for sanity
---- gnupod-0.99.8/src/mktunes.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new	2020-03-06 09:49:40.666692882 -1200
-@@ -66,7 +66,7 @@
- 	$mktunes = GNUpod::Mktunes->new(Connection=>$con, iPodName=>$opts{'ipod-name'}, Artwork=>$AWDB);
- 	
- 	print "> Parsing XML document...\n";
--	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT.pl ?");
-+	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT ?");
- 	
- 	print "\r> ".$mktunes->GetFileCount." files parsed, assembling iTunesDB...\n";
- 	$mktunes->WriteItunesDB;
---- gnupod-0.99.8/src/gnupod_search.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new	2020-03-06 09:49:40.674692675 -1200
-@@ -89,7 +89,7 @@
- 	}
- 	
- 	pview(undef,1);
--	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
-+	GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
- 	#XML::Parser finished, write new file if we deleted or renamed
- 	if($dirty) {
- 		GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}});
-Patched gnupod-0.99.8/man/tunes2pod.pl.1.gz
---- gnupod-0.99.8/README.developer	2020-03-06 09:49:40.446698591 -1200
-+++ gnupod-0.99.8/README.developer.new	2020-03-06 09:49:40.698692052 -1200
-@@ -7,7 +7,7 @@
- > gnupod_INIT /mnt/empty
- > gnupod_addsong
- > mktunes.pl
--> tunes2pod.pl --force
-+> tunes2pod --force
- > mktunes.pl
- > check if your ipod can read the result
- 
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:40.486697553 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:40.706691844 -1200
-@@ -136,7 +136,7 @@
- Summary
- -------
- 
--- Fixed invalid warning about broken mhip header. (tunes2pod.pl)
-+- Fixed invalid warning about broken mhip header. (tunes2pod)
- - Less stricter Podcast-Playlist parsing
- - Reduced MP3::Info false-positives: Empty files are
-   no longer detected as .mp3 files
-@@ -202,7 +202,7 @@
- 
- - Workaround for broken files written by 'Anapod'
-   Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc
--  to enable it. Enabling it slows down tunes2pod.pl
-+  to enable it. Enabling it slows down tunes2pod
-   (because it deactivates the fast-skip of the (useless)
-    MasterPlaylist)
- 
-@@ -222,7 +222,7 @@
- - gnupod_addsong.pl can now fetch podcast-rss feeds!
-   Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
- 
--- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl
-+- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
- 
- - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
-   Thanks to Chris Abajian for reporting this issue.
-@@ -469,7 +469,7 @@
-   iPods
- 
- - GNUpod checks if the iTunesDB did change and
--  runs tunes2pod.pl if it has to run it
-+  runs tunes2pod if it has to run it
- 
- - Changed rating-schema to match SPL-Rating
-   -> Rating 5 is now 100 (newrating=oldrating*20)
-@@ -530,7 +530,7 @@
- --------
- iTunesDB.pm and co:
-  * Can read and write Playlist-Elements without child
--   tunes2pod.pl couldn't read files written by
-+   tunes2pod couldn't read files written by
-    (newer) MusicMatch releases.. this should fix the issue :)
-  * Don't parse MasterPlaylists, do a seek()
-    -> Speeds up parsing
-@@ -572,7 +572,7 @@
- FileMagic.pm
-   * Fixed (?) ID3v2 reading
+--- gnupod-0.99.8/README.developer	2021-04-09 18:13:08.264980103 +1400
++++ gnupod-0.99.8/README.developer.new	2021-04-09 18:13:08.464980103 +1400
+@@ -4,7 +4,7 @@
+ These aren't the droids you're looking for. Move along! :-)
  
--tunes2pod.pl:
-+tunes2pod:
-   * Added paranoia checks (stricter parsing)
-   * Added SPL-Read code (BETA!)
+ Minimal testing:
+-> gnupod_INIT.pl /mnt/empty
++> gnupod_INIT /mnt/empty
+ > gnupod_addsong
+ > mktunes
+ > tunes2pod.pl --force
+--- gnupod-0.99.8/tools/extractArtwork.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/tools/extractArtwork.pl.new	2021-04-09 18:13:08.468980103 +1400
+@@ -22,7 +22,7 @@
+ my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0);
  
-@@ -657,7 +657,7 @@
-   Use an UNICODE Texteditor to edit the GNUtunesDB..
-   (Like 'yudit' or the gnome2 texteditor)
-   Your old latin1 GNUtunesDB will get converted to an
--  UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or
-+  UTF8 version after running tunes2pod/gnupod_addsong.pl or
-   gnupod_delete.pl
+ $AWDB->LoadArtworkDb;
+-GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT.pl?\n");
++GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT?\n");
  
-   UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
-@@ -668,8 +668,8 @@
+ #print Data::Dumper::Dumper($AWDB);
  
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.352980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.472980103 +1400
+@@ -29,7 +29,7 @@
+ GNUpod commands (cheatsheet)
+ ----------------------------
  
- gnuPod 0.28
--- Rewritten Playlistcode for tunes2pod.pl
--- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
-+- Rewritten Playlistcode for tunes2pod
-+- tunes2pod doesn't kill your empty GNUtunesDB anymore
-   if it can't find the iTunesDB
- - mktunes.pl uses now binmode(), maybe this helps
-   RedHat 8 ? .. (and win32 ;) )
-@@ -735,7 +735,7 @@
-  
-  
- gnuPod 0.21
--- Fixed stupid tunes2pod.pl bug with big iTunesDBs
-+- Fixed stupid tunes2pod bug with big iTunesDBs
-  (Thanks to Ciamac Moallemi for reporting and providing a patch)
- - Support for songnum, songs, cdnum, cds and year
+-gnupod_INIT.pl      INIT a new iPod (create empty Database + Directories)
++gnupod_INIT      INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong.pl   Add files
+ gnupod_check     Check for 'zombie' files
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+--- gnupod-0.99.8/doc/gnupod.info	2021-04-09 18:13:08.356980103 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.476980103 +1400
+@@ -434,14 +434,14 @@
  
---- gnupod-0.99.8/doc/gnupod.info	2020-03-06 09:49:40.534696308 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:40.714691636 -1200
-@@ -437,7 +437,7 @@
-      gnupod_INIT -m /mnt/ipod
+    If the iPod is freshly formatted or you never used GNUpod before
+ with this iPod, run
+-     gnupod_INIT.pl -m /mnt/ipod
++     gnupod_INIT -m /mnt/ipod
  
-    gnupod_INIT will create the default directory tree and creates an
--empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to
-+empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to
+-   gnupod_INIT.pl will create the default directory tree and creates an
++   gnupod_INIT will create the default directory tree and creates an
+ empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to
  convert the iTunesDB to an GNUtunesDB)
  
     Use
-@@ -752,17 +752,17 @@
-    If you want to use an iPod with GNUpod and used something other than
- GNUpod (maybe iTunes)  to perform the last update (adding songs,
- editing playists.. doing something..), you'll have to  use
--`tunes2pod.pl' to update the (outdated) GNUtunesDB.
-+`tunes2pod' to update the (outdated) GNUtunesDB.
- 
-    Mount the iPod and run
--     tunes2pod.pl -m /mnt/ipod
-+     tunes2pod -m /mnt/ipod
- 
-    The iPod is now ready again for GNUpod.
- 
-    You have to do this because GNUpod stores its information in the
- GNUtunesDB, but other programs access the iTunesDB directly. After you
- did something with eg. iTunes, the GNUtunesDB would be 'outdated' and
--you would lose any changes you made with iTunes. Running `tunes2pod.pl'
-+you would lose any changes you made with iTunes. Running `tunes2pod'
- will write a new GNUtunesDB which reflects the content of the current
- iTunesDB.
- 
-@@ -778,7 +778,7 @@
-       <add album="foo" />
-      </playlist>
- 
--   ..would look like this after using tunes2pod.pl
-+   ..would look like this after using tunes2pod
-      ...
-      <playist name="extended">
-       <add id="1" />
-@@ -839,12 +839,12 @@
- information like the iTunesDB, but it's a simple XML file: easy to
- understand by humans and easy to edit by hand.
- 
--   Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and
-+   Everytime you run `tunes2pod', the iTunesDB will get parsed and
- converted into an XML File (the GNUtunesDB).  `mktunes.pl' does the
- opposite: it parses the XML file and creates an iTunesDB (for the iPod
- and iTunes)
- 
--   Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB
-+   Only mktunes.pl and tunes2pod have to worry about the iTunesDB
- format: all other tools (gnupod_addsong.pl for example) only have to
- deal with the XML file called GNUtunesDB.
- 
-@@ -853,7 +853,7 @@
- gnupod_something.pl) you'll have to run `mktunes.pl'.
- 
-    If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
--`tunes2pod.pl' *before* using any other GNUpod commands.
-+`tunes2pod' *before* using any other GNUpod commands.
- 
- 
- File: gnupod.info,  Node: Get rid of '-m',  Next: Known bugs and limitations,  Prev: GNUtunesDB,  Up: Problems
---- gnupod-0.99.8/doc/gnupod.html	2020-03-06 09:49:40.550695893 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:40.722691428 -1200
-@@ -600,7 +600,7 @@
- </pre></td></tr></table></P><P>
- 
- gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
--(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
-+(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
- </P><P>
- 
- Use
-@@ -1084,11 +1084,11 @@
+-     gnupod_INIT.pl -m /mnt/ipod --france
++     gnupod_INIT -m /mnt/ipod --france
  
- If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
-  to perform the last update (adding songs, editing playists.. doing something..), you'll have to
-- use <CODE>tunes2pod.pl</CODE> to update the (outdated) GNUtunesDB.
-+ use <CODE>tunes2pod</CODE> to update the (outdated) GNUtunesDB.
+    if you would like to enable the 'EU-Volume-Limit' (=decrease max.
+ volume).  This only works for iPods running Firmware 1.x
+--- gnupod-0.99.8/doc/gnupod.html	2021-04-09 18:13:08.360980103 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.480980103 +1400
+@@ -596,15 +596,15 @@
  </P><P>
  
- Mount the iPod and run 
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>tunes2pod.pl -m /mnt/ipod
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>tunes2pod -m /mnt/ipod
+ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT.pl -m /mnt/ipod
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT -m /mnt/ipod
  </pre></td></tr></table></P><P>
  
- The iPod is now ready again for GNUpod.
-@@ -1096,7 +1096,7 @@
- 
- You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the 
- iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would 
--lose any changes you made with iTunes. Running <CODE>tunes2pod.pl</CODE> will write a new GNUtunesDB which
-+lose any changes you made with iTunes. Running <CODE>tunes2pod</CODE> will write a new GNUtunesDB which
- reflects the content of the current iTunesDB.
+-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB 
++gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
+ (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
  </P><P>
  
-@@ -1113,7 +1113,7 @@
- &#60;/playlist&#62;
+ Use
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT.pl -m /mnt/ipod --france
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_INIT -m /mnt/ipod --france
  </pre></td></tr></table></P><P>
  
--..would look like this after using tunes2pod.pl
-+..would look like this after using tunes2pod
- <TABLE><tr><td>&nbsp;</td><td class=example><pre>...
- &#60;playist name="extended"&#62;
-  &#60;add id="1" /&#62;
-@@ -1211,13 +1211,13 @@
- the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
- </P><P>
- 
--Everytime you run <CODE>tunes2pod.pl</CODE>, the iTunesDB will get parsed and converted into an 
-+Everytime you run <CODE>tunes2pod</CODE>, the iTunesDB will get parsed and converted into an 
- XML File (the GNUtunesDB). 
- <CODE>mktunes.pl</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
- iPod and iTunes)
- </P><P>
- 
--Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
-+Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
- (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
- </P><P>
- 
-@@ -1225,7 +1225,7 @@
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes.pl</CODE>.
- </P><P>
- 
--If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod.pl</CODE> *before* 
-+If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod</CODE> *before* 
- using any other GNUpod commands.
- </P><P>
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
+--- gnupod-0.99.8/doc/gnupod.texi	2021-04-09 18:13:08.364980103 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.488980103 +1400
+@@ -455,15 +455,15 @@
  
---- gnupod-0.99.8/doc/gnupod.texi	2020-03-06 09:49:40.566695477 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:40.746690806 -1200
-@@ -459,7 +459,7 @@
+ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
+ @example
+-gnupod_INIT.pl -m /mnt/ipod
++gnupod_INIT -m /mnt/ipod
  @end example
  
- gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
--(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
-+(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
+-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB 
++gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
+ (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
  
  Use
  @example
-@@ -785,18 +785,18 @@
- 
- If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
-  to perform the last update (adding songs, editing playists.. doing something..), you'll have to
-- use @code{@w{tunes2pod.pl}} to update the (outdated) GNUtunesDB.
-+ use @code{@w{tunes2pod}} to update the (outdated) GNUtunesDB.
- 
- Mount the iPod and run 
- @example
--tunes2pod.pl -m /mnt/ipod
-+tunes2pod -m /mnt/ipod
- @end example
- 
- The iPod is now ready again for GNUpod.
- 
- You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the 
- iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would 
--lose any changes you made with iTunes. Running @code{@w{tunes2pod.pl}} will write a new GNUtunesDB which
-+lose any changes you made with iTunes. Running @code{@w{tunes2pod}} will write a new GNUtunesDB which
- reflects the content of the current iTunesDB.
- 
- 
-@@ -813,7 +813,7 @@
- </playlist>
+-gnupod_INIT.pl -m /mnt/ipod --france
++gnupod_INIT -m /mnt/ipod --france
  @end example
  
--..would look like this after using tunes2pod.pl
-+..would look like this after using tunes2pod
- @example
- ...
- <playist name="extended">
-@@ -864,18 +864,18 @@
- The GNUtunesDB (@code{@w{iPod_Control/.gnupod/GNUtunesDB}}) holds the same information like 
- the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
- 
--Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an 
-+Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an 
- XML File (the GNUtunesDB). 
- @code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
- iPod and iTunes)
- 
--Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
-+Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
- (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
- 
- It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
- 
--If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* 
-+If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before* 
- using any other GNUpod commands.
- 
- 
---- gnupod-0.99.8/doc/gnupodrc.example	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new	2020-03-06 09:49:40.754690598 -1200
-@@ -41,7 +41,7 @@
- ## Uncomment this to skip 'on-the-go' sync
- # otgsync.nosync = 1
- 
--# *** tunes2pod.pl ***
-+# *** tunes2pod ***
- ## Uncomment to set '--force' switch to true (DANGEROUS)
- # tunes2pod.force = 1
- 
---- gnupod-0.99.8/README	2020-03-06 09:49:40.578695166 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:40.766690287 -1200
-@@ -35,7 +35,7 @@
- gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
- gnupod_search.pl    Search ;)
- mktunes.pl          Convert the GNUtunesDB.xml to a iTunesDB
--tunes2pod.pl        Convert the iTunesDB into a GNUtunesDB.xml
-+tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
- 
- You'll have to use mktunes.pl if you added/deleted/changed something
- on the iPod.
---- gnupod-0.99.8/FAQ	2020-03-06 09:49:40.586694958 -1200
-+++ gnupod-0.99.8/FAQ.new	2020-03-06 09:49:40.774690079 -1200
-@@ -190,7 +190,7 @@
- But the iTunesDB-format isn't so complicated if you know how to
- write the specific parts and how you'll have to assemble
- them.
--Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes.pl
-+Just have a look at iTunesDB.pm and tunes2pod+mktunes.pl
- 
- ..or feel free to ask me questions about it:
- <pab at blinkenlights.ch>
---- gnupod-0.99.8/src/gnupod_INIT.pl	2020-03-06 09:49:40.602694543 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2020-03-06 09:49:40.782689872 -1200
-@@ -115,9 +115,9 @@
- 
-  my $t2pfail = 0;
-  if(-e $con->{itunesdb} && !$opts{'disable-convert'}) {
-- #We have an iTunesDB, call tunes2pod.pl
--  print "Found *existing* iTunesDB, running tunes2pod.pl\n";
--  $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
-+ #We have an iTunesDB, call tunes2pod
-+  print "Found *existing* iTunesDB, running tunes2pod\n";
-+  $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
-  }
-  else {
-  #No iTunesDB, run mktunes.pl
---- gnupod-0.99.8/src/tunes2pod.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/tunes2pod.pl.new	2020-03-06 09:49:40.806689248 -1200
-@@ -36,7 +36,7 @@
- $| = 1;
- 
- 
--print "tunes2pod.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "tunes2pod Version ###__VERSION__### (C) Adrian Ulrich\n";
- 
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- 
-@@ -58,7 +58,7 @@
- 	#We disabled all autosyncing (_no_sync set to 1), so we do a test
- 	#ourself
- 	if(!$opts{force} && !(GNUpod::FooBar::ItunesDBNeedsSync($con))) {
--		print "I don't think that you have to run tunes2pod.pl\n";
-+		print "I don't think that you have to run tunes2pod\n";
- 		print "The GNUtunesDB looks up-to-date\n";
- 		print "\n";
- 		print "If you think i'm wrong, use '$0 --force'\n";
-@@ -354,7 +354,7 @@
- 	my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: tunes2pod.pl [-h] [-m directory]
-+Usage: tunes2pod [-h] [-m directory]
- 
-    -h, --help              display this help and exit
-        --version           output version information and exit
-@@ -367,7 +367,7 @@
- 
- sub version {
- die << "EOF";
--tunes2pod.pl (gnupod) ###__VERSION__###
-+tunes2pod (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2007
- 
- This is free software; see the source for copying conditions.  There is NO
---- gnupod-0.99.8/src/ext/iTunesDB.pm	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/iTunesDB.pm.new	2020-03-06 09:49:40.830688626 -1200
-@@ -1012,7 +1012,7 @@
- 
- 
- 
--### Here are the READ sub's used by tunes2pod.pl
-+### Here are the READ sub's used by tunes2pod
- 
- ###########################################
- # Get a INT value
---- gnupod-0.99.8/src/ext/XMLhelper.pm	2020-03-06 09:49:40.610694335 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new	2020-03-06 09:49:40.838688418 -1200
-@@ -191,7 +191,7 @@
- }
- 
- ##############################################################
--# Add a playlist to output (Called by eventer or tunes2pod.pl)
-+# Add a playlist to output (Called by eventer or tunes2pod)
- # This thing doesn't create xml-encoded output!
- sub addpl {
- 	my($name, $opt) = @_;
-@@ -210,7 +210,7 @@
- }
- 
- ##############################################################
--# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl)
-+# Add a SmartPlaylist to output (Called by eventer or tunes2pod)
- # Like addpl(), 'output' isn't xml-encoded
- sub addspl {
- 	my($name, $opt) = @_;
---- gnupod-0.99.8/src/ext/FooBar.pm	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new	2020-03-06 09:49:40.842688314 -1200
-@@ -143,7 +143,7 @@
- sub StartItunesDBSync {
- 	my($con) = @_;
- 	
--	my $XBIN = "$con->{bindir}/tunes2pod.pl";
-+	my $XBIN = "$con->{bindir}/tunes2pod";
- 	
- 	if(-x $XBIN) {
- 		{
---- gnupod-0.99.8/src/gnupod_otgsync.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2020-03-06 09:49:40.850688107 -1200
-@@ -63,7 +63,7 @@
- 	usage($con->{status}."\n") if $con->{status};
- 	
- 	if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
--		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n";
-+		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
- 	}
- 	
- 	##Check if GNUtunesDB <-> iTunesDB is really in-sync
-Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm	2020-03-06 09:49:40.418699318 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2020-03-06 09:49:40.998684265 -1200
-@@ -54,7 +54,7 @@
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
-                   'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
-                   'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
--                  'MAC ' => { encoder=>'gnupod_convert_APE.pl',  ftyp=>'APE' },
-+                  'MAC ' => { encoder=>'gnupod_convert_APE',  ftyp=>'APE' },
-                   'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
- 
- 
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
 Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:40.706691844 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:41.018683747 -1200
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.432980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.496980103 +1400
 @@ -60,7 +60,7 @@
  flooded me with patches, many thanks to him:
- - Fix DBID width in gnupod_search.pl output
- - Added --bitrate switch to gnupod_search.pl
+ - Fix DBID width in gnupod_search output
+ - Added --bitrate switch to gnupod_search
 -- Added --podcast-files-limit switch to gnupod_addsong.pl
 +- Added --podcast-files-limit switch to gnupod_addsong
  - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
@@ -1488,7 +2051,7 @@
 +- gnupod_addsong can now fetch podcast-rss feeds!
 +  Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
  
- - Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
+ - Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes
  
 @@ -282,8 +282,8 @@
  
@@ -1561,8 +2124,8 @@
  - added tools/m4a-info.pl: Use this tool to read Title/Artist tags
    from .m4a files (not installed by 'make install')
 @@ -425,7 +425,7 @@
- - You can modify the output of gnupod_search.pl using --view
-   (See 'gnupod_search.pl --help')
+ - You can modify the output of gnupod_search using --view
+   (See 'gnupod_search --help')
  
 -- gnupod_addsong.pl checks for wrong extensions
 +- gnupod_addsong checks for wrong extensions
@@ -1579,7 +2142,7 @@
    I don't know if it works with DRM files (.m4p?)
    I don't have any DRM files and i'm not interested
 @@ -476,7 +476,7 @@
-   mktunes.pl will drop old (= now invalid) ratings,
+   mktunes will drop old (= now invalid) ratings,
    no autoconvert... sorry.. but does anyone care?
  
 -- gnupod_addsong.pl understands ID3v2.2 tags
@@ -1620,14 +2183,14 @@
    Use an UNICODE Texteditor to edit the GNUtunesDB..
    (Like 'yudit' or the gnome2 texteditor)
    Your old latin1 GNUtunesDB will get converted to an
--  UTF8 version after running tunes2pod/gnupod_addsong.pl or
-+  UTF8 version after running tunes2pod/gnupod_addsong or
+-  UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or
++  UTF8 version after running tunes2pod.pl/gnupod_addsong or
    gnupod_delete.pl
  
    UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
 @@ -700,7 +700,7 @@
    in the GNUtunesDB - file
- - mktunes.pl no longer accepts <playlist..> when </file> was
+ - mktunes no longer accepts <playlist..> when </file> was
    not found.
 -- gnupod_addsong.pl handles long filenames now better
 +- gnupod_addsong handles long filenames now better
@@ -1651,8 +2214,116 @@
   (note the -g switch (no need to press ENTER) and '-')
   (Many thanks to Scott Savarese)
  
---- gnupod-0.99.8/README.about_m4a	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/README.about_m4a.new	2020-03-06 09:49:41.026683539 -1200
+--- gnupod-0.99.8/FAQ	2021-04-09 18:13:08.436980103 +1400
++++ gnupod-0.99.8/FAQ.new	2021-04-09 18:13:08.500980103 +1400
+@@ -59,13 +59,13 @@
+  
+  1 Mount the iPod (eg. /mnt/ipod)
+  2 run gnupod_INIT -m /mnt/ipod
+- 3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
++ 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3
+  4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
+  5 umount the iPod and enjoy!
+ 
+  If you add more songs, repeat step 1-5 (without step 2!) :
+  1 Mount the iPod
+- 2 use gnupod_addsong.pl
++ 2 use gnupod_addsong
+  3 build the database with mktunes
+  4 umount
+ 
+@@ -117,7 +117,7 @@
+  - Apple AAC/ALAC files (.m4a)
+  - PCM (.wav)
+ 
+-gnupod_addsong.pl can read this 3 formats.
++gnupod_addsong can read this 3 formats.
+ 
+ GNUpod does (currently) *NOT* support:
+ 
+@@ -125,8 +125,8 @@
+  - Apple MusicStore files (.m4p - DRM AAC) but it does support .m4a
+ 
+ GnuPod >= 0.96 can convert FLAC and OGG files 'on the fly'.
+-You'll have to call gnupod_addsong.pl with the
+---decode switch. see 'man gnupod_addsong.pl' for more details
++You'll have to call gnupod_addsong with the
++--decode switch. see 'man gnupod_addsong' for more details
+ (Or read the complete docs: 'info gnupod')
+ 
+ DRM-Support isn't planned.
+@@ -137,9 +137,9 @@
+ 7. How can i add files recursive?
+ ---------------------------------
+ 
+-gnupod_addsong.pl can read from stdin :)
++gnupod_addsong can read from stdin :)
+ 
+-$ find blabla/ | gnupod_addsong.pl -
++$ find blabla/ | gnupod_addsong -
+ 
+ (note the '-')
+ 
+@@ -147,7 +147,7 @@
+ 8. How to get parseable output from gnupod_search
+ ----------------------------------------------------
+ 
+-gnupod_addsong.pl knows the '--view' switch.
++gnupod_addsong knows the '--view' switch.
+ 
+ Example: 
+ gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
+--- gnupod-0.99.8/src/gnupod_check.pl	2021-04-09 18:13:08.452980103 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new	2021-04-09 18:13:08.504980103 +1400
+@@ -85,7 +85,7 @@
+ 		if($TRACKER{ERR} > 25) {
+ 			print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
+ 			print "    '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n";
+-			print "    'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n";
++			print "    'gnupod_addsong --restore'. This would wipe all your Playlists\n";
+ 			print "    but would cure your iPod for sure.\n";
+ 		}
+   }
+--- gnupod-0.99.8/src/gnupod_addsong.pl	2021-04-09 18:13:08.460980103 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2021-04-09 18:13:08.508980103 +1400
+@@ -37,7 +37,7 @@
+ use constant MACTIME => GNUpod::FooBar::MACTIME;
+ use vars qw(%opts %dupdb_normal %dupdb_lazy %dupdb_podcast $int_count %podcast_infos %podcast_channel_infos %per_file_info);
+ 
+-print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n";
+ 
+ $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop
+ 
+@@ -713,7 +713,7 @@
+ #Sighandler
+ sub handle_int {
+  if($int_count) {
+-  warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n";
++  warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n";
+   $int_count--;
+  }
+  else {
+@@ -728,7 +728,7 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ...
++Usage: gnupod_addsong [-h] [-m directory] File1 File2 ...
+ 
+    -h, --help                       display this help and exit
+        --version                    output version information and exit
+@@ -775,7 +775,7 @@
+ 
+ sub version {
+ die << "EOF";
+-gnupod_addsong.pl (gnupod) ###__VERSION__###
++gnupod_addsong (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2008
+ 
+ This is free software; see the source for copying conditions.  There is NO
+--- gnupod-0.99.8/README.about_m4a	2021-04-09 18:13:08.268980103 +1400
++++ gnupod-0.99.8/README.about_m4a.new	2021-04-09 18:13:08.512980103 +1400
 @@ -27,9 +27,9 @@
    
    Example: faac -w --title mytitle file.wav
@@ -1662,11 +2333,33 @@
  
 -# gnupod_addsong.pl file.m4a
 +# gnupod_addsong file.m4a
- # mktunes.pl
+ # mktunes
  
  :)
---- gnupod-0.99.8/doc/gnupod.info	2020-03-06 09:49:40.714691636 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:41.034683331 -1200
+--- gnupod-0.99.8/BUGS	2021-04-09 18:13:08.272980103 +1400
++++ gnupod-0.99.8/BUGS.new	2021-04-09 18:13:08.516980103 +1400
+@@ -3,7 +3,7 @@
+ * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (<file id="...)
+ * Smartplaylist support isn't tested very well
+ * GNUpod doen't like audible.com files (I'll have to look at this later...)
+-* gnupod_addsong.pl --restore doesn't remove the '\d+_' prefix from
++* gnupod_addsong --restore doesn't remove the '\d+_' prefix from
+   files without tags
+ * mktunes -v 0 doesn't overwrite config value
+ See -> TODO
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.472980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.520980103 +1400
+@@ -30,7 +30,7 @@
+ ----------------------------
+ 
+ gnupod_INIT      INIT a new iPod (create empty Database + Directories)
+-gnupod_addsong.pl   Add files
++gnupod_addsong   Add files
+ gnupod_check     Check for 'zombie' files
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+ gnupod_search    Search ;)
+--- gnupod-0.99.8/doc/gnupod.info	2021-04-09 18:13:08.476980103 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.524980103 +1400
 @@ -469,23 +469,23 @@
  4.3 Add files
  =============
@@ -1724,7 +2417,7 @@
     Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
 @@ -637,14 +637,14 @@
  
-    Such a playlist will show up as a Podcast after running mktunes.pl
+    Such a playlist will show up as a Podcast after running mktunes
  
 -   gnupod_addsong.pl can also download podcasts and create such
 +   gnupod_addsong can also download podcasts and create such
@@ -1749,7 +2442,7 @@
 +switch of `gnupod_addsong'. Example:
 +     gnupod_addsong --artwork cover.jpg *.mp3
  
-    Use `gnupod_search.pl' to change/add artwork for existing files.
+    Use `gnupod_search' to change/add artwork for existing files.
  Example:
 @@ -730,12 +730,12 @@
  
@@ -1770,14 +2463,14 @@
 @@ -845,7 +845,7 @@
  and iTunes)
  
-    Only mktunes.pl and tunes2pod have to worry about the iTunesDB
+    Only mktunes and tunes2pod.pl have to worry about the iTunesDB
 -format: all other tools (gnupod_addsong.pl for example) only have to
 +format: all other tools (gnupod_addsong for example) only have to
  deal with the XML file called GNUtunesDB.
  
     It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
---- gnupod-0.99.8/doc/gnupod.html	2020-03-06 09:49:40.722691428 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:41.066682501 -1200
+--- gnupod-0.99.8/doc/gnupod.html	2021-04-09 18:13:08.480980103 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.528980103 +1400
 @@ -661,26 +661,26 @@
  <!--docid::SEC11::-->
  <P>
@@ -1838,7 +2531,7 @@
  </P><P>
  
 @@ -914,14 +914,14 @@
- Such a playlist will show up as a Podcast after running mktunes.pl
+ Such a playlist will show up as a Podcast after running mktunes
  </P><P>
  
 -gnupod_addsong.pl can also download podcasts and create such playlists itself:
@@ -1865,7 +2558,7 @@
 +<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_addsong --artwork cover.jpg *.mp3
  </pre></td></tr></table></P><P>
  
- Use <CODE>gnupod_search.pl</CODE> to change/add artwork for existing files. Example:
+ Use <CODE>gnupod_search</CODE> to change/add artwork for existing files. Example:
 @@ -1047,14 +1047,14 @@
  </P><P>
  
@@ -1887,14 +2580,14 @@
 @@ -1218,7 +1218,7 @@
  </P><P>
  
- Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
+ Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
 -(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
 +(gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
  </P><P>
  
  It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
---- gnupod-0.99.8/doc/gnupod.texi	2020-03-06 09:49:40.746690806 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:41.074682293 -1200
+--- gnupod-0.99.8/doc/gnupod.texi	2021-04-09 18:13:08.488980103 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.532980103 +1400
 @@ -486,39 +486,39 @@
  @node Add files
  @section Add files
@@ -1972,7 +2665,7 @@
  podcast playlists you just need to set the podcast flag to '1':
 @@ -671,14 +671,14 @@
  
- Such a playlist will show up as a Podcast after running mktunes.pl
+ Such a playlist will show up as a Podcast after running mktunes
  
 -gnupod_addsong.pl can also download podcasts and create such playlists itself:
 +gnupod_addsong can also download podcasts and create such playlists itself:
@@ -2021,14 +2714,14 @@
 @@ -870,7 +870,7 @@
  iPod and iTunes)
  
- Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
+ Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
 -(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
 +(gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
  
  It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
---- gnupod-0.99.8/doc/gnupodrc.example	2020-03-06 09:49:40.754690598 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new	2020-03-06 09:49:41.082682085 -1200
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
+--- gnupod-0.99.8/doc/gnupodrc.example	2021-04-09 18:13:08.368980103 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new	2021-04-09 18:13:08.536980103 +1400
 @@ -58,7 +58,7 @@
  # gnupod_search.match-once = 1
  
@@ -2038,903 +2731,572 @@
  
  ## Disable ID3V2 Tag reading
  # gnupod_addsong.disable-v2 = 1
---- gnupod-0.99.8/BUGS	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/BUGS.new	2020-03-06 09:49:41.098681671 -1200
-@@ -3,7 +3,7 @@
- * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (<file id="...)
- * Smartplaylist support isn't tested very well
- * GNUpod doen't like audible.com files (I'll have to look at this later...)
--* gnupod_addsong.pl --restore doesn't remove the '\d+_' prefix from
-+* gnupod_addsong --restore doesn't remove the '\d+_' prefix from
-   files without tags
- * mktunes.pl -v 0 doesn't overwrite config value
- See -> TODO
---- gnupod-0.99.8/README	2020-03-06 09:49:40.766690287 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:41.106681462 -1200
-@@ -30,7 +30,7 @@
- ----------------------------
- 
- gnupod_INIT      INIT a new iPod (create empty Database + Directories)
--gnupod_addsong.pl   Add files
-+gnupod_addsong   Add files
- gnupod_check     Check for 'zombie' files
- gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
- gnupod_search.pl    Search ;)
---- gnupod-0.99.8/FAQ	2020-03-06 09:49:40.774690079 -1200
-+++ gnupod-0.99.8/FAQ.new	2020-03-06 09:49:41.114681255 -1200
-@@ -59,13 +59,13 @@
-  
-  1 Mount the iPod (eg. /mnt/ipod)
-  2 run gnupod_INIT -m /mnt/ipod
-- 3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
-+ 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3
-  4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
-  5 umount the iPod and enjoy!
- 
-  If you add more songs, repeat step 1-5 (without step 2!) :
-  1 Mount the iPod
-- 2 use gnupod_addsong.pl
-+ 2 use gnupod_addsong
-  3 build the database with mktunes.pl
-  4 umount
- 
-@@ -117,7 +117,7 @@
-  - Apple AAC/ALAC files (.m4a)
-  - PCM (.wav)
- 
--gnupod_addsong.pl can read this 3 formats.
-+gnupod_addsong can read this 3 formats.
- 
- GNUpod does (currently) *NOT* support:
- 
-@@ -125,8 +125,8 @@
-  - Apple MusicStore files (.m4p - DRM AAC) but it does support .m4a
- 
- GnuPod >= 0.96 can convert FLAC and OGG files 'on the fly'.
--You'll have to call gnupod_addsong.pl with the
----decode switch. see 'man gnupod_addsong.pl' for more details
-+You'll have to call gnupod_addsong with the
-+--decode switch. see 'man gnupod_addsong' for more details
- (Or read the complete docs: 'info gnupod')
- 
- DRM-Support isn't planned.
-@@ -137,9 +137,9 @@
- 7. How can i add files recursive?
- ---------------------------------
- 
--gnupod_addsong.pl can read from stdin :)
-+gnupod_addsong can read from stdin :)
- 
--$ find blabla/ | gnupod_addsong.pl -
-+$ find blabla/ | gnupod_addsong -
- 
- (note the '-')
- 
-@@ -147,7 +147,7 @@
- 8. How to get parseable output from gnupod_search.pl
- ----------------------------------------------------
- 
--gnupod_addsong.pl knows the '--view' switch.
-+gnupod_addsong knows the '--view' switch.
- 
- Example: 
- gnupod_search.pl --view=i -l "Cure" 2>/dev/null | tail +4
---- gnupod-0.99.8/src/gnupod_check.pl	2020-03-06 09:49:40.594694751 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new	2020-03-06 09:49:41.122681047 -1200
-@@ -85,7 +85,7 @@
- 		if($TRACKER{ERR} > 25) {
- 			print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
- 			print "    '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n";
--			print "    'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n";
-+			print "    'gnupod_addsong --restore'. This would wipe all your Playlists\n";
- 			print "    but would cure your iPod for sure.\n";
- 		}
-   }
---- gnupod-0.99.8/src/gnupod_addsong.pl	2020-03-06 09:49:40.650693297 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2020-03-06 09:49:41.138680632 -1200
-@@ -37,7 +37,7 @@
- use constant MACTIME => GNUpod::FooBar::MACTIME;
- use vars qw(%opts %dupdb_normal %dupdb_lazy %dupdb_podcast $int_count %podcast_infos %podcast_channel_infos %per_file_info);
+Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm	2021-04-09 18:13:08.420980103 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2021-04-09 18:13:08.584980103 +1400
+@@ -51,7 +51,7 @@
+ # done!
+ #
  
--print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n";
+-my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'},
++my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
+                   'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
+                   'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
+                   'MAC ' => { encoder=>'gnupod_convert_APE.pl',  ftyp=>'APE' },
+Created gnupod-0.99.8/man/gnupod_convert_OGG.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm	2021-04-09 18:13:08.584980103 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2021-04-09 18:13:08.628980103 +1400
+@@ -53,7 +53,7 @@
  
- $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop
+ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
+                   'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
+-                  'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
++                  'OggS' => { encoder=>'gnupod_convert_OGG',  ftyp=>'OGG' },
+                   'MAC ' => { encoder=>'gnupod_convert_APE.pl',  ftyp=>'APE' },
+                   'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
  
-@@ -713,7 +713,7 @@
- #Sighandler
- sub handle_int {
-  if($int_count) {
--  warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n";
-+  warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n";
-   $int_count--;
+--- gnupod-0.99.8/src/gnupod_convert_OGG.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_convert_OGG.pl.new	2021-04-09 18:13:08.632980103 +1400
+@@ -48,8 +48,8 @@
   }
-  else {
-@@ -728,7 +728,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ...
-+Usage: gnupod_addsong [-h] [-m directory] File1 File2 ...
- 
-    -h, --help                       display this help and exit
-        --version                    output version information and exit
-@@ -775,7 +775,7 @@
- 
- sub version {
- die << "EOF";
--gnupod_addsong.pl (gnupod) ###__VERSION__###
-+gnupod_addsong (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
- 
- This is free software; see the source for copying conditions.  There is NO
-Patched gnupod-0.99.8/man/gnupod_otgsync.pl.1.gz
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:41.018683747 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:41.158680113 -1200
-@@ -75,7 +75,7 @@
-   Fixing xescaped to always do byte matching and added some debug 
-   output of dropped illegal characters.
- - FileMagic.pm: Remove trailing zeros from MP3 tags that come in utf16 or utf8.
--- gnupod_otgsync.pl: Marking files as played even when only the 
-+- gnupod_otgsync: Marking files as played even when only the 
-   skipcount or bookmark is > 0.
- - gnupod_addsong: Added other sources for artist tag data from podcasts.
-   Added "--podcast-artwork" option to download and add artwork to podcasts.
-@@ -510,7 +510,7 @@
- QTfile.pm
-  * A dirty QuickTime parser
- 
--gnupod_otgsync.pl
-+gnupod_otgsync
-  * A new tool, don't use it yourself :)
-    It's only used internal.
- 
---- gnupod-0.99.8/tools/otgtest.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/otgtest.pl.new	2020-03-06 09:49:41.166679906 -1200
-@@ -15,7 +15,7 @@
- ####################################################
- # Worker
- sub go {
-- #Disable auto-run of tunes2pod or gnupod_otgsync.pl
-+ #Disable auto-run of tunes2pod or gnupod_otgsync
-  $opts{_no_sync} = 1;
-  my $con = GNUpod::FooBar::connect(\%opts);
-  usage($con->{status}."\n") if $con->{status};
---- gnupod-0.99.8/README	2020-03-06 09:49:41.106681462 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:41.174679698 -1200
-@@ -32,7 +32,7 @@
- gnupod_INIT      INIT a new iPod (create empty Database + Directories)
- gnupod_addsong   Add files
- gnupod_check     Check for 'zombie' files
--gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
-+gnupod_otgsync   Handles On-The-Go Sync (not for humans)
- gnupod_search.pl    Search ;)
- mktunes.pl          Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
---- gnupod-0.99.8/src/ext/FooBar.pm	2020-03-06 09:49:40.842688314 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new	2020-03-06 09:49:41.182679490 -1200
-@@ -164,11 +164,11 @@
- }
- 
- ######################################################################
--# Call gnupod_otgsync.pl
-+# Call gnupod_otgsync
- sub StartOnTheGoSync {
- 	my($con) = @_;
- 	
--	my $XBIN = "$con->{bindir}/gnupod_otgsync.pl";
-+	my $XBIN = "$con->{bindir}/gnupod_otgsync";
- 	
- 	if(-x $XBIN) {
- 		{
---- gnupod-0.99.8/src/gnupod_otgsync.pl	2020-03-06 09:49:40.850688107 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2020-03-06 09:49:41.190679282 -1200
-@@ -63,7 +63,7 @@
- 	usage($con->{status}."\n") if $con->{status};
- 	
- 	if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
--		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
-+		die "gnupod_otgsync: Bug detected! You need to run tunes2pod -> Sync broken!\n";
- 	}
- 	
- 	##Check if GNUtunesDB <-> iTunesDB is really in-sync
-Patched gnupod-0.99.8/man/mktunes.pl.1.gz
---- gnupod-0.99.8/README.developer	2020-03-06 09:49:40.698692052 -1200
-+++ gnupod-0.99.8/README.developer.new	2020-03-06 09:49:41.210678764 -1200
-@@ -6,9 +6,9 @@
- Minimal testing:
- > gnupod_INIT /mnt/empty
- > gnupod_addsong
--> mktunes.pl
-+> mktunes
- > tunes2pod --force
--> mktunes.pl
-+> mktunes
- > check if your ipod can read the result
+  ## 3. = no errors
+  if($@) {
+-   warn "gnupod_convert_OGG.pl: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
+-   warn "gnupod_convert_OGG.pl: Maybe $ogg_pmod is not installed?\n";
++   warn "gnupod_convert_OGG: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
++   warn "gnupod_convert_OGG: Maybe $ogg_pmod is not installed?\n";
+    warn "Error: *$@*\n";
+    exit(1);
+  }
+Patched gnupod-0.99.8/man/tunes2pod.pl.1.gz
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.496980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.644980103 +1400
+@@ -136,7 +136,7 @@
+ Summary
+ -------
  
- Release checklist
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:41.158680113 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:41.218678556 -1200
-@@ -46,7 +46,7 @@
-   NEW: Set addtime to a fixed value when doing autotests.
-   NEW: Added check for "autotest" file at the ipod mountpoint.
-   NEW: The connection hash was expanded by a "autotest" key.
--  NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.pl.
-+  NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
+-- Fixed invalid warning about broken mhip header. (tunes2pod.pl)
++- Fixed invalid warning about broken mhip header. (tunes2pod)
+ - Less stricter Podcast-Playlist parsing
+ - Reduced MP3::Info false-positives: Empty files are
+   no longer detected as .mp3 files
+@@ -202,7 +202,7 @@
  
+ - Workaround for broken files written by 'Anapod'
+   Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc
+-  to enable it. Enabling it slows down tunes2pod.pl
++  to enable it. Enabling it slows down tunes2pod
+   (because it deactivates the fast-skip of the (useless)
+    MasterPlaylist)
  
- *** OLD STUFF ***
-@@ -118,7 +118,7 @@
- -------
- - Added README_FIRMWARE.txt file
- - Added compilation-patch, thanks to Ray Lortie
--- Rewrote mktunes.pl to be faster and more readable :-)
-+- Rewrote mktunes to be faster and more readable :-)
- - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) )
-   
-   Apple attempted to lockout non-iTunes software by implementing an obscure
-@@ -161,8 +161,8 @@
- - Raised video-bitrate for on-the-fly converting
- - Added configuration option 'automktunes'. Setting
-   'automktunes = 1' inside ~/.gnupodrc eliminates the need
--  to call mktunes.pl after adding/deleting/renaming songs because GNUpod
--  will call mktunes.pl itself.
-+  to call mktunes after adding/deleting/renaming songs because GNUpod
-+  will call mktunes itself.
- - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect
-   written mhip size. Playlist parsing has also been rewritten and cleaned up.
- - Bugfix: Do not detect PCM files as movies when using --decode
 @@ -222,7 +222,7 @@
  - gnupod_addsong can now fetch podcast-rss feeds!
    Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
  
--- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
+-- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes
 +- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes
  
  - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
    Thanks to Chris Abajian for reporting this issue.
-@@ -292,7 +292,7 @@
- - Added support for m4a 'gnre' tags
- 
- - Fixed some iPod-Shuffle issues
--   * mktunes.pl removes the iTunesShuffle leftover
-+   * mktunes removes the iTunesShuffle leftover
+@@ -469,7 +469,7 @@
+   iPods
  
- - Remove TARGET-File if File::Copy() failed for any reason
-    => Better handling of 'disk full' but still not perfect
-@@ -473,7 +473,7 @@
+ - GNUpod checks if the iTunesDB did change and
+-  runs tunes2pod.pl if it has to run it
++  runs tunes2pod if it has to run it
  
  - Changed rating-schema to match SPL-Rating
    -> Rating 5 is now 100 (newrating=oldrating*20)
--  mktunes.pl will drop old (= now invalid) ratings,
-+  mktunes will drop old (= now invalid) ratings,
-   no autoconvert... sorry.. but does anyone care?
+@@ -530,7 +530,7 @@
+ --------
+ iTunesDB.pm and co:
+  * Can read and write Playlist-Elements without child
+-   tunes2pod.pl couldn't read files written by
++   tunes2pod couldn't read files written by
+    (newer) MusicMatch releases.. this should fix the issue :)
+  * Don't parse MasterPlaylists, do a seek()
+    -> Speeds up parsing
+@@ -572,7 +572,7 @@
+ FileMagic.pm
+   * Fixed (?) ID3v2 reading
  
- - gnupod_addsong understands ID3v2.2 tags
-@@ -557,7 +557,7 @@
-         a 'feature' of iTunes)
-   * Added 'eq syntax check', you can use (since 0.90) 
-     'eq="#!#NUMBER#!#' to specify the EQ-Setting per song.
--    mktunes.pl will now check if this syntax is correct.
-+    mktunes will now check if this syntax is correct.
-     (You'll see a warning if it failed)
-   * Fixed get_string() to handle null-size strings correct
-   * Changed some internal things (using hrefs.. etc)
-@@ -576,7 +576,7 @@
+-tunes2pod.pl:
++tunes2pod:
    * Added paranoia checks (stricter parsing)
    * Added SPL-Read code (BETA!)
  
--mktunes.pl
-+mktunes
-   * Added SPL-Write support
-   * regex-matches are sorted by id
+@@ -657,7 +657,7 @@
+   Use an UNICODE Texteditor to edit the GNUtunesDB..
+   (Like 'yudit' or the gnome2 texteditor)
+   Your old latin1 GNUtunesDB will get converted to an
+-  UTF8 version after running tunes2pod.pl/gnupod_addsong or
++  UTF8 version after running tunes2pod/gnupod_addsong or
+   gnupod_delete.pl
  
-@@ -611,13 +611,13 @@
-   * Added '--france' switch (Limit volume to 100 db for
-     1.x Firmware)
+   UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
+@@ -668,8 +668,8 @@
  
--mktunes.pl
-+mktunes
-   * New Playlist-Code.. MUCH faster now
-     (Wow.. again? no.. the code of 0.90 was
-      VERY slow with many files (~3000) and more
-      than ~15 big playlists)
-   * Added '--volume' switch: Adjust the volume on the iPod!
--    Use something like 'mktunes.pl --volume 70' to boost
-+    Use something like 'mktunes --volume 70' to boost
-     the volume by 70% (same as volume="70" in the GNUtunesDB)
  
- XMLhelper.pm
-@@ -671,9 +671,9 @@
- - Rewritten Playlistcode for tunes2pod
- - tunes2pod doesn't kill your empty GNUtunesDB anymore
+ gnuPod 0.28
+-- Rewritten Playlistcode for tunes2pod.pl
+-- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
++- Rewritten Playlistcode for tunes2pod
++- tunes2pod doesn't kill your empty GNUtunesDB anymore
    if it can't find the iTunesDB
--- mktunes.pl uses now binmode(), maybe this helps
-+- mktunes uses now binmode(), maybe this helps
+ - mktunes uses now binmode(), maybe this helps
    RedHat 8 ? .. (and win32 ;) )
--- mktunes.pl is now *much* faster!!
-+- mktunes is now *much* faster!!
- - the GNUtunesDB written by gnupod_delete.pl looks
-   nicer now :) (id= is now always the first element..)
+@@ -735,7 +735,7 @@
+  
+  
+ gnuPod 0.21
+-- Fixed stupid tunes2pod.pl bug with big iTunesDBs
++- Fixed stupid tunes2pod bug with big iTunesDBs
+  (Thanks to Ciamac Moallemi for reporting and providing a patch)
+ - Support for songnum, songs, cdnum, cds and year
  
-@@ -698,7 +698,7 @@
-   written by MusicMatch
- - Playlists are now sorted on the iPod as they are found
-   in the GNUtunesDB - file
--- mktunes.pl no longer accepts <playlist..> when </file> was
-+- mktunes no longer accepts <playlist..> when </file> was
-   not found.
- - gnupod_addsong handles long filenames now better
- - Timestamp should now be set correct
---- gnupod-0.99.8/README.about_m4a	2020-03-06 09:49:41.026683539 -1200
-+++ gnupod-0.99.8/README.about_m4a.new	2020-03-06 09:49:41.226678348 -1200
-@@ -30,6 +30,6 @@
- Now you can add the file using gnupod_addsong
+--- gnupod-0.99.8/FAQ	2021-04-09 18:13:08.500980103 +1400
++++ gnupod-0.99.8/FAQ.new	2021-04-09 18:13:08.648980103 +1400
+@@ -190,7 +190,7 @@
+ But the iTunesDB-format isn't so complicated if you know how to
+ write the specific parts and how you'll have to assemble
+ them.
+-Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes
++Just have a look at iTunesDB.pm and tunes2pod+mktunes
  
- # gnupod_addsong file.m4a
--# mktunes.pl
-+# mktunes
+ ..or feel free to ask me questions about it:
+ <pab at blinkenlights.ch>
+--- gnupod-0.99.8/src/ext/XMLhelper.pm	2021-04-09 18:13:08.444980103 +1400
++++ gnupod-0.99.8/src/ext/XMLhelper.pm.new	2021-04-09 18:13:08.652980103 +1400
+@@ -191,7 +191,7 @@
+ }
  
- :)
---- gnupod-0.99.8/doc/gnupod.info	2020-03-06 09:49:41.034683331 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:41.234678141 -1200
-@@ -338,8 +338,8 @@
+ ##############################################################
+-# Add a playlist to output (Called by eventer or tunes2pod.pl)
++# Add a playlist to output (Called by eventer or tunes2pod)
+ # This thing doesn't create xml-encoded output!
+ sub addpl {
+ 	my($name, $opt) = @_;
+@@ -210,7 +210,7 @@
+ }
  
-    Setup Firewire (or USB) as described in 'Using FireWire with
- GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run `mktunes.pl' to bring the device into a 'clean'
--state. Unmount the iPod after mktunes.pl finishes but do *not* unplug
-+Mount the iPod and run `mktunes' to bring the device into a 'clean'
-+state. Unmount the iPod after mktunes finishes but do *not* unplug
- the iPod. Ready? Ok, we assume your iPod is `/dev/sda':
+ ##############################################################
+-# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl)
++# Add a SmartPlaylist to output (Called by eventer or tunes2pod)
+ # Like addpl(), 'output' isn't xml-encoded
+ sub addspl {
+ 	my($name, $opt) = @_;
+--- gnupod-0.99.8/src/ext/iTunesDB.pm	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/iTunesDB.pm.new	2021-04-09 18:13:08.656980103 +1400
+@@ -1012,7 +1012,7 @@
  
-    First you need to get a new Firmware image.  Checkout the latest
-@@ -545,7 +545,7 @@
-    This example searches all files from 'Alfred Neumann', changes the
- artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
  
--   Don't forget to run mktunes.pl!
-+   Don't forget to run mktunes!
  
-    You could also edit the GNUtunesDB.xml with a text editor :-)
+-### Here are the READ sub's used by tunes2pod.pl
++### Here are the READ sub's used by tunes2pod
  
-@@ -635,7 +635,7 @@
-         <iregex artist="John Doe" />
-       </playlist>
+ ###########################################
+ # Get a INT value
+--- gnupod-0.99.8/src/ext/FooBar.pm	2021-04-09 18:13:08.244980103 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new	2021-04-09 18:13:08.660980103 +1400
+@@ -143,7 +143,7 @@
+ sub StartItunesDBSync {
+ 	my($con) = @_;
+ 	
+-	my $XBIN = "$con->{bindir}/tunes2pod.pl";
++	my $XBIN = "$con->{bindir}/tunes2pod";
+ 	
+ 	if(-x $XBIN) {
+ 		{
+--- gnupod-0.99.8/src/gnupod_INIT.pl	2021-04-09 18:13:08.456980103 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2021-04-09 18:13:08.664980103 +1400
+@@ -115,9 +115,9 @@
  
--   Such a playlist will show up as a Podcast after running mktunes.pl
-+   Such a playlist will show up as a Podcast after running mktunes
+  my $t2pfail = 0;
+  if(-e $con->{itunesdb} && !$opts{'disable-convert'}) {
+- #We have an iTunesDB, call tunes2pod.pl
+-  print "Found *existing* iTunesDB, running tunes2pod.pl\n";
+-  $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
++ #We have an iTunesDB, call tunes2pod
++  print "Found *existing* iTunesDB, running tunes2pod\n";
++  $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
+  }
+  else {
+  #No iTunesDB, run mktunes
+--- gnupod-0.99.8/src/tunes2pod.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/tunes2pod.pl.new	2021-04-09 18:13:08.668980103 +1400
+@@ -36,7 +36,7 @@
+ $| = 1;
  
-    gnupod_addsong can also download podcasts and create such
- playlists itself:
-@@ -679,7 +679,7 @@
-      # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
-      gnupod_search.pl --artwork cover.jpg --album Katamari
  
--   don't forget to run `mktunes.pl' afterwards.
-+   don't forget to run `mktunes' afterwards.
+-print "tunes2pod.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "tunes2pod Version ###__VERSION__### (C) Adrian Ulrich\n";
  
-    Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod
- does not inject the artwork into the id3-header of the file.  If iTunes
-@@ -692,28 +692,28 @@
- 4.10 Unplug the iPod
- ====================
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
  
--Before umounting the iPod, you have to call `mktunes.pl' which will
-+Before umounting the iPod, you have to call `mktunes' which will
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+@@ -58,7 +58,7 @@
+ 	#We disabled all autosyncing (_no_sync set to 1), so we do a test
+ 	#ourself
+ 	if(!$opts{force} && !(GNUpod::FooBar::ItunesDBNeedsSync($con))) {
+-		print "I don't think that you have to run tunes2pod.pl\n";
++		print "I don't think that you have to run tunes2pod\n";
+ 		print "The GNUtunesDB looks up-to-date\n";
+ 		print "\n";
+ 		print "If you think i'm wrong, use '$0 --force'\n";
+@@ -354,7 +354,7 @@
+ 	my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: tunes2pod.pl [-h] [-m directory]
++Usage: tunes2pod [-h] [-m directory]
  
-    Simply run
--     mktunes.pl -m /mnt/ipod
-+     mktunes -m /mnt/ipod
+    -h, --help              display this help and exit
+        --version           output version information and exit
+@@ -367,7 +367,7 @@
  
--   Note: Since GNUpod 0.91, mktunes.pl has a '-volume' option which you
-+   Note: Since GNUpod 0.91, mktunes has a '-volume' option which you
- can use to boost the Volume.
+ sub version {
+ die << "EOF";
+-tunes2pod.pl (gnupod) ###__VERSION__###
++tunes2pod (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2007
  
--     mktunes.pl -m /mnt/ipod --volume 40
-+     mktunes -m /mnt/ipod --volume 40
+ This is free software; see the source for copying conditions.  There is NO
+--- gnupod-0.99.8/src/gnupod_otgsync.pl	2021-04-09 18:13:08.260980103 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2021-04-09 18:13:08.672980103 +1400
+@@ -63,7 +63,7 @@
+ 	usage($con->{status}."\n") if $con->{status};
+ 	
+ 	if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
+-		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n";
++		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
+ 	}
+ 	
+ 	##Check if GNUtunesDB <-> iTunesDB is really in-sync
+--- gnupod-0.99.8/README.developer	2021-04-09 18:13:08.464980103 +1400
++++ gnupod-0.99.8/README.developer.new	2021-04-09 18:13:08.676980103 +1400
+@@ -7,7 +7,7 @@
+ > gnupod_INIT /mnt/empty
+ > gnupod_addsong
+ > mktunes
+-> tunes2pod.pl --force
++> tunes2pod --force
+ > mktunes
+ > check if your ipod can read the result
  
-    This would adjust the volume +40 percent. (You can also use '-100'
- to get a silent iPod ;) )
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.520980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.680980103 +1400
+@@ -35,7 +35,7 @@
+ gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
+ gnupod_search    Search ;)
+ mktunes          Convert the GNUtunesDB.xml to a iTunesDB
+-tunes2pod.pl        Convert the iTunesDB into a GNUtunesDB.xml
++tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
  
--   After `mktunes.pl' is done, you can umount the iPod and remove the
-+   After `mktunes' is done, you can umount the iPod and remove the
- sbp2 module
-      umount /mnt/ipod
-      rmmod sbp2
+ You'll have to use mktunes if you added/deleted/changed something
+ on the iPod.
+--- gnupod-0.99.8/doc/gnupod.info	2021-04-09 18:13:08.524980103 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new	2021-04-09 18:13:08.684980103 +1400
+@@ -437,7 +437,7 @@
+      gnupod_INIT -m /mnt/ipod
  
-    Added songs won't be visible on the iPod if you did not run
--mktunes.pl before umounting the iPod.  (If you forgot to run
--`mktunes.pl' before unpluging/umounting, simply mount the iPod again
-+mktunes before umounting the iPod.  (If you forgot to run
-+`mktunes' before unpluging/umounting, simply mount the iPod again
- and run it)
+    gnupod_INIT will create the default directory tree and creates an
+-empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to
++empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to
+ convert the iTunesDB to an GNUtunesDB)
  
- 
-@@ -803,7 +803,7 @@
- should be autodetected on GNU/Linux (via `/proc/bus/usb/devices') and
- Solaris (via `prtconf -v').  If GNUpod somehow fails to find the
- correct serial number of your iPod you'll have to specify the correct
--value using the `--fwguid' switch of `mktunes.pl'.
-+value using the `--fwguid' switch of `mktunes'.
+    Use
+@@ -752,17 +752,17 @@
+    If you want to use an iPod with GNUpod and used something other than
+ GNUpod (maybe iTunes)  to perform the last update (adding songs,
+ editing playists.. doing something..), you'll have to  use
+-`tunes2pod.pl' to update the (outdated) GNUtunesDB.
++`tunes2pod' to update the (outdated) GNUtunesDB.
  
- 
- File: gnupod.info,  Node: Problems,  Next: GNU Free Documentation License,  Prev: Using GNUpod,  Up: Top
-@@ -840,17 +840,17 @@
+    Mount the iPod and run
+-     tunes2pod.pl -m /mnt/ipod
++     tunes2pod -m /mnt/ipod
+ 
+    The iPod is now ready again for GNUpod.
+ 
+    You have to do this because GNUpod stores its information in the
+ GNUtunesDB, but other programs access the iTunesDB directly. After you
+ did something with eg. iTunes, the GNUtunesDB would be 'outdated' and
+-you would lose any changes you made with iTunes. Running `tunes2pod.pl'
++you would lose any changes you made with iTunes. Running `tunes2pod'
+ will write a new GNUtunesDB which reflects the content of the current
+ iTunesDB.
+ 
+@@ -778,7 +778,7 @@
+       <add album="foo" />
+      </playlist>
+ 
+-   ..would look like this after using tunes2pod.pl
++   ..would look like this after using tunes2pod
+      ...
+      <playist name="extended">
+       <add id="1" />
+@@ -839,12 +839,12 @@
+ information like the iTunesDB, but it's a simple XML file: easy to
  understand by humans and easy to edit by hand.
  
-    Everytime you run `tunes2pod', the iTunesDB will get parsed and
--converted into an XML File (the GNUtunesDB).  `mktunes.pl' does the
-+converted into an XML File (the GNUtunesDB).  `mktunes' does the
+-   Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and
++   Everytime you run `tunes2pod', the iTunesDB will get parsed and
+ converted into an XML File (the GNUtunesDB).  `mktunes' does the
  opposite: it parses the XML file and creates an iTunesDB (for the iPod
  and iTunes)
  
--   Only mktunes.pl and tunes2pod have to worry about the iTunesDB
+-   Only mktunes and tunes2pod.pl have to worry about the iTunesDB
 +   Only mktunes and tunes2pod have to worry about the iTunesDB
  format: all other tools (gnupod_addsong for example) only have to
  deal with the XML file called GNUtunesDB.
  
-    It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
- everytime you change the GNUtunesDB (by hand or using
--gnupod_something.pl) you'll have to run `mktunes.pl'.
-+gnupod_something.pl) you'll have to run `mktunes'.
+@@ -853,7 +853,7 @@
+ gnupod_something.pl) you'll have to run `mktunes'.
  
     If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
- `tunes2pod' *before* using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupod.html	2020-03-06 09:49:41.066682501 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:41.258677518 -1200
-@@ -475,7 +475,7 @@
- </P><P>
- 
- Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run <CODE>mktunes.pl</CODE> to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes 
-+Mount the iPod and run <CODE>mktunes</CODE> to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes 
- but do *not* unplug the iPod. Ready? Ok, we assume your iPod is <CODE>/dev/sda</CODE>:
- </P><P>
- 
-@@ -784,7 +784,7 @@
- sets the rating to 5 Stars (5*20=100)
- </P><P>
- 
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
- </P><P>
- 
- You could also edit the GNUtunesDB.xml with a text editor :-)
-@@ -911,7 +911,7 @@
-  &#60;/playlist&#62;
- </pre></td></tr></table></P><P>
- 
--Such a playlist will show up as a Podcast after running mktunes.pl
-+Such a playlist will show up as a Podcast after running mktunes
- </P><P>
+-`tunes2pod.pl' *before* using any other GNUpod commands.
++`tunes2pod' *before* using any other GNUpod commands.
  
- gnupod_addsong can also download podcasts and create such playlists itself:
-@@ -967,7 +967,7 @@
- gnupod_search.pl --artwork cover.jpg --album Katamari
+ 
+ File: gnupod.info,  Node: Get rid of '-m',  Next: Known bugs and limitations,  Prev: GNUtunesDB,  Up: Problems
+--- gnupod-0.99.8/doc/gnupod.html	2021-04-09 18:13:08.528980103 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new	2021-04-09 18:13:08.688980103 +1400
+@@ -600,7 +600,7 @@
  </pre></td></tr></table></P><P>
  
--don't forget to run <CODE>mktunes.pl</CODE> afterwards.
-+don't forget to run <CODE>mktunes</CODE> afterwards.
+ gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
+-(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
++(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
  </P><P>
  
- Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
-@@ -992,32 +992,32 @@
- <!--docid::SEC18::-->
- <P>
+ Use
+@@ -1084,11 +1084,11 @@
  
--Before umounting the iPod, you have to call <CODE>mktunes.pl</CODE> which will 
-+Before umounting the iPod, you have to call <CODE>mktunes</CODE> which will 
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
+  to perform the last update (adding songs, editing playists.. doing something..), you'll have to
+- use <CODE>tunes2pod.pl</CODE> to update the (outdated) GNUtunesDB.
++ use <CODE>tunes2pod</CODE> to update the (outdated) GNUtunesDB.
  </P><P>
  
- Simply run
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes.pl -m /mnt/ipod
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes -m /mnt/ipod
+ Mount the iPod and run 
+-<TABLE><tr><td>&nbsp;</td><td class=example><pre>tunes2pod.pl -m /mnt/ipod
++<TABLE><tr><td>&nbsp;</td><td class=example><pre>tunes2pod -m /mnt/ipod
  </pre></td></tr></table></P><P>
  
--Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to 
-+Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to 
- boost the Volume.
- </P><P>
- 
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes.pl -m /mnt/ipod --volume 40
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>mktunes -m /mnt/ipod --volume 40
- </pre></td></tr></table></P><P>
+ The iPod is now ready again for GNUpod.
+@@ -1096,7 +1096,7 @@
  
- This would adjust the volume +40 percent. (You can also use '-100' to get 
- a silent iPod ;) )
+ You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the 
+ iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would 
+-lose any changes you made with iTunes. Running <CODE>tunes2pod.pl</CODE> will write a new GNUtunesDB which
++lose any changes you made with iTunes. Running <CODE>tunes2pod</CODE> will write a new GNUtunesDB which
+ reflects the content of the current iTunesDB.
  </P><P>
  
--After <CODE>mktunes.pl</CODE> is done, you can umount the iPod and remove the sbp2 module
-+After <CODE>mktunes</CODE> is done, you can umount the iPod and remove the sbp2 module
- <TABLE><tr><td>&nbsp;</td><td class=example><pre>umount /mnt/ipod
- rmmod sbp2
+@@ -1113,7 +1113,7 @@
+ &#60;/playlist&#62;
  </pre></td></tr></table></P><P>
  
--Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. 
--(If you forgot to run <CODE>mktunes.pl</CODE> before unpluging/umounting, simply mount the iPod again and run it)
-+Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. 
-+(If you forgot to run <CODE>mktunes</CODE> before unpluging/umounting, simply mount the iPod again and run it)
- </P><P>
- 
- <A NAME="Recovering files"></A>
-@@ -1147,7 +1147,7 @@
- non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
- value such as: <CODE>000ba3100310abcf</CODE> and should be autodetected on GNU/Linux (via <CODE>/proc/bus/usb/devices</CODE>) and Solaris (via <CODE>prtconf -v</CODE>).
- If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the <CODE>--fwguid</CODE> switch 
--of <CODE>mktunes.pl</CODE>.
-+of <CODE>mktunes</CODE>.
+-..would look like this after using tunes2pod.pl
++..would look like this after using tunes2pod
+ <TABLE><tr><td>&nbsp;</td><td class=example><pre>...
+ &#60;playist name="extended"&#62;
+  &#60;add id="1" /&#62;
+@@ -1211,13 +1211,13 @@
+ the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
  </P><P>
  
- <A NAME="Problems"></A>
-@@ -1213,16 +1213,16 @@
- 
- Everytime you run <CODE>tunes2pod</CODE>, the iTunesDB will get parsed and converted into an 
+-Everytime you run <CODE>tunes2pod.pl</CODE>, the iTunesDB will get parsed and converted into an 
++Everytime you run <CODE>tunes2pod</CODE>, the iTunesDB will get parsed and converted into an 
  XML File (the GNUtunesDB). 
--<CODE>mktunes.pl</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
-+<CODE>mktunes</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
+ <CODE>mktunes</CODE> does the opposite: it parses the XML file and creates an iTunesDB (for the 
  iPod and iTunes)
  </P><P>
  
--Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
+-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
 +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools 
  (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
  </P><P>
  
- It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
--GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes.pl</CODE>.
-+GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes</CODE>.
+@@ -1225,7 +1225,7 @@
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run <CODE>mktunes</CODE>.
  </P><P>
  
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod</CODE> *before* 
---- gnupod-0.99.8/doc/gnupod.texi	2020-03-06 09:49:41.074682293 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:41.266677310 -1200
-@@ -359,7 +359,7 @@
- Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
- 
- Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes 
-+Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes 
- but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}:
- 
- First you need to get a new Firmware image. 
-@@ -561,7 +561,7 @@
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
- sets the rating to 5 Stars (5*20=100)
- 
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
- 
- You could also edit the GNUtunesDB.xml with a text editor :-)
- 
-@@ -669,7 +669,7 @@
-  </playlist>
- @end example
- 
--Such a playlist will show up as a Podcast after running mktunes.pl
-+Such a playlist will show up as a Podcast after running mktunes
- 
- gnupod_addsong can also download podcasts and create such playlists itself:
- 
-@@ -718,7 +718,7 @@
- gnupod_search.pl --artwork cover.jpg --album Katamari
- @end example
- 
--don't forget to run @code{@w{mktunes.pl}} afterwards.
-+don't forget to run @code{@w{mktunes}} afterwards.
- 
- Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
- If iTunes finds such a file (while scanning / changing tags) the artwork may get dropped.
-@@ -727,32 +727,32 @@
- @node Unplug the iPod
- @section Unplug the iPod
- 
--Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will 
-+Before umounting the iPod, you have to call @code{@w{mktunes}} which will 
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod.pl</CODE> *before* 
++If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run <CODE>tunes2pod</CODE> *before* 
+ using any other GNUpod commands.
+ </P><P>
  
- Simply run
- @example
--mktunes.pl -m /mnt/ipod
-+mktunes -m /mnt/ipod
+--- gnupod-0.99.8/doc/gnupod.texi	2021-04-09 18:13:08.532980103 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new	2021-04-09 18:13:08.692980103 +1400
+@@ -459,7 +459,7 @@
  @end example
  
--Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to 
-+Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to 
- boost the Volume.
+ gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB 
+-(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
++(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
  
+ Use
  @example
--mktunes.pl -m /mnt/ipod --volume 40
-+mktunes -m /mnt/ipod --volume 40
- @end example
+@@ -785,18 +785,18 @@
  
- This would adjust the volume +40 percent. (You can also use '-100' to get 
- a silent iPod ;) )
+ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
+  to perform the last update (adding songs, editing playists.. doing something..), you'll have to
+- use @code{@w{tunes2pod.pl}} to update the (outdated) GNUtunesDB.
++ use @code{@w{tunes2pod}} to update the (outdated) GNUtunesDB.
  
--After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module
-+After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module
+ Mount the iPod and run 
  @example
- umount /mnt/ipod
- rmmod sbp2
+-tunes2pod.pl -m /mnt/ipod
++tunes2pod -m /mnt/ipod
  @end example
  
--Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. 
--(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it)
-+Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. 
-+(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it)
+ The iPod is now ready again for GNUpod.
  
+ You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the 
+ iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would 
+-lose any changes you made with iTunes. Running @code{@w{tunes2pod.pl}} will write a new GNUtunesDB which
++lose any changes you made with iTunes. Running @code{@w{tunes2pod}} will write a new GNUtunesDB which
+ reflects the content of the current iTunesDB.
  
- @node Recovering files
-@@ -832,7 +832,7 @@
- non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
- value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}).
- If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch 
--of @code{mktunes.pl}.
-+of @code{mktunes}.
  
- @c ===========================================================================================
+@@ -813,7 +813,7 @@
+ </playlist>
+ @end example
  
-@@ -866,14 +866,14 @@
+-..would look like this after using tunes2pod.pl
++..would look like this after using tunes2pod
+ @example
+ ...
+ <playist name="extended">
+@@ -864,18 +864,18 @@
+ The GNUtunesDB (@code{@w{iPod_Control/.gnupod/GNUtunesDB}}) holds the same information like 
+ the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
  
- Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an 
+-Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an 
++Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an 
  XML File (the GNUtunesDB). 
--@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
-+@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
+ @code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the 
  iPod and iTunes)
  
--Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools 
+-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools 
 +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools 
  (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
  
  It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the 
--GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
-+GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
  
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before* 
+-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* 
++If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before* 
  using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupodrc.example	2020-03-06 09:49:41.082682085 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new	2020-03-06 09:49:41.274677102 -1200
-@@ -22,9 +22,9 @@
- ## * nano_4g (the late 2008 nano)
- # model = video
- 
--## Let GNUpod call mktunes.pl itself.
-+## Let GNUpod call mktunes itself.
- ## This may cause a slow-down when dealing with
--## large databases on slow CPUs because mktunes.pl
-+## large databases on slow CPUs because mktunes
- ## may take some time to complete
- # automktunes = 1
- 
-@@ -32,7 +32,7 @@
  
- ##### NON GLOBAL OPTIONS ######
  
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Specify the iPods name
- # mktunes.ipod-name = Wurstli
+--- gnupod-0.99.8/doc/gnupodrc.example	2021-04-09 18:13:08.536980103 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new	2021-04-09 18:13:08.696980103 +1400
+@@ -41,7 +41,7 @@
+ ## Uncomment this to skip 'on-the-go' sync
+ # otgsync.nosync = 1
  
-@@ -46,7 +46,7 @@
+-# *** tunes2pod.pl ***
++# *** tunes2pod ***
+ ## Uncomment to set '--force' switch to true (DANGEROUS)
  # tunes2pod.force = 1
  
- 
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Set --volume boost to +10 percent 
- # mktunes.volume = +10
- ## Enforce iPod serial number:
---- gnupod-0.99.8/BUGS	2020-03-06 09:49:41.098681671 -1200
-+++ gnupod-0.99.8/BUGS.new	2020-03-06 09:49:41.282676895 -1200
-@@ -5,5 +5,5 @@
- * GNUpod doen't like audible.com files (I'll have to look at this later...)
- * gnupod_addsong --restore doesn't remove the '\d+_' prefix from
-   files without tags
--* mktunes.pl -v 0 doesn't overwrite config value
-+* mktunes -v 0 doesn't overwrite config value
- See -> TODO
---- gnupod-0.99.8/README	2020-03-06 09:49:41.174679698 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:41.290676688 -1200
-@@ -34,10 +34,10 @@
- gnupod_check     Check for 'zombie' files
- gnupod_otgsync   Handles On-The-Go Sync (not for humans)
- gnupod_search.pl    Search ;)
--mktunes.pl          Convert the GNUtunesDB.xml to a iTunesDB
-+mktunes          Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
- 
--You'll have to use mktunes.pl if you added/deleted/changed something
-+You'll have to use mktunes if you added/deleted/changed something
- on the iPod.
- 
- 
---- gnupod-0.99.8/FAQ	2020-03-06 09:49:41.114681255 -1200
-+++ gnupod-0.99.8/FAQ.new	2020-03-06 09:49:41.298676480 -1200
-@@ -60,13 +60,13 @@
-  1 Mount the iPod (eg. /mnt/ipod)
-  2 run gnupod_INIT -m /mnt/ipod
-  3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3
-- 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
-+ 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
-  5 umount the iPod and enjoy!
- 
-  If you add more songs, repeat step 1-5 (without step 2!) :
-  1 Mount the iPod
-  2 use gnupod_addsong
-- 3 build the database with mktunes.pl
-+ 3 build the database with mktunes
-  4 umount
- 
- Please read the README file and the info page
-@@ -83,7 +83,7 @@
- 
- But there are some GNUpod 'forks'
- 
--- GTKpod     http://gtkpod.sf.net ('Inspired' by mktunes.pl / iTunesDB.pm)
-+- GTKpod     http://gtkpod.sf.net ('Inspired' by mktunes / iTunesDB.pm)
- - Rhythmbox  http://www.rhythmbox.org/ (Uses GTKpod code)
- 
- (<ironic>..and some companies created commercial iPod apps.. and i'm sure
-@@ -166,7 +166,7 @@
- To fix it:
- - Open the GNUtunesDB.xml (/mnt/ipod/iPod_Control/.gnupod/)
- - Search the faulty entries, fix them and save
--- Run mktunes.pl to update the iPod.
-+- Run mktunes to update the iPod.
+Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm	2021-04-09 18:13:08.628980103 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2021-04-09 18:13:08.740980103 +1400
+@@ -54,7 +54,7 @@
+ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
+                   'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
+                   'OggS' => { encoder=>'gnupod_convert_OGG',  ftyp=>'OGG' },
+-                  'MAC ' => { encoder=>'gnupod_convert_APE.pl',  ftyp=>'APE' },
++                  'MAC ' => { encoder=>'gnupod_convert_APE',  ftyp=>'APE' },
+                   'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
  
  
- 10. Why?
-@@ -190,7 +190,7 @@
- But the iTunesDB-format isn't so complicated if you know how to
- write the specific parts and how you'll have to assemble
- them.
--Just have a look at iTunesDB.pm and tunes2pod+mktunes.pl
-+Just have a look at iTunesDB.pm and tunes2pod+mktunes
+Patched gnupod-0.99.8/man/gnupod_otgsync.pl.1.gz
+--- gnupod-0.99.8/CHANGES	2021-04-09 18:13:08.644980103 +1400
++++ gnupod-0.99.8/CHANGES.new	2021-04-09 18:13:08.752980103 +1400
+@@ -75,7 +75,7 @@
+   Fixing xescaped to always do byte matching and added some debug 
+   output of dropped illegal characters.
+ - FileMagic.pm: Remove trailing zeros from MP3 tags that come in utf16 or utf8.
+-- gnupod_otgsync.pl: Marking files as played even when only the 
++- gnupod_otgsync: Marking files as played even when only the 
+   skipcount or bookmark is > 0.
+ - gnupod_addsong: Added other sources for artist tag data from podcasts.
+   Added "--podcast-artwork" option to download and add artwork to podcasts.
+@@ -510,7 +510,7 @@
+ QTfile.pm
+  * A dirty QuickTime parser
  
- ..or feel free to ask me questions about it:
- <pab at blinkenlights.ch>
---- gnupod-0.99.8/src/gnupod_INIT.pl	2020-03-06 09:49:40.782689872 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new	2020-03-06 09:49:41.306676272 -1200
-@@ -120,9 +120,9 @@
-   $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
-  }
-  else {
-- #No iTunesDB, run mktunes.pl
--  print "No iTunesDB found, running mktunes.pl\n";
--  my @mktunescmd = ("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}");
-+ #No iTunesDB, run mktunes
-+  print "No iTunesDB found, running mktunes\n";
-+  my @mktunescmd = ("$con->{bindir}/mktunes", "-m" ,"$opts{mount}");
-   if ($opts{'fwguid'}) { push @mktunescmd, "-g", "$opts{fwguid}"; } 
-   $t2pfail = system(@mktunescmd);
-  }
-@@ -150,12 +150,12 @@
-        --version           output version information and exit
-    -m, --mount=directory   iPod mountpoint, default is \$IPOD_MOUNTPOINT
-    -d, --disable-convert   Don't try to convert an existing iTunesDB
--   -g, --fwguid=HEXVAL     FirewireGuid / Serial of connected iPod (passed to mktunes.pl)
-+   -g, --fwguid=HEXVAL     FirewireGuid / Serial of connected iPod (passed to mktunes)
-    -f, --france            Limit volume to 100dB (For French-Law/People)
-                            Maximal-volume without this is ~104dB (VERY LOUD)
-                            *WARNING* This works only for iPods running
-                            Firmware 1.x (1st & 2nd generation)
--                           You can also use mktunes.pl '--volume PERCENT'
-+                           You can also use mktunes '--volume PERCENT'
-                            to adjust the volume (Works with Firmware 1.x AND 2.x)
-        --noask             Do not wait for any user input
+-gnupod_otgsync.pl
++gnupod_otgsync
+  * A new tool, don't use it yourself :)
+    It's only used internal.
  
---- gnupod-0.99.8/src/ext/FooBar.pm	2020-03-06 09:49:41.182679490 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new	2020-03-06 09:49:41.314676064 -1200
-@@ -119,10 +119,10 @@
+--- gnupod-0.99.8/src/ext/FooBar.pm	2021-04-09 18:13:08.660980103 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new	2021-04-09 18:13:08.756980103 +1400
+@@ -164,11 +164,11 @@
  }
  
- #######################################################################
--# Call mktunes.pl
-+# Call mktunes
- sub StartAutoMkTunes {
+ ######################################################################
+-# Call gnupod_otgsync.pl
++# Call gnupod_otgsync
+ sub StartOnTheGoSync {
  	my($con) = @_;
--	my $XBIN = "$con->{bindir}/mktunes.pl";
-+	my $XBIN = "$con->{bindir}/mktunes";
+ 	
+-	my $XBIN = "$con->{bindir}/gnupod_otgsync.pl";
++	my $XBIN = "$con->{bindir}/gnupod_otgsync";
+ 	
  	if(-x $XBIN) {
  		{
- 			local  $ENV{IPOD_MOUNTPOINT} = $con->{mountpoint};
---- gnupod-0.99.8/src/ext/Mktunes.pm	2020-03-06 09:49:40.618694128 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new	2020-03-06 09:49:41.322675857 -1200
-@@ -327,7 +327,7 @@
- 		} 
- 		
- 		unless(GNUpod::XMLhelper::get_splpref($name)->{liveupdate}) {
--			warn "mktunes.pl: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
-+			warn "mktunes: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
- 		}
+--- gnupod-0.99.8/src/gnupod_otgsync.pl	2021-04-09 18:13:08.672980103 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2021-04-09 18:13:08.760980103 +1400
+@@ -63,7 +63,7 @@
+ 	usage($con->{status}."\n") if $con->{status};
  	
- 		if(my $id = $item->{splcont}->{id}) { #We found an old id with disabled liveupdate, add it like a normal playlist:
---- gnupod-0.99.8/src/gnupod_addsong.pl	2020-03-06 09:49:41.138680632 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new	2020-03-06 09:49:41.338675442 -1200
-@@ -206,11 +206,11 @@
- 		#Use fixed addtime for autotests
- 		$fh->{addtime} = int($connection->{autotest} ? 42 : time())+MACTIME;
- 		
--		#Ugly workaround to avoid a warning while running mktunes.pl:
-+		#Ugly workaround to avoid a warning while running mktunes:
- 		#All (?) int-values returned by wtf_is won't go above 0xffffffff
- 		#Thats fine because almost everything inside an mhit can handle this.
- 		#But bpm and srate are limited to 0xffff
--		# -> We fix this silently to avoid ugly warnings while running mktunes.pl
-+		# -> We fix this silently to avoid ugly warnings while running mktunes
- 		$fh->{bpm}   = 0xFFFF if $fh->{bpm}   > 0xFFFF;
- 		$fh->{srate} = 0xFFFF if $fh->{srate} > 0xFFFF;
- 
---- gnupod-0.99.8/src/gnupod_otgsync.pl	2020-03-06 09:49:41.190679282 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new	2020-03-06 09:49:41.346675234 -1200
-@@ -129,9 +129,9 @@
- sub newfile {
- 	my($el) =  @_;
- 
--	#This has to be 'in-sync' with the mktunes.pl method
-+	#This has to be 'in-sync' with the mktunes method
- 	# (GNUtunesDB_id <-> iTunesDB_id)
--	# in mktunes.pl, every <file.. will create a new
-+	# in mktunes, every <file.. will create a new
- 	# id, like here :)
+ 	if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
+-		die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
++		die "gnupod_otgsync: Bug detected! You need to run tunes2pod -> Sync broken!\n";
+ 	}
  	
- 	push(@keeper, int($el->{file}->{id}));
---- gnupod-0.99.8/src/mktunes.pl	2020-03-06 09:49:40.666692882 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new	2020-03-06 09:49:41.354675026 -1200
-@@ -37,7 +37,7 @@
- my %opts    = ();
- 
- 
--print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
-+print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
- 
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s");
-@@ -140,7 +140,7 @@
- 	my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: mktunes.pl [-h] [-m directory] [-v VALUE]
-+Usage: mktunes [-h] [-m directory] [-v VALUE]
- 
-    -h, --help              display this help and exit
-        --version           output version information and exit
-@@ -159,7 +159,7 @@
- # Displays current version
- sub version {
- die << "EOF";
--mktunes.pl (gnupod) ###__VERSION__###
-+mktunes (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2007
- 
- This is free software; see the source for copying conditions.  There is NO
---- gnupod-0.99.8/src/gnupod_search.pl	2020-03-06 09:49:40.674692675 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new	2020-03-06 09:49:41.362674819 -1200
-@@ -264,7 +264,7 @@
-                             u = UnixPath n = Songnum  G = podcastguid R = podcastrss
-                             d = dbid
-        --rename=KEY=VAL    Change tags on found songs. Example: --rename="ARTIST=Foo Bar"
--       --artwork=FILE      Set FILE as Cover for found files, do not forget to run mktunes.pl
-+       --artwork=FILE      Set FILE as Cover for found files, do not forget to run mktunes
- 
- Note: * Argument for title/artist/album/etc has to be UTF8 encoded, *not* latin1!
-       * Use '>3' to search all values above 3, use '<3' to search for values below 3
+ 	##Check if GNUtunesDB <-> iTunesDB is really in-sync
+--- gnupod-0.99.8/tools/otgtest.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/tools/otgtest.pl.new	2021-04-09 18:13:08.764980103 +1400
+@@ -15,7 +15,7 @@
+ ####################################################
+ # Worker
+ sub go {
+- #Disable auto-run of tunes2pod or gnupod_otgsync.pl
++ #Disable auto-run of tunes2pod or gnupod_otgsync
+  $opts{_no_sync} = 1;
+  my $con = GNUpod::FooBar::connect(\%opts);
+  usage($con->{status}."\n") if $con->{status};
+--- gnupod-0.99.8/README	2021-04-09 18:13:08.680980103 +1400
++++ gnupod-0.99.8/README.new	2021-04-09 18:13:08.768980103 +1400
+@@ -32,7 +32,7 @@
+ gnupod_INIT      INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong   Add files
+ gnupod_check     Check for 'zombie' files
+-gnupod_otgsync.pl   Handles On-The-Go Sync (not for humans)
++gnupod_otgsync   Handles On-The-Go Sync (not for humans)
+ gnupod_search    Search ;)
+ mktunes          Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
 Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm	2020-03-06 09:49:40.998684265 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2020-03-06 09:49:41.490671497 -1200
+--- gnupod-0.99.8/src/ext/FileMagic.pm	2021-04-09 18:13:08.740980103 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2021-04-09 18:13:08.816980103 +1400
 @@ -52,7 +52,7 @@
  #
  
  my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
 -                  'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
 +                  'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
-                   'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
+                   'OggS' => { encoder=>'gnupod_convert_OGG',  ftyp=>'OGG' },
                    'MAC ' => { encoder=>'gnupod_convert_APE',  ftyp=>'APE' },
                    'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
---- gnupod-0.99.8/src/gnupod_convert_FLAC.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_convert_FLAC.pl.new	2020-03-06 09:49:41.498671289 -1200
+--- gnupod-0.99.8/src/gnupod_convert_FLAC.pl	2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_convert_FLAC.pl.new	2021-04-09 18:13:08.820980103 +1400
 @@ -46,8 +46,8 @@
  	}
  	## 3. = no errors without Audio::FLAC! :)
@@ -2946,356 +3308,6 @@
  		warn "Error: $@\n";
  		exit(1);
  	}
-Created gnupod-0.99.8/man/gnupod_convert_OGG.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm	2020-03-06 09:49:41.490671497 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new	2020-03-06 09:49:41.594668798 -1200
-@@ -53,7 +53,7 @@
- 
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
-                   'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
--                  'OggS' => { encoder=>'gnupod_convert_OGG.pl',  ftyp=>'OGG' },
-+                  'OggS' => { encoder=>'gnupod_convert_OGG',  ftyp=>'OGG' },
-                   'MAC ' => { encoder=>'gnupod_convert_APE',  ftyp=>'APE' },
-                   'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
- 
---- gnupod-0.99.8/src/gnupod_convert_OGG.pl	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_convert_OGG.pl.new	2020-03-06 09:49:41.606668486 -1200
-@@ -48,8 +48,8 @@
-  }
-  ## 3. = no errors
-  if($@) {
--   warn "gnupod_convert_OGG.pl: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
--   warn "gnupod_convert_OGG.pl: Maybe $ogg_pmod is not installed?\n";
-+   warn "gnupod_convert_OGG: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
-+   warn "gnupod_convert_OGG: Maybe $ogg_pmod is not installed?\n";
-    warn "Error: *$@*\n";
-    exit(1);
-  }
-Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
---- gnupod-0.99.8/CHANGES	2020-03-06 09:49:41.218678556 -1200
-+++ gnupod-0.99.8/CHANGES.new	2020-03-06 09:49:41.638667656 -1200
-@@ -58,8 +58,8 @@
- 
- I was planning to release GNUpod 1.0, but Heinrich Langos
- flooded me with patches, many thanks to him:
--- Fix DBID width in gnupod_search.pl output
--- Added --bitrate switch to gnupod_search.pl
-+- Fix DBID width in gnupod_search output
-+- Added --bitrate switch to gnupod_search
- - Added --podcast-files-limit switch to gnupod_addsong
- - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
- - Added --unique switch to extractArtwork.pl
-@@ -209,7 +209,7 @@
- - QTFile.pm: rseek() now refuses to return more than 1024 kb. Fixes possible out-of-memory problems
-              with broken files.
- 
--- Fixed an obscure gnupod_search.pl bug causing some weird search results.
-+- Fixed an obscure gnupod_search bug causing some weird search results.
- 
- - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
- 
-@@ -344,7 +344,7 @@
- 
- - Rewritten ConverterCore.. shouldn't break anything...
- 
--- gnupod_search.pl can now RENAME/Edit tags.
-+- gnupod_search can now RENAME/Edit tags.
-   use --rename="artist=New artist Name"
- 
- - You can now sort playlists:
-@@ -422,8 +422,8 @@
- - added tools/m4a-info.pl: Use this tool to read Title/Artist tags
-   from .m4a files (not installed by 'make install')
- 
--- You can modify the output of gnupod_search.pl using --view
--  (See 'gnupod_search.pl --help')
-+- You can modify the output of gnupod_search using --view
-+  (See 'gnupod_search --help')
- 
- - gnupod_addsong checks for wrong extensions
-   (like a mp3-file called 'test.wav'). The iPod wouldn't play
-@@ -598,7 +598,7 @@
- I hope i didn't break anything.. but...
- 
- 
--gnupod_search.pl:
-+gnupod_search:
-   * -d doesn't delete all songs anymore.. hups..
-   * Playlist-Cleanup works now.. (another stupid bug.. :-/) 
-   * Added '--title' switch to usage
-@@ -682,7 +682,7 @@
- - Fixed 'creating playlists' sample in documentation.
- - Firmware 1.1.0 can read FAT32, updatet documentation.
- - gnupod_delete.pl doesn't kill regex playlists anymore (ouch)
--- gnupod_search.pl supports -g(enre)
-+- gnupod_search supports -g(enre)
-  (Thanks to Johan Ruttenberg)
- 
- gnuPod 0.26
---- gnupod-0.99.8/doc/gnupod.info	2020-03-06 09:49:41.234678141 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new	2020-03-06 09:49:41.710665787 -1200
-@@ -512,15 +512,15 @@
- 4.4 Search files
- ================
- 
--GNUpod includes a tool called `gnupod_search.pl' that helps you search
-+GNUpod includes a tool called `gnupod_search' that helps you search
- for files.
- 
-    Maybe you would like to search for the artist called 'Schlummiguch'.
- In this case, run
--     gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+     gnupod_search -m /mnt/ipod -a "Schlummiguch"
- 
--   Note: gnupod_search.pl assumes RegExp input.  Please have a look at
--`gnupod_search.pl --help' for more information.
-+   Note: gnupod_search assumes RegExp input.  Please have a look at
-+`gnupod_search --help' for more information.
- 
- 
- File: gnupod.info,  Node: Remove files,  Next: Edit tags,  Prev: Search files,  Up: Using GNUpod
-@@ -528,9 +528,9 @@
- 4.5 Remove files
- ================
- 
--Removing files is done using `gnupod_search.pl -d'.  To Remove all
-+Removing files is done using `gnupod_search -d'.  To Remove all
- files from the artist 'Schlummiguch', run
--     gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+     gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- 
- 
- File: gnupod.info,  Node: Edit tags,  Next: Creating playlists,  Prev: Remove files,  Up: Using GNUpod
-@@ -538,9 +538,9 @@
- 4.6 Edit tags
- =============
- 
--You can use `gnupod_search.pl' to edit tags (like artist, album, etc..)
-+You can use `gnupod_search' to edit tags (like artist, album, etc..)
- 
--     gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+     gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- 
-    This example searches all files from 'Alfred Neumann', changes the
- artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
-@@ -674,10 +674,10 @@
- switch of `gnupod_addsong'. Example:
-      gnupod_addsong --artwork cover.jpg *.mp3
- 
--   Use `gnupod_search.pl' to change/add artwork for existing files.
-+   Use `gnupod_search' to change/add artwork for existing files.
- Example:
-      # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
--     gnupod_search.pl --artwork cover.jpg --album Katamari
-+     gnupod_search --artwork cover.jpg --album Katamari
- 
-    don't forget to run `mktunes' afterwards.
- 
---- gnupod-0.99.8/doc/gnupod.html	2020-03-06 09:49:41.258677518 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new	2020-03-06 09:49:41.734665164 -1200
-@@ -722,15 +722,15 @@
- <!--docid::SEC12::-->
- <P>
- 
--GNUpod includes a tool called <CODE>gnupod_search.pl</CODE> that helps you search for files.
-+GNUpod includes a tool called <CODE>gnupod_search</CODE> that helps you search for files.
- </P><P>
- 
- Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search -m /mnt/ipod -a "Schlummiguch"
- </pre></td></tr></table></P><P>
- 
--Note: gnupod_search.pl assumes RegExp input.
--Please have a look at <CODE>gnupod_search.pl --help</CODE> for more information.
-+Note: gnupod_search assumes RegExp input.
-+Please have a look at <CODE>gnupod_search --help</CODE> for more information.
- </P><P>
- 
- <A NAME="Remove files"></A>
-@@ -751,9 +751,9 @@
- <!--docid::SEC13::-->
- <P>
- 
--Removing files is done using <CODE>gnupod_search.pl -d</CODE>.
-+Removing files is done using <CODE>gnupod_search -d</CODE>.
- To Remove all files from the artist 'Schlummiguch', run
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- </pre></td></tr></table></P><P>
- 
- <A NAME="Edit tags"></A>
-@@ -774,10 +774,10 @@
- <!--docid::SEC14::-->
- <P>
- 
--You can use <CODE>gnupod_search.pl</CODE> to edit tags (like artist, album, etc..)
-+You can use <CODE>gnupod_search</CODE> to edit tags (like artist, album, etc..)
- </P><P>
- 
--<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+<TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- </pre></td></tr></table></P><P>
- 
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
-@@ -962,9 +962,9 @@
- <TABLE><tr><td>&nbsp;</td><td class=example><pre>gnupod_addsong --artwork cover.jpg *.mp3
- </pre></td></tr></table></P><P>
- 
--Use <CODE>gnupod_search.pl</CODE> to change/add artwork for existing files. Example:
-+Use <CODE>gnupod_search</CODE> to change/add artwork for existing files. Example:
- <TABLE><tr><td>&nbsp;</td><td class=example><pre># Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
--gnupod_search.pl --artwork cover.jpg --album Katamari
-+gnupod_search --artwork cover.jpg --album Katamari
- </pre></td></tr></table></P><P>
- 
- don't forget to run <CODE>mktunes</CODE> afterwards.
---- gnupod-0.99.8/doc/gnupod.texi	2020-03-06 09:49:41.266677310 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new	2020-03-06 09:49:41.742664957 -1200
-@@ -529,33 +529,33 @@
- @node Search files
- @section Search files
- 
--GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files.
-+GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files.
- 
- Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
- @example
--gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+gnupod_search -m /mnt/ipod -a "Schlummiguch"
- @end example
- 
--Note: gnupod_search.pl assumes RegExp input.
--Please have a look at @code{@w{gnupod_search.pl --help}} for more information.
-+Note: gnupod_search assumes RegExp input.
-+Please have a look at @code{@w{gnupod_search --help}} for more information.
- 
- @node Remove files
- @section Remove files
- 
--Removing files is done using @code{@w{gnupod_search.pl -d}}.
-+Removing files is done using @code{@w{gnupod_search -d}}.
- To Remove all files from the artist 'Schlummiguch', run
- @example
--gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- @end example
- 
- 
- @node Edit tags
- @section Edit tags
- 
--You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..)
-+You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..)
- 
- @example
--gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- @end example
- 
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
-@@ -712,10 +712,10 @@
- @end example
- 
- 
--Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example:
-+Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example:
- @example
- # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
--gnupod_search.pl --artwork cover.jpg --album Katamari
-+gnupod_search --artwork cover.jpg --album Katamari
- @end example
- 
- don't forget to run @code{@w{mktunes}} afterwards.
---- gnupod-0.99.8/doc/gnupodrc.example	2020-03-06 09:49:41.274677102 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new	2020-03-06 09:49:41.754664645 -1200
-@@ -52,7 +52,7 @@
- ## Enforce iPod serial number:
- # mktunes.fwguid = 000ba3100310abcf
- 
--# *** gnupod_search.pl ***
-+# *** gnupod_search ***
- 
- ## Always match only once
- # gnupod_search.match-once = 1
---- gnupod-0.99.8/README	2020-03-06 09:49:41.290676688 -1200
-+++ gnupod-0.99.8/README.new	2020-03-06 09:49:41.766664334 -1200
-@@ -33,7 +33,7 @@
- gnupod_addsong   Add files
- gnupod_check     Check for 'zombie' files
- gnupod_otgsync   Handles On-The-Go Sync (not for humans)
--gnupod_search.pl    Search ;)
-+gnupod_search    Search ;)
- mktunes          Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod        Convert the iTunesDB into a GNUtunesDB.xml
- 
---- gnupod-0.99.8/FAQ	2020-03-06 09:49:41.298676480 -1200
-+++ gnupod-0.99.8/FAQ.new	2020-03-06 09:49:41.774664126 -1200
-@@ -8,7 +8,7 @@
- 5 : Does GNUpod support feature $foobar ?
- 6 : Can i add File-Format $foobar ?
- 7 : How can i add files recursive?
--8 : How to get parseable output from gnupod_search.pl?
-+8 : How to get parseable output from gnupod_search?
- 9 : Some Artists/Albums, etc. shows up multiple times
-     on the iPod Browser!
- 10 : Why?
-@@ -144,13 +144,13 @@
- (note the '-')
- 
- 
--8. How to get parseable output from gnupod_search.pl
-+8. How to get parseable output from gnupod_search
- ----------------------------------------------------
- 
- gnupod_addsong knows the '--view' switch.
- 
- Example: 
--gnupod_search.pl --view=i -l "Cure" 2>/dev/null | tail +4
-+gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
- 
- (Hmm.. output breaks if On-The-Go data get's synced..)
- FIXME.. maybe we should have an --out option?
---- gnupod-0.99.8/src/gnupod_search.pl	2020-03-06 09:49:41.362674819 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new	2020-03-06 09:49:41.786663815 -1200
-@@ -38,7 +38,7 @@
- 
- 
- 
--print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
- 
- # WARNING: If you add new options wich don't do matching, change newfile()
- #
-@@ -241,7 +241,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_search.pl [-h] [-m directory] File1 File2 ...
-+Usage: gnupod_search [-h] [-m directory] File1 File2 ...
- 
-    -h, --help              display this help and exit
-        --version           output version information and exit
-@@ -279,7 +279,7 @@
- 
- sub version {
- die << "EOF";
--gnupod_search.pl (gnupod) ###__VERSION__###
-+gnupod_search (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
- 
- This is free software; see the source for copying conditions.  There is NO
---- gnupod-0.99.8/AUTHORS	2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/AUTHORS.new	2020-03-06 09:49:41.794663607 -1200
-@@ -10,7 +10,7 @@
-  Contributed to the 'old' GNUpod (< 0.9)
-  - gnupod_list.pl
-  - gnupod_renumber.pl
-- - gnupod_search.pl (Most important tool ;) )
-+ - gnupod_search (Most important tool ;) )
- 
- 
- And also many thanks to the many other people
 quilt --quiltrc debian/quiltrc push -a
 Applying patch 01-new-perl.patch
 patching file gnupod-0.99.8/src/ext/FileMagic.pm
@@ -3369,8 +3381,8 @@
 dh_installdirs -i
 /usr/bin/make -C gnupod-0.99.8 install DESTDIR=/build/gnupod-tools-0.99.8/debian/gnupod-tools
 make[1]: Entering directory '/build/gnupod-tools-0.99.8/gnupod-0.99.8'
-/bin/bash ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin
-/bin/bash ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/share/man/man1
+/bin/sh ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin
+/bin/sh ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/share/man/man1
 /usr/bin/perl tools/gnupod_install.pl INSTALL "/usr/bin/perl" "/usr/bin" "/usr/share/info" "/usr/share/man" "/build/gnupod-tools-0.99.8/debian/gnupod-tools"
 Installing GNUpod 0.99.8 using gnupod_install 0.25
  > src/gnupod_addsong.pl --> /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin/gnupod_addsong.pl
@@ -3443,12 +3455,14 @@
  dpkg-source --after-build .
 dpkg-buildpackage: info: binary-only upload (no source included)
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/33590/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/33590/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/30209 and its subdirectories
-I: Current time: Fri Mar  6 09:49:50 -12 2020
-I: pbuilder-time-stamp: 1583531390
+I: removing directory /srv/workspace/pbuilder/33590 and its subdirectories
+I: Current time: Fri Apr  9 18:13:11 +14 2021
+I: pbuilder-time-stamp: 1617941591