| gnupod_INIT.pl -m /mnt/ipod --france
++ | gnupod_INIT -m /mnt/ipod --france
+ |
- First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
--Then, @code{gnupod_addsong.pl --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
-+Then, @code{gnupod_addsong --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
+--- gnupod-0.99.8/doc/gnupod.info 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:37.526559920 +1400
+@@ -434,14 +434,14 @@
- I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
- (Note: Of course you'll lose your Playlists)
-@@ -870,7 +870,7 @@
- iPod and iTunes)
+ 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
- Only mktunes.pl 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.
+- 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)
- 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 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-21 19:22:15.332290080 -1200
-@@ -58,7 +58,7 @@
- # gnupod_search.match-once = 1
+ 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/README.developer 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.developer.new 2021-07-22 21:32:37.706568875 +1400
+@@ -4,7 +4,7 @@
+ These aren't the droids you're looking for. Move along! :-)
--# *** gnupod_addsong.pl ***
-+# *** gnupod_addsong ***
+ Minimal testing:
+-> gnupod_INIT.pl /mnt/empty
++> gnupod_INIT /mnt/empty
+ > gnupod_addsong
+ > mktunes.pl
+ > tunes2pod.pl --force
+Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
+--- gnupod-0.99.8/README 2021-07-22 21:32:35.402454242 +1400
++++ gnupod-0.99.8/README.new 2021-07-22 21:32:38.090587981 +1400
+@@ -30,7 +30,7 @@
+ ----------------------------
- ## Disable ID3V2 Tag reading
- # gnupod_addsong.disable-v2 = 1
---- gnupod-0.99.8/CHANGES 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:15.360287486 -1200
+ gnupod_INIT INIT a new iPod (create empty Database + Directories)
+-gnupod_addsong.pl Add files
++gnupod_addsong Add files
+ gnupod_check.pl Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search.pl Search ;)
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:35.730470561 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:38.250595942 +1400
@@ -60,7 +60,7 @@
flooded me with patches, many thanks to him:
- Fix DBID width in gnupod_search.pl output
@@ -1160,7 +1114,7 @@
- Added xescaped() patch. GNUpod will now store
@@ -77,7 +77,7 @@
- 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.pl: Added other sources for artist tag data from podcasts.
+- gnupod_addsong: Added other sources for artist tag data from podcasts.
@@ -1179,7 +1133,7 @@
@@ -155,9 +155,9 @@
- Filter out bad chars from '--rename' command.
- Added RVA2 (Normalize) patch by Peter Liljenberg
- - gnupod_INIT.pl: Added --noask option
+ - gnupod_INIT: Added --noask option
-- gnupod_addsong.pl: --playlist can now be used multiple times
-- gnupod_addsong.pl: added --playlist-is-podcast command
-- gnupod_addsong.pl: Added workaround for glibc/linux/perl bug/problem (realloc() error)
@@ -1341,7 +1295,7 @@
+ * Can read from STDIN again (use 'gnupod_addsong -')
(I forgot this feature ;) )
- gnupod_INIT.pl
+ gnupod_INIT
@@ -657,7 +657,7 @@
Use an UNICODE Texteditor to edit the GNUtunesDB..
(Like 'yudit' or the gnome2 texteditor)
@@ -1377,8 +1331,22 @@
(note the -g switch (no need to press ENTER) and '-')
(Many thanks to Scott Savarese)
---- 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 2021-07-21 19:22:15.392284521 -1200
+--- gnupod-0.99.8/README.about_m4a 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2021-07-22 21:32:38.406603703 +1400
+@@ -27,9 +27,9 @@
+
+ Example: faac -w --title mytitle file.wav
+
+-Now you can add the file using gnupod_addsong.pl
++Now you can add the file using gnupod_addsong
+
+-# gnupod_addsong.pl file.m4a
++# gnupod_addsong file.m4a
+ # mktunes.pl
+
+ :)
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2021-07-22 21:32:36.058486881 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-07-22 21:32:38.566611664 +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);
@@ -1415,8 +1383,8 @@
Copyright (C) Adrian Ulrich 2002-2008
This is free software; see the source for copying conditions. There is NO
---- 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 2021-07-21 19:22:15.424281557 -1200
+--- gnupod-0.99.8/src/gnupod_check.pl 2021-07-22 21:32:36.362502006 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-07-22 21:32:38.726619625 +1400
@@ -85,7 +85,7 @@
if($TRACKER{ERR} > 25) {
print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
@@ -1426,264 +1394,800 @@
print " but would cure your iPod for sure.\n";
}
}
---- gnupod-0.99.8/README 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:15.452278963 -1200
-@@ -30,7 +30,7 @@
- ----------------------------
+--- gnupod-0.99.8/BUGS 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/BUGS.new 2021-07-22 21:32:38.886627585 +1400
+@@ -3,7 +3,7 @@
+ * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (/dev/null | tail +4
+--- gnupod-0.99.8/doc/gnupod.texi 2021-07-22 21:32:37.178542605 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-22 21:32:39.214643905 +1400
+@@ -486,39 +486,39 @@
+ @node Add files
+ @section Add files
+
+-To add files, we use the script called @code{@w{gnupod_addsong.pl}}.
++To add files, we use the script called @code{@w{gnupod_addsong}}.
+
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
+
+-If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
++If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
+ @example
+-gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
+ @end example
+
+ You can also use wildcards:
+ @example
+-gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
+ @end example
+
+-It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
++It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
+ (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
+ with the '--duplicate' switch.
+
+-gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
++gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
+
+ It can also convert FLAC and OGG files on-the-fly:
+
+ Using this example, it would convert the two files into MP3 and add them to the iPod.
+
+ @example
+-gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
+ @end example
+
+ (Note: To use all features of --decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
+
+
+-gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
+ feel free to send me an example-file: pab@@blinkenligts.ch
+
+@@ -638,7 +638,7 @@
+ For more examples have a look at @code{@w{doc/gnutunesdb.example}} included in the GNUpod tarball.
+ Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
+
+-You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
++You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
+ named playlist.
+
+ Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
+@@ -651,14 +651,14 @@
+ media type is set correctly. To add a single podcast do the following:
+
+ @example
+-gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcast.mp3
++gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcast.mp3
+ @end example
+ You can add multiple podcasts to the same title as well:
+ @example
+-gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcasts/*
++gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcasts/*
+ @end example
+ This also tells the iPod to skip this file when shuffling files. See
+-gnupod_addsong.pl -h for more options.
++gnupod_addsong -h for more options.
+
+ If you want to change existing playlists to
+ 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
+
+-gnupod_addsong.pl can also download podcasts and create such playlists itself:
++gnupod_addsong can also download podcasts and create such playlists itself:
+
+ @example
+-gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
+ @end example
+
+ Running this command will create a Playlist called 'Heute Morgen' (@code{@w{-p}}) and set @code{@w{podcast="1"}} (@code{@w{--playlist-is-podcast}}).
+-@code{@w{gnupod_addsong.pl}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
++@code{@w{gnupod_addsong}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
+ and add them to the 'Heute Morgen' playlist!
+
+ @node Adding cover artwork
+@@ -706,9 +706,9 @@
+ @end example
+
+
+-To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong.pl}}. Example:
++To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong}}. Example:
+ @example
+-gnupod_addsong.pl --artwork cover.jpg *.mp3
++gnupod_addsong --artwork cover.jpg *.mp3
+ @end example
+
+
+@@ -766,14 +766,14 @@
+
+
+ If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
+-you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong.pl}
++you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
+
+ @example
+-gnupod_addsong.pl --restore -m /mnt/ipod
++gnupod_addsong --restore -m /mnt/ipod
+ @end example
+
+ First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
+-Then, @code{gnupod_addsong.pl --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
++Then, @code{gnupod_addsong --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
+
+ I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
+ (Note: Of course you'll lose your Playlists)
+@@ -870,7 +870,7 @@
+ iPod and iTunes)
+
+ Only mktunes.pl 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 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-22 21:32:39.362651269 +1400
+@@ -58,7 +58,7 @@
+ # gnupod_search.match-once = 1
+
+
+-# *** gnupod_addsong.pl ***
++# *** gnupod_addsong ***
+
+ ## Disable ID3V2 Tag reading
+ # gnupod_addsong.disable-v2 = 1
+--- gnupod-0.99.8/doc/gnupod.html 2021-07-22 21:32:37.354551362 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-22 21:32:39.526659428 +1400
+@@ -661,26 +661,26 @@
+
+
+
+-To add files, we use the script called gnupod_addsong.pl .
++To add files, we use the script called gnupod_addsong .
+
+
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
+
+
+-If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
+- | gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
++ | gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
|
- gnupod_INIT.pl 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)
+ You can also use wildcards:
+- | gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++ | gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
+ |
+
+-It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
++It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
+ (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
+ with the '--duplicate' switch.
- Use
-@@ -1084,11 +1084,11 @@
+-gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
++gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
+
- 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.
-+ use tunes2pod to update the (outdated) GNUtunesDB.
+ It can also convert FLAC and OGG files on-the-fly:
+@@ -689,14 +689,14 @@
+ Using this example, it would convert the two files into MP3 and add them to the iPod.
- Mount the iPod and run
-- | tunes2pod.pl -m /mnt/ipod
-+ | tunes2pod -m /mnt/ipod
+- | gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++ | gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
|
- The iPod is now ready again for GNUpod.
-@@ -1096,7 +1096,7 @@
+ (Note: To use all features of --decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
+
- 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 will write a new GNUtunesDB which
-+lose any changes you made with iTunes. Running tunes2pod will write a new GNUtunesDB which
- reflects the content of the current iTunesDB.
+-gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
+ feel free to send me an example-file: pab@blinkenligts.ch
+
+@@ -878,7 +878,7 @@
+ Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
-@@ -1113,7 +1113,7 @@
- </playlist>
+-You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
++You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
+ named playlist.
+
+
+@@ -914,14 +914,14 @@
+ Such a playlist will show up as a Podcast after running mktunes.pl
+
+
+-gnupod_addsong.pl can also download podcasts and create such playlists itself:
++gnupod_addsong can also download podcasts and create such playlists itself:
+
+
+- | gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++ | gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
|
--..would look like this after using tunes2pod.pl
-+..would look like this after using tunes2pod
- | ...
- <playist name="extended">
- <add id="1" />
-@@ -1211,13 +1211,13 @@
- the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
+ Running this command will create a Playlist called 'Heute Morgen' (-p ) and set podcast="1" (--playlist-is-podcast ).
+-gnupod_addsong.pl will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml , download all (new) files
++gnupod_addsong will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml , download all (new) files
+ and add them to the 'Heute Morgen' playlist!
--Everytime you run tunes2pod.pl , the iTunesDB will get parsed and converted into an
-+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)
+@@ -958,8 +958,8 @@
+
+
+-To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong.pl . Example:
+- | gnupod_addsong.pl --artwork cover.jpg *.mp3
++To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong . Example:
++ | gnupod_addsong --artwork cover.jpg *.mp3
+ |
+
+ Use gnupod_search.pl to change/add artwork for existing files. Example:
+@@ -1047,14 +1047,14 @@
--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 for example) only have to deal with the XML file called GNUtunesDB.
+ If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
+-you can 'rebuild' an GNUtunesDB using gnupod_addsong.pl
++you can 'rebuild' an GNUtunesDB using gnupod_addsong
-@@ -1225,7 +1225,7 @@
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl .
+- | gnupod_addsong.pl --restore -m /mnt/ipod
++ | gnupod_addsong --restore -m /mnt/ipod
+ |
+
+ First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
+-Then, gnupod_addsong.pl --restore will re-create a GNUtunesDB including the Songs which are on the iPod
++Then, gnupod_addsong --restore will re-create a GNUtunesDB including the Songs which are on the iPod
--If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
-+If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
- using any other GNUpod commands.
+ I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
+@@ -1218,7 +1218,7 @@
---- gnupod-0.99.8/doc/gnupod.info 2021-07-21 19:22:15.284294526 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-21 19:22:15.756250801 -1200
-@@ -437,7 +437,7 @@
- gnupod_INIT.pl -m /mnt/ipod
+ Only mktunes.pl 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.
+
- gnupod_INIT.pl 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)
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
+--- gnupod-0.99.8/doc/gnupod.info 2021-07-22 21:32:37.526559920 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:39.710668583 +1400
+@@ -469,23 +469,23 @@
+ 4.3 Add files
+ =============
- 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.
+-To add files, we use the script called `gnupod_addsong.pl'.
++To add files, we use the script called `gnupod_addsong'.
- Mount the iPod and run
-- tunes2pod.pl -m /mnt/ipod
-+ tunes2pod -m /mnt/ipod
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
- The iPod is now ready again for GNUpod.
+ If you would like to add the file /tmp/foo.mp3, run
+-gnupod_addsong.pl like this:
+- gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++gnupod_addsong like this:
++ gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
- 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.
+ You can also use wildcards:
+- gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++ gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
-@@ -778,7 +778,7 @@
-
-
+ It isn't possible to add the same MP3 multiple times,
+-gnupod_addsong.pl detects duplicates (Duplicate = same filesize/time
++gnupod_addsong detects duplicates (Duplicate = same filesize/time
+ and ID3Tag name). You can disable the duplicate-detection with the
+ '-duplicate' switch.
-- ..would look like this after using tunes2pod.pl
-+ ..would look like this after using tunes2pod
- ...
-
-
-@@ -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.
+- gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
++ gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
+ DRM!) files.
-- 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
+ It can also convert FLAC and OGG files on-the-fly:
+@@ -493,13 +493,13 @@
+ Using this example, it would convert the two files into MP3 and add
+ them to the iPod.
+
+- gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++ gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
+
+ (Note: To use all features of -decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc
+ and faac)
+
+- gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++ gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it
+ doesn't work for you, feel free to send me an example-file:
+ pab@blinkenligts.ch
+@@ -617,7 +617,7 @@
+ in the GNUpod tarball. Also check out
+ http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
+
+- You can also use the -playlist option of gnupod_addsong.pl. This
++ You can also use the -playlist option of gnupod_addsong. This
+ will create and add the listed songs to the named playlist.
+
+ 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
+
+- gnupod_addsong.pl can also download podcasts and create such
++ gnupod_addsong can also download podcasts and create such
+ playlists itself:
+
+- gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++ gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
+
+ Running this command will create a Playlist called 'Heute Morgen'
+ (`-p') and set `podcast="1"' (`--playlist-is-podcast').
+-`gnupod_addsong.pl' will then fetch the podcast from
++`gnupod_addsong' will then fetch the podcast from
+ `http://pod.drs.ch/heutemorgen_mpx.xml', download all (new) files and
+ add them to the 'Heute Morgen' playlist!
+
+@@ -671,8 +671,8 @@
+ model = nano_4g
+
+ To specify a cover while adding files you'd use the `--artwork'
+-switch of `gnupod_addsong.pl'. Example:
+- gnupod_addsong.pl --artwork cover.jpg *.mp3
++switch of `gnupod_addsong'. Example:
++ gnupod_addsong --artwork cover.jpg *.mp3
+
+ Use `gnupod_search.pl' to change/add artwork for existing files.
+ Example:
+@@ -730,12 +730,12 @@
+
+ If gnupod_check.pl found many errors (or you lost your
+ GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
+-`gnupod_addsong.pl'
++`gnupod_addsong'
+
+- gnupod_addsong.pl --restore -m /mnt/ipod
++ gnupod_addsong --restore -m /mnt/ipod
+
+ First, it will create a clean, empty GNUtunesDB, it won't delete any
+-songs on the iPod. Then, `gnupod_addsong.pl --restore' will re-create
++songs on the iPod. Then, `gnupod_addsong --restore' will re-create
+ a GNUtunesDB including the Songs which are on the iPod
+
+ I think nobody will ever have to do this.. but it maybe usefull to
+@@ -845,7 +845,7 @@
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 for example) only have to
+ Only mktunes.pl 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.
-@@ -853,7 +853,7 @@
- gnupod_something.pl) you'll have to run `mktunes.pl'.
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
+Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-22 21:32:33.950382000 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-22 21:32:41.518758539 +1400
+@@ -51,7 +51,7 @@
+ # done!
+ #
- 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.
+-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', ftyp=>'OGG' },
+ 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
+Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
+--- gnupod-0.99.8/README 2021-07-22 21:32:38.090587981 +1400
++++ gnupod-0.99.8/README.new 2021-07-22 21:32:41.922778640 +1400
+@@ -33,7 +33,7 @@
+ gnupod_addsong Add files
+ gnupod_check.pl Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+-gnupod_search.pl Search ;)
++gnupod_search Search ;)
+ mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml
-
- File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems
---- gnupod-0.99.8/doc/gnupod.texi 2021-07-21 19:22:15.308292303 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-21 19:22:15.764250059 -1200
-@@ -459,7 +459,7 @@
- @end example
+--- gnupod-0.99.8/AUTHORS 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/AUTHORS.new 2021-07-22 21:32:42.090786999 +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 ;) )
- gnupod_INIT.pl 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
+ And also many thanks to the many other people
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:38.250595942 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:42.262795557 +1400
+@@ -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/src/gnupod_search.pl 2021-07-22 21:32:36.218494841 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-07-22 21:32:42.438804314 +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_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/FAQ 2021-07-22 21:32:39.038635148 +1400
++++ gnupod-0.99.8/FAQ.new 2021-07-22 21:32:42.582811478 +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 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/doc/gnupod.texi 2021-07-22 21:32:39.214643905 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-22 21:32:42.750819837 +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
-@@ -785,18 +785,18 @@
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ @end example
- 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.
+-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.
- Mount the iPod and run
+ @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
--tunes2pod.pl -m /mnt/ipod
-+tunes2pod -m /mnt/ipod
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
@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.
+ @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..)
-@@ -813,7 +813,7 @@
-
+ @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
--..would look like this after using tunes2pod.pl
-+..would look like this after using tunes2pod
+ 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
- ...
-
-@@ -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.
+ # 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
--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)
+ don't forget to run @code{@w{mktunes.pl}} afterwards.
+--- gnupod-0.99.8/doc/gnupodrc.example 2021-07-22 21:32:39.362651269 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-22 21:32:42.902827400 +1400
+@@ -52,7 +52,7 @@
+ ## Enforce iPod serial number:
+ # mktunes.fwguid = 000ba3100310abcf
--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 for example) only have to deal with the XML file called GNUtunesDB.
+-# *** gnupod_search.pl ***
++# *** gnupod_search ***
- 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}}.
+ ## Always match only once
+ # gnupod_search.match-once = 1
+--- gnupod-0.99.8/doc/gnupod.html 2021-07-22 21:32:39.526659428 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-22 21:32:43.094836953 +1400
+@@ -722,15 +722,15 @@
+
+
--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 includes a tool called gnupod_search.pl that helps you search for files.
++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"
+ |
---- gnupod-0.99.8/doc/gnupodrc.example 2021-07-21 19:22:15.332290080 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-21 19:22:15.776248948 -1200
-@@ -41,7 +41,7 @@
- ## Uncomment this to skip 'on-the-go' sync
- # otgsync.nosync = 1
+-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.
+
--# *** tunes2pod.pl ***
-+# *** tunes2pod ***
- ## Uncomment to set '--force' switch to true (DANGEROUS)
- # tunes2pod.force = 1
+
+@@ -751,9 +751,9 @@
+
+
+
+-Removing files is done using gnupod_search.pl -d .
++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
+ |
+
+
+@@ -774,10 +774,10 @@
+
+
+
+-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
+@@ -962,9 +962,9 @@
+ | gnupod_addsong --artwork cover.jpg *.mp3
+ |
+
+-Use gnupod_search.pl to change/add artwork for existing files. Example:
++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.pl afterwards.
+--- gnupod-0.99.8/doc/gnupod.info 2021-07-22 21:32:39.710668583 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:43.270845710 +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'. 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.pl' afterwards.
+
+Patched gnupod-0.99.8/man/tunes2pod.pl.1.gz
+--- gnupod-0.99.8/README 2021-07-22 21:32:41.922778640 +1400
++++ gnupod-0.99.8/README.new 2021-07-22 21:32:43.722868199 +1400
+@@ -35,7 +35,7 @@
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search 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
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:15.360287486 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:15.784248207 -1200
+ You'll have to use mktunes.pl if you added/deleted/changed something
+ on the iPod.
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:42.262795557 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:43.958879941 +1400
@@ -136,7 +136,7 @@
Summary
-------
@@ -1767,8 +2271,34 @@
(Thanks to Ciamac Moallemi for reporting and providing a patch)
- Support for songnum, songs, cdnum, cds and year
---- gnupod-0.99.8/src/tunes2pod.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/tunes2pod.pl.new 2021-07-21 19:22:15.792247466 -1200
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-07-22 21:32:34.834425982 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-07-22 21:32:44.114887703 +1400
+@@ -63,7 +63,7 @@
+ usage($con->{status}."\n") if $con->{status};
+
+ if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
+- die "gnupod_otgsync: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n";
++ die "gnupod_otgsync: Bug detected! You need to run tunes2pod -> Sync broken!\n";
+ }
+
+ ##Check if GNUtunesDB <-> iTunesDB is really in-sync
+--- gnupod-0.99.8/src/gnupod_INIT.pl 2021-07-22 21:32:35.882478124 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-07-22 21:32:44.270895465 +1400
+@@ -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-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/tunes2pod.pl.new 2021-07-22 21:32:44.426903227 +1400
@@ -36,7 +36,7 @@
$| = 1;
@@ -1805,19 +2335,19 @@
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_otgsync.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-07-21 19:22:15.804246354 -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
---- 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 2021-07-21 19:22:15.820244872 -1200
+--- 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-07-22 21:32:44.626913178 +1400
+@@ -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/FooBar.pm 2021-07-22 21:32:34.998434142 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-07-22 21:32:44.806922134 +1400
@@ -143,7 +143,7 @@
sub StartItunesDBSync {
my($con) = @_;
@@ -1827,8 +2357,8 @@
if(-x $XBIN) {
{
---- 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 2021-07-21 19:22:15.840243019 -1200
+--- gnupod-0.99.8/src/ext/XMLhelper.pm 2021-07-22 21:32:36.866527082 +1400
++++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2021-07-22 21:32:44.970930293 +1400
@@ -191,7 +191,7 @@
}
@@ -1847,470 +2377,413 @@
# Like addpl(), 'output' isn't xml-encoded
sub addspl {
my($name, $opt) = @_;
---- 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 2021-07-21 19:22:15.852241907 -1200
-@@ -1012,7 +1012,7 @@
-
-
-
--### Here are the READ sub's used by tunes2pod.pl
-+### Here are the READ sub's used by tunes2pod
+--- gnupod-0.99.8/FAQ 2021-07-22 21:32:42.582811478 +1400
++++ gnupod-0.99.8/FAQ.new 2021-07-22 21:32:45.150939249 +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.pl
++Just have a look at iTunesDB.pm and tunes2pod+mktunes.pl
- ###########################################
- # Get a INT value
---- 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 2021-07-21 19:22:15.864240795 -1200
-@@ -115,9 +115,9 @@
+ ..or feel free to ask me questions about it:
+
+--- gnupod-0.99.8/doc/gnupod.texi 2021-07-22 21:32:42.750819837 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-22 21:32:45.342948802 +1400
+@@ -459,7 +459,7 @@
+ @end example
- 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/README 2021-07-21 19:22:15.452278963 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:15.876239684 -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
+ 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)
- You'll have to use mktunes.pl if you added/deleted/changed something
- on the iPod.
-Patched gnupod-0.99.8/man/mktunes.pl.1.gz
---- gnupod-0.99.8/README.developer 2021-07-21 19:22:15.656260064 -1200
-+++ gnupod-0.99.8/README.developer.new 2021-07-21 19:22:15.928234867 -1200
-@@ -6,9 +6,9 @@
- Minimal testing:
- > gnupod_INIT.pl /mnt/empty
- > gnupod_addsong
--> mktunes.pl
-+> mktunes
- > tunes2pod --force
--> mktunes.pl
-+> mktunes
- > check if your ipod can read the result
+ Use
+ @example
+@@ -785,18 +785,18 @@
- Release checklist
---- gnupod-0.99.8/FAQ 2021-07-21 19:22:15.696256359 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-07-21 19:22:15.944233384 -1200
-@@ -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 -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 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.
- 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
+ Mount the iPod and run
+ @example
+-tunes2pod.pl -m /mnt/ipod
++tunes2pod -m /mnt/ipod
+ @end example
- Please read the README file and the info page
-@@ -83,7 +83,7 @@
+ The iPod is now ready again for GNUpod.
- But there are some GNUpod 'forks'
+ 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.
--- 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)
- (..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.
+@@ -813,7 +813,7 @@
+
+ @end example
+-..would look like this after using tunes2pod.pl
++..would look like this after using tunes2pod
+ @example
+ ...
+
+@@ -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.
- 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
+-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)
- ..or feel free to ask me questions about it:
-
---- gnupod-0.99.8/BUGS 2021-07-21 19:22:15.232299344 -1200
-+++ gnupod-0.99.8/BUGS.new 2021-07-21 19:22:15.952232643 -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/doc/gnupod.html 2021-07-21 19:22:15.740252283 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-21 19:22:15.960231902 -1200
-@@ -475,7 +475,7 @@
-
+-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 for example) only have to deal with the XML file called GNUtunesDB.
- 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
-+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 :
-
+ 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}}.
-@@ -784,7 +784,7 @@
- sets the rating to 5 Stars (5*20=100)
-
+-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.
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
-
- You could also edit the GNUtunesDB.xml with a text editor :-)
-@@ -911,7 +911,7 @@
- </playlist>
- |
+--- gnupod-0.99.8/doc/gnupodrc.example 2021-07-22 21:32:42.902827400 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-22 21:32:45.482955768 +1400
+@@ -41,7 +41,7 @@
+ ## Uncomment this to skip 'on-the-go' sync
+ # otgsync.nosync = 1
--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
-
+-# *** tunes2pod.pl ***
++# *** tunes2pod ***
+ ## Uncomment to set '--force' switch to true (DANGEROUS)
+ # tunes2pod.force = 1
- gnupod_addsong can also download podcasts and create such playlists itself:
-@@ -967,7 +967,7 @@
- gnupod_search.pl --artwork cover.jpg --album Katamari
+--- gnupod-0.99.8/doc/gnupod.html 2021-07-22 21:32:43.094836953 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-22 21:32:45.674965321 +1400
+@@ -600,7 +600,7 @@
|
--don't forget to run mktunes.pl afterwards.
-+don't forget to run mktunes 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)
- 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 @@
-
-
+ Use
+@@ -1084,11 +1084,11 @@
--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.
+ 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.
++ use tunes2pod to update the (outdated) GNUtunesDB.
- Simply run
-- | mktunes.pl -m /mnt/ipod
-+ | mktunes -m /mnt/ipod
+ Mount the iPod and run
+- | tunes2pod.pl -m /mnt/ipod
++
--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.
-
-
-- | mktunes.pl -m /mnt/ipod --volume 40
-+ | mktunes -m /mnt/ipod --volume 40
- |
+ 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 tunes2pod.pl will write a new GNUtunesDB which
++lose any changes you made with iTunes. Running tunes2pod will write a new GNUtunesDB which
+ reflects the content of the current iTunesDB.
--After mktunes.pl is done, you can umount the iPod and remove the sbp2 module
-+After mktunes is done, you can umount the iPod and remove the sbp2 module
- | umount /mnt/ipod
- rmmod sbp2
+@@ -1113,7 +1113,7 @@
+ </playlist>
|
--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 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 mktunes before unpluging/umounting, simply mount the iPod again and run it)
-
-
-
-@@ -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: 000ba3100310abcf and 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 .
-+of mktunes .
+-..would look like this after using tunes2pod.pl
++..would look like this after using tunes2pod
+ | ...
+ <playist name="extended">
+ <add id="1" />
+@@ -1211,13 +1211,13 @@
+ the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
-
-@@ -1213,16 +1213,16 @@
-
- Everytime you run tunes2pod , the iTunesDB will get parsed and converted into an
+-Everytime you run tunes2pod.pl , the iTunesDB will get parsed and converted into an
++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
-+mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the
+ mktunes.pl 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 have to worry about the iTunesDB format: all other tools
+-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 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 .
-+GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes .
+@@ -1225,7 +1225,7 @@
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl .
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
---- gnupod-0.99.8/doc/gnupod.info 2021-07-21 19:22:15.756250801 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-21 19:22:15.972230790 -1200
-@@ -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 @@
-
-
-
-- 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:
-@@ -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.
+-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
++If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
+ using any other GNUpod commands.
+
- Simply run
-- mktunes.pl -m /mnt/ipod
-+ mktunes -m /mnt/ipod
+--- gnupod-0.99.8/doc/gnupod.info 2021-07-22 21:32:43.270845710 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:45.862974675 +1400
+@@ -437,7 +437,7 @@
+ gnupod_INIT -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.
+ 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)
-- mktunes.pl -m /mnt/ipod --volume 40
-+ mktunes -m /mnt/ipod --volume 40
+ 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.
- This would adjust the volume +40 percent. (You can also use '-100'
- to get a silent iPod ;) )
+ Mount the iPod and run
+- tunes2pod.pl -m /mnt/ipod
++ tunes2pod -m /mnt/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
+ The iPod is now ready again for GNUpod.
- 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)
+ 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.
-
-@@ -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'.
+@@ -778,7 +778,7 @@
+
+
-
- File: gnupod.info, Node: Problems, Next: GNU Free Documentation License, Prev: Using GNUpod, Up: Top
-@@ -840,17 +840,17 @@
+- ..would look like this after using tunes2pod.pl
++ ..would look like this after using tunes2pod
+ ...
+
+
+@@ -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.pl' 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 have to worry about the iTunesDB
+- 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 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.pl'.
If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
- `tunes2pod' *before* using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupod.texi 2021-07-21 19:22:15.764250059 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-21 19:22:15.980230049 -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)
+-`tunes2pod.pl' *before* using any other GNUpod commands.
++`tunes2pod' *before* using any other GNUpod commands.
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
+
+ File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems
+--- gnupod-0.99.8/README.developer 2021-07-22 21:32:37.706568875 +1400
++++ gnupod-0.99.8/README.developer.new 2021-07-22 21:32:46.038983432 +1400
+@@ -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
- You could also edit the GNUtunesDB.xml with a text editor :-)
+Created gnupod-0.99.8/man/gnupod_convert_RIFF.pl.1.gz
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:43.958879941 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:48.123087122 +1400
+@@ -141,7 +141,7 @@
+ - Reduced MP3::Info false-positives: Empty files are
+ no longer detected as .mp3 files
+ - tools/fwpatch.pl: Support for video iPods added (yeah!)
+-- gnupod_convert_RIFF.pl: Support for new ffmpeg builds (s/aac/libfaac/)
++- gnupod_convert_RIFF: Support for new ffmpeg builds (s/aac/libfaac/)
+ - Upgraded from GPLv2 to GPLv3
-@@ -669,7 +669,7 @@
-
- @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-0.99.8/src/ext/FileMagic.pm 2021-07-22 21:32:41.518758539 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-22 21:32:48.287095282 +1400
+@@ -55,7 +55,7 @@
+ 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
+ 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' },
+ 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
+- 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}};
++ 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
- 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.
+Patched gnupod-0.99.8/man/gnupod_check.pl.1.gz
+--- gnupod-0.99.8/README 2021-07-22 21:32:43.722868199 +1400
++++ gnupod-0.99.8/README.new 2021-07-22 21:32:48.727117175 +1400
+@@ -31,7 +31,7 @@
- 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
+ gnupod_INIT INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong Add files
+-gnupod_check.pl Check for 'zombie' files
++gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search Search ;)
+ mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:48.123087122 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:48.895125534 +1400
+@@ -258,14 +258,14 @@
+ -> Apple lowered the Max. Pathlength from 64 to
+ 55. GNUpod will now crop after 49 chars (who knows what
+ Apple will do next time?)
+- ..you can run 'gnupod_check.pl --fixit' to crop
++ ..you can run 'gnupod_check --fixit' to crop
+ songs you added with an older version.
+ -> Looks like Apple also broke the SmartPlaylists Liveupdate
+ Feature. I couldn't get it to work with iTunes and GNUpod. Good job guys!
+ Since GNUpod only supports 'liveupdate-smartplaylists', you can't
+ use any SPL's with GNUpod and iPod-Mini 1.4 . Downgrading to 1.3 helps.
--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.
+-- gnupod_check.pl has now a --fixit switch. It will try to
++- gnupod_check has now a --fixit switch. It will try to
+ fix the found errors itself
- Simply run
- @example
--mktunes.pl -m /mnt/ipod
-+mktunes -m /mnt/ipod
- @end example
+ - Updated documentation: Tell how to extract a
+@@ -432,7 +432,7 @@
+ - Fixed some SmartPlaylist stuff and added support for last
+ playtime
--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.
+-- Added gnupod_check.pl, it check's for 'lost' files
++- Added gnupod_check, it check's for 'lost' files
- @example
--mktunes.pl -m /mnt/ipod --volume 40
-+mktunes -m /mnt/ipod --volume 40
- @end example
+ - I changed the 'build' system. Btw, you can now uninstall
+ GNUpod using 'make uninstall' .. but why? :)
+--- gnupod-0.99.8/src/gnupod_check.pl 2021-07-22 21:32:38.726619625 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-07-22 21:32:49.059133694 +1400
+@@ -32,7 +32,7 @@
+ #Get maximal Pathlength from XMLHelper constant
+ my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
- This would adjust the volume +40 percent. (You can also use '-100' to get
- a silent iPod ;) )
+-print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
--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
+ $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
--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)
+ -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
- @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}.
+ This is free software; see the source for copying conditions. There is NO
+--- gnupod-0.99.8/doc/gnupod.texi 2021-07-22 21:32:45.342948802 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-22 21:32:49.239142650 +1400
+@@ -761,11 +761,11 @@
+ If your computer crashed while uploading/deleting songs, you may
+ have some 'zombie' files.
- @c ===========================================================================================
+-In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
-@@ -866,14 +866,14 @@
- 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
- iPod and iTunes)
+-If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
++If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+ you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
--Only mktunes.pl and tunes2pod 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.
+ @example
+--- gnupod-0.99.8/doc/gnupod.html 2021-07-22 21:32:45.674965321 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-22 21:32:49.431152203 +1400
+@@ -1042,11 +1042,11 @@
+ have some 'zombie' files.
+
- 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}}.
+-In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
+
- 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 2021-07-21 19:22:15.776248948 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-21 19:22:16.008227455 -1200
-@@ -22,9 +22,9 @@
- ## * nano_4g (the late 2008 nano)
- # model = video
+-If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
++If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+ you can 'rebuild' an GNUtunesDB using gnupod_addsong
+
--## 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
+--- gnupod-0.99.8/doc/gnupod.info 2021-07-22 21:32:45.862974675 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:49.615161358 +1400
+@@ -725,10 +725,10 @@
+ If your computer crashed while uploading/deleting songs, you may have
+ some 'zombie' files.
-@@ -32,7 +32,7 @@
+- In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++ In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
- ##### NON GLOBAL OPTIONS ######
+- If gnupod_check.pl found many errors (or you lost your
++ If gnupod_check found many errors (or you lost your
+ GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
+ `gnupod_addsong'
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Specify the iPods name
- # mktunes.ipod-name = Wurstli
+Patched gnupod-0.99.8/man/mktunes.pl.1.gz
+--- gnupod-0.99.8/README 2021-07-22 21:32:48.727117175 +1400
++++ gnupod-0.99.8/README.new 2021-07-22 21:32:50.023181658 +1400
+@@ -34,10 +34,10 @@
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search 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
-@@ -46,7 +46,7 @@
- # tunes2pod.force = 1
+-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.
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Set --volume boost to +10 percent
- # mktunes.volume = +10
- ## Enforce iPod serial number:
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:15.784248207 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:16.020226344 -1200
+--- gnupod-0.99.8/CHANGES 2021-07-22 21:32:48.895125534 +1400
++++ gnupod-0.99.8/CHANGES.new 2021-07-22 21:32:50.235192206 +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.
+- 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.
*** OLD STUFF ***
@@ -2416,53 +2889,18 @@
not found.
- gnupod_addsong handles long filenames now better
- Timestamp should now be set correct
---- gnupod-0.99.8/src/gnupod_addsong.pl 2021-07-21 19:22:15.392284521 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-07-21 19:22:16.040224491 -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/mktunes.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new 2021-07-21 19:22:16.052223379 -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]
+--- gnupod-0.99.8/README.about_m4a 2021-07-22 21:32:38.406603703 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2021-07-22 21:32:50.367198774 +1400
+@@ -30,6 +30,6 @@
+ Now you can add the file using gnupod_addsong
- -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
+ # gnupod_addsong file.m4a
+-# mktunes.pl
++# mktunes
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-07-21 19:22:15.804246354 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-07-21 19:22:16.064222268 -1200
+ :)
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-07-22 21:32:44.114887703 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-07-22 21:32:50.503205541 +1400
@@ -129,9 +129,9 @@
sub newfile {
my($el) = @_;
@@ -2475,45 +2913,8 @@
# id, like here :)
push(@keeper, int($el->{file}->{id}));
---- gnupod-0.99.8/src/ext/FooBar.pm 2021-07-21 19:22:15.820244872 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-07-21 19:22:16.084220415 -1200
-@@ -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/ext/Mktunes.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2021-07-21 19:22:16.096219303 -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";
- }
-
- 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_search.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-07-21 19:22:16.108218191 -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
---- gnupod-0.99.8/src/gnupod_INIT.pl 2021-07-21 19:22:15.864240795 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-07-21 19:22:16.120217080 -1200
+--- gnupod-0.99.8/src/gnupod_INIT.pl 2021-07-22 21:32:44.270895465 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-07-22 21:32:50.659213303 +1400
@@ -120,9 +120,9 @@
$t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
}
@@ -2542,877 +2943,543 @@
to adjust the volume (Works with Firmware 1.x AND 2.x)
--noask Do not wait for any user input
---- gnupod-0.99.8/README 2021-07-21 19:22:15.876239684 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:16.132215968 -1200
-@@ -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 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/README.about_m4a 2021-07-21 19:22:15.492275257 -1200
-+++ gnupod-0.99.8/README.about_m4a.new 2021-07-21 19:22:16.144214856 -1200
-@@ -30,6 +30,6 @@
- Now you can add the file using gnupod_addsong
-
- # gnupod_addsong file.m4a
--# mktunes.pl
-+# mktunes
-
- :)
-Created gnupod-0.99.8/man/gnupod_convert_RIFF.pl.1.gz
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:16.020226344 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:16.360194846 -1200
-@@ -141,7 +141,7 @@
- - Reduced MP3::Info false-positives: Empty files are
- no longer detected as .mp3 files
- - tools/fwpatch.pl: Support for video iPods added (yeah!)
--- gnupod_convert_RIFF.pl: Support for new ffmpeg builds (s/aac/libfaac/)
-+- gnupod_convert_RIFF: Support for new ffmpeg builds (s/aac/libfaac/)
- - Upgraded from GPLv2 to GPLv3
-
-
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-21 19:22:15.144307496 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-21 19:22:16.376193364 -1200
-@@ -55,7 +55,7 @@
- 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
- 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
-- 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}};
-+ 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2021-07-22 21:32:38.566611664 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-07-22 21:32:50.819221264 +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_search.pl 2021-07-22 21:32:42.438804314 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-07-22 21:32:50.991229822 +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/mktunes.pl 2021-07-22 21:32:36.534510564 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new 2021-07-22 21:32:51.167238579 +1400
+@@ -37,7 +37,7 @@
+ my %opts = ();
-Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-21 19:22:16.376193364 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-21 19:22:16.620170760 -1200
-@@ -54,7 +54,7 @@
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', 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 '}};
+-print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
++print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
-Patched gnupod-0.99.8/man/gnupod_otgsync.pl.1.gz
---- gnupod-0.99.8/tools/otgtest.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/otgtest.pl.new 2021-07-21 19:22:16.676165572 -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/CHANGES 2021-07-21 19:22:16.360194846 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:16.692164090 -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
+ $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]
--gnupod_otgsync.pl
-+gnupod_otgsync
- * A new tool, don't use it yourself :)
- It's only used internal.
+ -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
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-07-21 19:22:16.064222268 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-07-21 19:22:16.708162608 -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";
- }
+ This is free software; see the source for copying conditions. There is NO
+--- gnupod-0.99.8/src/ext/Mktunes.pm 2021-07-22 21:32:36.690518325 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2021-07-22 21:32:51.315245943 +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";
+ }
- ##Check if GNUtunesDB <-> iTunesDB is really in-sync
---- gnupod-0.99.8/src/ext/FooBar.pm 2021-07-21 19:22:16.084220415 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-07-21 19:22:16.724161125 -1200
-@@ -164,11 +164,11 @@
+ 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 2021-07-22 21:32:44.806922134 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-07-22 21:32:51.491254700 +1400
+@@ -119,10 +119,10 @@
}
- ######################################################################
--# Call gnupod_otgsync.pl
-+# Call gnupod_otgsync
- sub StartOnTheGoSync {
+ #######################################################################
+-# Call mktunes.pl
++# Call mktunes
+ sub StartAutoMkTunes {
my($con) = @_;
-
-- my $XBIN = "$con->{bindir}/gnupod_otgsync.pl";
-+ my $XBIN = "$con->{bindir}/gnupod_otgsync";
-
+- my $XBIN = "$con->{bindir}/mktunes.pl";
++ my $XBIN = "$con->{bindir}/mktunes";
if(-x $XBIN) {
{
---- gnupod-0.99.8/README 2021-07-21 19:22:16.132215968 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:16.740159643 -1200
-@@ -32,7 +32,7 @@
- gnupod_INIT.pl INIT a new iPod (create empty Database + Directories)
- gnupod_addsong Add files
- gnupod_check.pl 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 Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
-Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-21 19:22:16.620170760 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-21 19:22:17.276109988 -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', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
-Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-21 19:22:17.276109988 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-21 19:22:17.452093684 -1200
-@@ -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', 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 2021-07-21 19:22:17.464092572 -1200
-@@ -46,8 +46,8 @@
- }
- ## 3. = no errors without Audio::FLAC! :)
- if($@ || ref($ftag) ne "HASH") {
-- warn "gnupod_convert_FLAC.pl: Could not read FLAC-Metadata from $file\n";
-- warn "gnupod_convert_FLAC.pl: Maybe Audio::FLAC is not installed?\n";
-+ warn "gnupod_convert_FLAC: Could not read FLAC-Metadata from $file\n";
-+ warn "gnupod_convert_FLAC: Maybe Audio::FLAC is not installed?\n";
- warn "Error: $@\n";
- exit(1);
- }
-Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
---- gnupod-0.99.8/FAQ 2021-07-21 19:22:15.944233384 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-07-21 19:22:17.504088867 -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
+ local $ENV{IPOD_MOUNTPOINT} = $con->{mountpoint};
+--- gnupod-0.99.8/BUGS 2021-07-22 21:32:38.886627585 +1400
++++ gnupod-0.99.8/BUGS.new 2021-07-22 21:32:51.639262064 +1400
+@@ -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/FAQ 2021-07-22 21:32:45.150939249 +1400
++++ gnupod-0.99.8/FAQ.new 2021-07-22 21:32:51.795269826 +1400
+@@ -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!
- (Hmm.. output breaks if On-The-Go data get's synced..)
- FIXME.. maybe we should have an --out option?
---- gnupod-0.99.8/doc/gnupod.html 2021-07-21 19:22:15.960231902 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-21 19:22:17.520087384 -1200
-@@ -722,15 +722,15 @@
-
-
+ 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
--GNUpod includes a tool called gnupod_search.pl that helps you search for files.
-+GNUpod includes a tool called gnupod_search that helps you search for files.
-
+ Please read the README file and the info page
+@@ -83,7 +83,7 @@
- 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"
- |
+ But there are some GNUpod 'forks'
--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.
-
+-- 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)
-
-@@ -751,9 +751,9 @@
-
-
+ (..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.
--Removing files is done using gnupod_search.pl -d .
-+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
- |
-
-@@ -774,10 +774,10 @@
-
-
+ 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
--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..)
-
+ ..or feel free to ask me questions about it:
+
+--- gnupod-0.99.8/doc/gnupod.texi 2021-07-22 21:32:49.239142650 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-22 21:32:51.971278583 +1400
+@@ -359,7 +359,7 @@
+ Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
-- | 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"
- |
+ 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
-@@ -962,9 +962,9 @@
- | gnupod_addsong --artwork cover.jpg *.mp3
- |
-
--Use gnupod_search.pl to change/add artwork for existing files. Example:
-+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.info 2021-07-21 19:22:15.972230790 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-21 19:22:17.532086273 -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.
+ sets the rating to 5 Stars (5*20=100)
---- gnupod-0.99.8/doc/gnupod.texi 2021-07-21 19:22:15.980230049 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-21 19:22:17.548084790 -1200
-@@ -529,33 +529,33 @@
- @node Search files
- @section Search files
+-Don't forget to run mktunes.pl!
++Don't forget to run mktunes!
--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.
+ You could also edit the GNUtunesDB.xml with a text editor :-)
- 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"
+@@ -669,7 +669,7 @@
+
@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.
+-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
- @node Remove files
- @section Remove files
+ gnupod_addsong can also download podcasts and create such playlists itself:
--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
+@@ -718,7 +718,7 @@
+ gnupod_search --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.
- @node Edit tags
- @section Edit tags
+ 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
--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..)
+-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
--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 @@
+-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.
--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
+-mktunes.pl -m /mnt/ipod --volume 40
++mktunes -m /mnt/ipod --volume 40
@end example
- don't forget to run @code{@w{mktunes}} afterwards.
---- gnupod-0.99.8/doc/gnupodrc.example 2021-07-21 19:22:16.008227455 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-21 19:22:17.564083308 -1200
-@@ -52,7 +52,7 @@
- ## Enforce iPod serial number:
- # mktunes.fwguid = 000ba3100310abcf
+ This would adjust the volume +40 percent. (You can also use '-100' to get
+ a silent iPod ;) )
--# *** gnupod_search.pl ***
-+# *** gnupod_search ***
+-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
- ## Always match only once
- # gnupod_search.match-once = 1
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:16.692164090 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:17.576082197 -1200
-@@ -58,8 +58,8 @@
+-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)
- 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.
+ @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}.
- - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
+ @c ===========================================================================================
-@@ -344,7 +344,7 @@
+@@ -866,14 +866,14 @@
- - Rewritten ConverterCore.. shouldn't break anything...
+ 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
+ iPod and iTunes)
--- gnupod_search.pl can now RENAME/Edit tags.
-+- gnupod_search can now RENAME/Edit tags.
- use --rename="artist=New artist Name"
+-Only mktunes.pl and tunes2pod 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.
- - 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')
+ 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}}.
--- 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')
+ 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 2021-07-22 21:32:45.482955768 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-07-22 21:32:52.127286345 +1400
+@@ -22,9 +22,9 @@
+ ## * nano_4g (the late 2008 nano)
+ # model = video
- - 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...
+-## 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 @@
--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)
+ ##### NON GLOBAL OPTIONS ######
- gnuPod 0.26
---- gnupod-0.99.8/src/gnupod_search.pl 2021-07-21 19:22:16.108218191 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-07-21 19:22:17.584081455 -1200
-@@ -38,7 +38,7 @@
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Specify the iPods name
+ # mktunes.ipod-name = Wurstli
+@@ -46,7 +46,7 @@
+ # tunes2pod.force = 1
--print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Set --volume boost to +10 percent
+ # mktunes.volume = +10
+ ## Enforce iPod serial number:
+--- gnupod-0.99.8/doc/gnupod.html 2021-07-22 21:32:49.431152203 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-22 21:32:52.315295699 +1400
+@@ -475,7 +475,7 @@
+
- # 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 ...
+ 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
++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 :
+
- -h, --help display this help and exit
- --version output version information and exit
-@@ -279,7 +279,7 @@
+@@ -784,7 +784,7 @@
+ sets the rating to 5 Stars (5*20=100)
+
- sub version {
- die << "EOF";
--gnupod_search.pl (gnupod) ###__VERSION__###
-+gnupod_search (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
+-Don't forget to run mktunes.pl!
++Don't forget to run mktunes!
+
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/README 2021-07-21 19:22:16.740159643 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:17.592080714 -1200
-@@ -33,7 +33,7 @@
- gnupod_addsong Add files
- gnupod_check.pl 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
+ You could also edit the GNUtunesDB.xml with a text editor :-)
+@@ -911,7 +911,7 @@
+ </playlist>
+ |
---- gnupod-0.99.8/AUTHORS 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/AUTHORS.new 2021-07-21 19:22:17.608079232 -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 ;) )
+-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:
+@@ -967,7 +967,7 @@
+ gnupod_search --artwork cover.jpg --album Katamari
+ |
- And also many thanks to the many other people
-Patched gnupod-0.99.8/man/gnupod_check.pl.1.gz
---- gnupod-0.99.8/doc/gnupod.html 2021-07-21 19:22:17.520087384 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-21 19:22:17.668073674 -1200
-@@ -1042,11 +1042,11 @@
- have some 'zombie' files.
+-don't forget to run mktunes.pl afterwards.
++don't forget to run mktunes afterwards.
--In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
-
+ 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 @@
+
+
--If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
-+If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
- you can 'rebuild' an GNUtunesDB using gnupod_addsong
+-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.
---- gnupod-0.99.8/doc/gnupod.info 2021-07-21 19:22:17.532086273 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-21 19:22:17.680072562 -1200
-@@ -725,10 +725,10 @@
- If your computer crashed while uploading/deleting songs, you may have
- some 'zombie' files.
-
-- In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+ In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
+ Simply run
+- | mktunes.pl -m /mnt/ipod
++
-- If gnupod_check.pl found many errors (or you lost your
-+ If gnupod_check found many errors (or you lost your
- GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
- `gnupod_addsong'
+-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-0.99.8/doc/gnupod.texi 2021-07-21 19:22:17.548084790 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-21 19:22:17.708069968 -1200
-@@ -761,11 +761,11 @@
- If your computer crashed while uploading/deleting songs, you may
- have some 'zombie' files.
+- | mktunes.pl -m /mnt/ipod --volume 40
++ | mktunes -m /mnt/ipod --volume 40
+ |
--In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
+ 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 sbp2 module
++After mktunes is done, you can umount the iPod and remove the sbp2 module
+ | umount /mnt/ipod
+ rmmod sbp2
+ |
--If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
-+If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
- you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
+-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 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 mktunes before unpluging/umounting, simply mount the iPod again and run it)
+
- @example
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:17.576082197 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:17.724068486 -1200
-@@ -258,14 +258,14 @@
- -> Apple lowered the Max. Pathlength from 64 to
- 55. GNUpod will now crop after 49 chars (who knows what
- Apple will do next time?)
-- ..you can run 'gnupod_check.pl --fixit' to crop
-+ ..you can run 'gnupod_check --fixit' to crop
- songs you added with an older version.
- -> Looks like Apple also broke the SmartPlaylists Liveupdate
- Feature. I couldn't get it to work with iTunes and GNUpod. Good job guys!
- Since GNUpod only supports 'liveupdate-smartplaylists', you can't
- use any SPL's with GNUpod and iPod-Mini 1.4 . Downgrading to 1.3 helps.
+
+@@ -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: 000ba3100310abcf and 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 .
++of mktunes .
+
--- gnupod_check.pl has now a --fixit switch. It will try to
-+- gnupod_check has now a --fixit switch. It will try to
- fix the found errors itself
+
+@@ -1213,16 +1213,16 @@
- - Updated documentation: Tell how to extract a
-@@ -432,7 +432,7 @@
- - Fixed some SmartPlaylist stuff and added support for last
- playtime
+ 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
++mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the
+ iPod and iTunes)
+
--- Added gnupod_check.pl, it check's for 'lost' files
-+- Added gnupod_check, it check's for 'lost' files
+-Only mktunes.pl and tunes2pod 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.
+
- - I changed the 'build' system. Btw, you can now uninstall
- GNUpod using 'make uninstall' .. but why? :)
---- gnupod-0.99.8/src/gnupod_check.pl 2021-07-21 19:22:15.424281557 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-07-21 19:22:17.748066263 -1200
-@@ -32,7 +32,7 @@
- #Get maximal Pathlength from XMLHelper constant
- my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
+ 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 .
++GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes .
+
--print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
+ If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
+--- gnupod-0.99.8/doc/gnupod.info 2021-07-22 21:32:49.615161358 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-22 21:32:52.515305650 +1400
+@@ -338,8 +338,8 @@
- $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
+ 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':
- -h, --help display this help and exit
- --version output version information and exit
-@@ -237,7 +237,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)
- sub version {
- die << "EOF";
--gnupod_check.pl (gnupod) ###__VERSION__###
-+gnupod_check (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2004
+- Don't forget to run mktunes.pl!
++ Don't forget to run mktunes!
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/README 2021-07-21 19:22:17.592080714 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:17.768064410 -1200
-@@ -31,7 +31,7 @@
+ You could also edit the GNUtunesDB.xml with a text editor :-)
- gnupod_INIT.pl INIT a new iPod (create empty Database + Directories)
- gnupod_addsong Add files
--gnupod_check.pl Check for 'zombie' files
-+gnupod_check Check for 'zombie' files
- gnupod_otgsync Handles On-The-Go Sync (not for humans)
- gnupod_search Search ;)
- mktunes Convert the GNUtunesDB.xml to a iTunesDB
-Patched gnupod-0.99.8/man/gnupod_INIT.pl.1.gz
---- gnupod-0.99.8/README.developer 2021-07-21 19:22:15.928234867 -1200
-+++ gnupod-0.99.8/README.developer.new 2021-07-21 19:22:17.816059963 -1200
-@@ -4,7 +4,7 @@
- These aren't the droids you're looking for. Move along! :-)
+@@ -635,7 +635,7 @@
+
+
- Minimal testing:
--> gnupod_INIT.pl /mnt/empty
-+> gnupod_INIT /mnt/empty
- > gnupod_addsong
- > mktunes
- > tunes2pod --force
---- gnupod-0.99.8/FAQ 2021-07-21 19:22:17.504088867 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-07-21 19:22:17.828058851 -1200
-@@ -58,7 +58,7 @@
- ./configure && make install
-
- 1 Mount the iPod (eg. /mnt/ipod)
-- 2 run gnupod_INIT.pl -m /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 -m /mnt/ipod'
- 5 umount the iPod and enjoy!
---- gnupod-0.99.8/tools/extractArtwork.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/extractArtwork.pl.new 2021-07-21 19:22:17.844057369 -1200
-@@ -22,7 +22,7 @@
- my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0);
+- 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
- $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");
+ 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 --artwork cover.jpg --album Katamari
- #print Data::Dumper::Dumper($AWDB);
+- don't forget to run `mktunes.pl' afterwards.
++ don't forget to run `mktunes' afterwards.
---- gnupod-0.99.8/doc/gnupod.html 2021-07-21 19:22:17.668073674 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-07-21 19:22:17.860055887 -1200
-@@ -596,15 +596,15 @@
-
+ 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
+ ====================
- 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
- |
+-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.
--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 to convert the iTunesDB to an GNUtunesDB)
-
+ Simply run
+- mktunes.pl -m /mnt/ipod
++ mktunes -m /mnt/ipod
- Use
-- | gnupod_INIT.pl -m /mnt/ipod --france
-+ | gnupod_INIT -m /mnt/ipod --france
- |
+- 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.
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/doc/gnupod.info 2021-07-21 19:22:17.680072562 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-07-21 19:22:17.876054405 -1200
-@@ -434,14 +434,14 @@
+- mktunes.pl -m /mnt/ipod --volume 40
++ mktunes -m /mnt/ipod --volume 40
- 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
+ This would adjust the volume +40 percent. (You can also use '-100'
+ to get a silent 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 to
- convert the iTunesDB to an GNUtunesDB)
+- 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
- Use
-- gnupod_INIT.pl -m /mnt/ipod --france
-+ gnupod_INIT -m /mnt/ipod --france
+ 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)
- 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.texi 2021-07-21 19:22:17.708069968 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-07-21 19:22:17.900052181 -1200
-@@ -455,15 +455,15 @@
+
+@@ -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'.
- 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
+
+ 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.
--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 to convert the iTunesDB to an GNUtunesDB)
+ 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
+ opposite: it parses the XML file and creates an iTunesDB (for the iPod
+ and iTunes)
- Use
- @example
--gnupod_INIT.pl -m /mnt/ipod --france
-+gnupod_INIT -m /mnt/ipod --france
- @end example
+- Only mktunes.pl and tunes2pod 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.
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/CHANGES 2021-07-21 19:22:17.724068486 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-07-21 19:22:17.924049958 -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.pl to be passed on to mktunes.
-+ NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
+ 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' *before* using any other GNUpod commands.
+--- gnupod-0.99.8/README.developer 2021-07-22 21:32:46.038983432 +1400
++++ gnupod-0.99.8/README.developer.new 2021-07-22 21:32:52.671313412 +1400
+@@ -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
- *** OLD STUFF ***
-@@ -154,7 +154,7 @@
- - Added support for Podcast-Playlists.
- - Filter out bad chars from '--rename' command.
- - Added RVA2 (Normalize) patch by Peter Liljenberg
--- gnupod_INIT.pl: Added --noask option
-+- gnupod_INIT: Added --noask option
- - gnupod_addsong: --playlist can now be used multiple times
- - gnupod_addsong: added --playlist-is-podcast command
- - gnupod_addsong: Added workaround for glibc/linux/perl bug/problem (realloc() error)
-@@ -607,7 +607,7 @@
- * Can read from STDIN again (use 'gnupod_addsong -')
- (I forgot this feature ;) )
+ Release checklist
+Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-22 21:32:48.287095282 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-22 21:32:54.743416507 +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 '}};
--gnupod_INIT.pl
-+gnupod_INIT
- * Added '--france' switch (Limit volume to 100 db for
- 1.x Firmware)
---- gnupod-0.99.8/src/gnupod_addsong.pl 2021-07-21 19:22:16.040224491 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-07-21 19:22:17.944048105 -1200
-@@ -119,7 +119,7 @@
- delete($opts{artwork});
- }
- }
-- 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");
+Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
+--- 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-07-22 21:32:56.551506467 +1400
+@@ -46,8 +46,8 @@
}
-
- # Check volume adjustment options for sanity
---- gnupod-0.99.8/src/mktunes.pl 2021-07-21 19:22:16.052223379 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new 2021-07-21 19:22:17.964046252 -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/ext/Mktunes.pm 2021-07-21 19:22:16.096219303 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2021-07-21 19:22:17.984044400 -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/ext/XMLhelper.pm 2021-07-21 19:22:15.840243019 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2021-07-21 19:22:18.016041435 -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/gnupod_search.pl 2021-07-21 19:22:17.584081455 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-07-21 19:22:18.056037730 -1200
-@@ -89,7 +89,7 @@
+ ## 3. = no errors without Audio::FLAC! :)
+ if($@ || ref($ftag) ne "HASH") {
+- warn "gnupod_convert_FLAC.pl: Could not read FLAC-Metadata from $file\n";
+- warn "gnupod_convert_FLAC.pl: Maybe Audio::FLAC is not installed?\n";
++ warn "gnupod_convert_FLAC: Could not read FLAC-Metadata from $file\n";
++ warn "gnupod_convert_FLAC: Maybe Audio::FLAC is not installed?\n";
+ warn "Error: $@\n";
+ exit(1);
}
-
- 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_check.pl 2021-07-21 19:22:17.748066263 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-07-21 19:22:18.076035877 -1200
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2021-07-22 21:32:54.743416507 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-07-22 21:32:56.739515821 +1400
@@ -52,7 +52,7 @@
- usage($con->{status}."\n") if $con->{status};
-
- print "Pass 1: Checking Files in the GNUtunesDB.xml...\n";
-- 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");
-
- print "Pass 2: Checking Files on the iPod...\n";
- checkGNUtunes($con);
---- gnupod-0.99.8/src/gnupod_INIT.pl 2021-07-21 19:22:16.120217080 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-07-21 19:22:18.096034024 -1200
-@@ -28,7 +28,7 @@
- use vars qw(%opts);
-
-
--print "gnupod_INIT.pl ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_INIT ###__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..
-@@ -64,7 +64,7 @@
-
- btw: use 'gnupod_addsong -m $opts{mount} --restore'
- if you lost your songs on the iPod after using
-- gnupod_INIT.pl (..but this won't happen, because
-+ gnupod_INIT (..but this won't happen, because
- this tool has no bugs ;) )
- *********************************************************
-
-@@ -144,7 +144,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_INIT.pl [-h] [-m directory]
-+Usage: gnupod_INIT [-h] [-m directory]
-
- -h, --help display this help and exit
- --version output version information and exit
-@@ -165,7 +165,7 @@
-
- sub version {
- die << "EOF";
--gnupod_INIT.pl (gnupod) ###__VERSION__###
-+gnupod_INIT (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-07-21 19:22:17.768064410 -1200
-+++ gnupod-0.99.8/README.new 2021-07-21 19:22:18.116032171 -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 Add files
- gnupod_check Check for 'zombie' files
- gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ 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', ftyp=>'OGG' },
+ 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
+ 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
quilt --quiltrc debian/quiltrc push -a
Applying patch 01-new-perl.patch
patching file gnupod-0.99.8/src/ext/FileMagic.pm
@@ -3487,8 +3554,8 @@
dh_installdirs: warning: Compatibility levels before 10 are deprecated (level 9 in use)
/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
@@ -3568,12 +3635,14 @@
dpkg-buildpackage: info: binary-only upload (no source included)
dpkg-genchanges: info: not including original source code in upload
I: copying local configuration
+I: user script /srv/workspace/pbuilder/1252/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/1252/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/29936 and its subdirectories
-I: Current time: Wed Jul 21 19:22:38 -12 2021
-I: pbuilder-time-stamp: 1626938558
+I: removing directory /srv/workspace/pbuilder/1252 and its subdirectories
+I: Current time: Thu Jul 22 21:35:16 +14 2021
+I: pbuilder-time-stamp: 1626939316
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|