RUN: /bin/echo ['echo', 'Forking build subprocess...'] Forking build subprocess... RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot ['unpack-chroot', '1240156-2607213', '/home/buildd/filecache-default/288e062a96e1cc3ce5c3769a0faa0aba8ad224a1'] Synching the system clock with the buildd NTP service... 12 Sep 10:01:14 ntpdate[25809]: adjust time server 10.211.37.1 offset -0.065204 sec Unpacking chroot for build 1240156-2607213 RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot ['mount-chroot', '1240156-2607213'] Mounting chroot for build 1240156-2607213 RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model ['apply-ogre-model', '1240156-2607213', 'universe'] Attempting OGRE for universe in build-1240156-2607213 RUN: /usr/share/launchpad-buildd/slavebin/override-sources-list ['override-sources-list', '1240156-2607213', 'deb http://ftpmaster.internal/ubuntu karmic main universe'] Overriding sources.list in build-1240156-2607213 RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot ['update-debian-chroot', '1240156-2607213'] Updating debian chroot for build 1240156-2607213 Get:1 http://ftpmaster.internal karmic Release.gpg [189B] Get:2 http://ftpmaster.internal karmic Release [65.9kB] Get:3 http://ftpmaster.internal karmic/main Packages [1368kB] Get:4 http://ftpmaster.internal karmic/universe Packages [5121kB] Fetched 6554kB in 7s (918kB/s) Reading package lists... Reading package lists... Building dependency tree... Reading state information... The following NEW packages will be installed: insserv The following packages will be upgraded: binutils cpp-4.4 g++-4.4 gcc-4.4 gcc-4.4-base initscripts libc6 libc6-dev libgcc1 libgomp1 libncurses5 libpam-modules libpam-runtime libpam0g libstdc++6 libstdc++6-4.4-dev linux-libc-dev lsb-base ncurses-base ncurses-bin python2.6-minimal sysv-rc sysvinit-utils tzdata zlib1g 25 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Need to get 23.4MB/29.6MB of archives. After this operation, 426kB of additional disk space will be used. WARNING: The following packages cannot be authenticated! ncurses-bin linux-libc-dev libc6-dev libgomp1 cpp-4.4 gcc-4.4-base libgcc1 gcc-4.4 g++-4.4 libstdc++6-4.4-dev libstdc++6 zlib1g binutils libc6 libncurses5 ncurses-base sysvinit-utils libpam-modules libpam-runtime libpam0g lsb-base python2.6-minimal tzdata initscripts sysv-rc insserv Authentication warning overridden. Get:1 http://ftpmaster.internal karmic/main libc6-dev 2.10.1-0ubuntu9 [4957kB] Get:2 http://ftpmaster.internal karmic/main libgomp1 4.4.1-4ubuntu1 [27.3kB] Get:3 http://ftpmaster.internal karmic/main cpp-4.4 4.4.1-4ubuntu1 [3813kB] Get:4 http://ftpmaster.internal karmic/main gcc-4.4-base 4.4.1-4ubuntu1 [112kB] Get:5 http://ftpmaster.internal karmic/main libgcc1 1:4.4.1-4ubuntu1 [73.2kB] Get:6 http://ftpmaster.internal karmic/main gcc-4.4 4.4.1-4ubuntu1 [3076kB] Get:7 http://ftpmaster.internal karmic/main g++-4.4 4.4.1-4ubuntu1 [5122kB] Get:8 http://ftpmaster.internal karmic/main libstdc++6-4.4-dev 4.4.1-4ubuntu1 [1491kB] Get:9 http://ftpmaster.internal karmic/main libstdc++6 4.4.1-4ubuntu1 [347kB] Get:10 http://ftpmaster.internal karmic/main libc6 2.10.1-0ubuntu9 [4421kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 23.4MB in 1s (21.0MB/s) (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace ncurses-bin 5.7+20090607-1ubuntu1 (using .../ncurses-bin_5.7+20090803-2ubuntu1_i386.deb) ... Unpacking replacement ncurses-bin ... Setting up ncurses-bin (5.7+20090803-2ubuntu1) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace linux-libc-dev 2.6.31-8.28 (using .../linux-libc-dev_2.6.31-10.32_i386.deb) ... Unpacking replacement linux-libc-dev ... Preparing to replace libc6-dev 2.10.1-0ubuntu8 (using .../libc6-dev_2.10.1-0ubuntu9_i386.deb) ... Unpacking replacement libc6-dev ... Preparing to replace libgomp1 4.4.1-3ubuntu3 (using .../libgomp1_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement libgomp1 ... Preparing to replace cpp-4.4 4.4.1-3ubuntu3 (using .../cpp-4.4_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement cpp-4.4 ... Preparing to replace gcc-4.4-base 4.4.1-3ubuntu3 (using .../gcc-4.4-base_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement gcc-4.4-base ... Setting up gcc-4.4-base (4.4.1-4ubuntu1) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace libgcc1 1:4.4.1-3ubuntu3 (using .../libgcc1_1%3a4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement libgcc1 ... Setting up libgcc1 (1:4.4.1-4ubuntu1) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace gcc-4.4 4.4.1-3ubuntu3 (using .../gcc-4.4_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement gcc-4.4 ... Preparing to replace g++-4.4 4.4.1-3ubuntu3 (using .../g++-4.4_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement g++-4.4 ... Preparing to replace libstdc++6-4.4-dev 4.4.1-3ubuntu3 (using .../libstdc++6-4.4-dev_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement libstdc++6-4.4-dev ... Preparing to replace libstdc++6 4.4.1-3ubuntu3 (using .../libstdc++6_4.4.1-4ubuntu1_i386.deb) ... Unpacking replacement libstdc++6 ... Setting up libstdc++6 (4.4.1-4ubuntu1) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace zlib1g 1:1.2.3.3.dfsg-13ubuntu1 (using .../zlib1g_1%3a1.2.3.3.dfsg-13ubuntu3_i386.deb) ... Unpacking replacement zlib1g ... Setting up zlib1g (1:1.2.3.3.dfsg-13ubuntu3) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace binutils 2.19.51.20090827-1ubuntu1 (using .../binutils_2.19.91.20090910-0ubuntu1_i386.deb) ... Unpacking replacement binutils ... Preparing to replace libc6 2.10.1-0ubuntu8 (using .../libc6_2.10.1-0ubuntu9_i386.deb) ... Unpacking replacement libc6 ... Setting up libc6 (2.10.1-0ubuntu9) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace libncurses5 5.7+20090607-1ubuntu1 (using .../libncurses5_5.7+20090803-2ubuntu1_i386.deb) ... Unpacking replacement libncurses5 ... Setting up libncurses5 (5.7+20090803-2ubuntu1) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace ncurses-base 5.7+20090607-1ubuntu1 (using .../ncurses-base_5.7+20090803-2ubuntu1_all.deb) ... Unpacking replacement ncurses-base ... Setting up ncurses-base (5.7+20090803-2ubuntu1) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9364 files and directories currently installed.) Preparing to replace sysvinit-utils 2.86.ds1-61ubuntu16 (using .../sysvinit-utils_2.87dsf-4ubuntu1_i386.deb) ... Unpacking replacement sysvinit-utils ... Setting up sysvinit-utils (2.87dsf-4ubuntu1) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace libpam-modules 1.1.0-1ubuntu1 (using .../libpam-modules_1.1.0-2ubuntu1_i386.deb) ... Unpacking replacement libpam-modules ... Setting up libpam-modules (1.1.0-2ubuntu1) ... Installing new version of config file /etc/security/namespace.init ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace libpam-runtime 1.1.0-1ubuntu1 (using .../libpam-runtime_1.1.0-2ubuntu1_all.deb) ... Unpacking replacement libpam-runtime ... Setting up libpam-runtime (1.1.0-2ubuntu1) ... pam-auth-update: Local modifications to /etc/pam.d/common-*, not updating. pam-auth-update: Run pam-auth-update --force to override. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace libpam0g 1.1.0-1ubuntu1 (using .../libpam0g_1.1.0-2ubuntu1_i386.deb) ... Unpacking replacement libpam0g ... Setting up libpam0g (1.1.0-2ubuntu1) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace lsb-base 4.0-0ubuntu3 (using .../lsb-base_4.0-0ubuntu4_all.deb) ... Unpacking replacement lsb-base ... Setting up lsb-base (4.0-0ubuntu4) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace python2.6-minimal 2.6.2-0ubuntu3 (using .../python2.6-minimal_2.6.2-0ubuntu5_i386.deb) ... Unpacking replacement python2.6-minimal ... Setting up python2.6-minimal (2.6.2-0ubuntu5) ... (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace tzdata 2009l-1 (using .../tzdata_2009m-1_all.deb) ... Unpacking replacement tzdata ... Setting up tzdata (2009m-1) ... Current default time zone: 'Etc/UTC' Local time is now: Sat Sep 12 09:02:17 UTC 2009. Universal Time is now: Sat Sep 12 09:02:17 UTC 2009. Run 'dpkg-reconfigure tzdata' if you wish to change it. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9371 files and directories currently installed.) Preparing to replace initscripts 2.86.ds1-61ubuntu16 (using .../initscripts_2.87dsf-4ubuntu1_i386.deb) ... Removing unmodified and obsolete conffile /etc/init.d/bootlogs.sh ... Unpacking replacement initscripts ... Preparing to replace sysv-rc 2.86.ds1-61ubuntu16 (using .../sysv-rc_2.87dsf-4ubuntu1_all.deb) ... Unpacking replacement sysv-rc ... Selecting previously deselected package insserv. Unpacking insserv (from .../insserv_1.12.0-11_i386.deb) ... Setting up linux-libc-dev (2.6.31-10.32) ... Setting up libc6-dev (2.10.1-0ubuntu9) ... Setting up libgomp1 (4.4.1-4ubuntu1) ... Setting up cpp-4.4 (4.4.1-4ubuntu1) ... Setting up binutils (2.19.91.20090910-0ubuntu1) ... Setting up gcc-4.4 (4.4.1-4ubuntu1) ... Setting up insserv (1.12.0-11) ... Setting up sysv-rc (2.87dsf-4ubuntu1) ... Setting up initscripts (2.87dsf-4ubuntu1) ... Installing new version of config file /etc/init.d/bootlogd ... Installing new version of config file /etc/init.d/stop-bootlogd ... Installing new version of config file /etc/init.d/stop-bootlogd-single ... Installing new version of config file /etc/init.d/bootmisc.sh ... Installing new version of config file /etc/init.d/checkfs.sh ... Installing new version of config file /etc/init.d/checkroot.sh ... Installing new version of config file /etc/init.d/hostname.sh ... Installing new version of config file /etc/init.d/killprocs ... Installing new version of config file /etc/init.d/mountoverflowtmp ... Installing new version of config file /etc/init.d/rc.local ... Installing new version of config file /etc/init.d/rmnologin ... Installing new version of config file /etc/init.d/umountfs ... Installing new version of config file /etc/init.d/umountnfs.sh ... Installing new version of config file /etc/init.d/urandom ... Setting up libstdc++6-4.4-dev (4.4.1-4ubuntu1) ... Setting up g++-4.4 (4.4.1-4ubuntu1) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place RUN: /usr/share/launchpad-buildd/slavebin/sbuild-package ['sbuild-package', '1240156-2607213', '--nolog', '--batch', '--archive=ubuntu', '-A', '--purpose=PRIMARY', '--dist=karmic', '--comp=universe', 'gnupod-tools_0.99.7-2ubuntu1.dsc'] Initiating build 1240156-2607213 with 2 processor cores. Automatic build of gnupod-tools_0.99.7-2ubuntu1 on rothera by sbuild/i386 1.170.5 Build started at 20090912-1002 ****************************************************************************** gnupod-tools_0.99.7-2ubuntu1.dsc exists in cwd ** Using build dependencies supplied by package: Build-Depends: debhelper (>> 4.0.0) Build-Depends-Indep: perl, libxml-parser-perl, libxml-simple-perl, libunicode-string-perl, libfile-ncopy-perl, libmp3-info-perl, libogg-vorbis-header-pureperl-perl, libaudio-flac-header-perl, docbook-to-man, libdigest-sha1-perl, libtimedate-perl Checking for already installed source dependencies... debhelper: missing perl: already installed (5.10.0-24ubuntu2) libxml-parser-perl: missing libxml-simple-perl: missing libunicode-string-perl: missing libfile-ncopy-perl: missing libmp3-info-perl: missing libogg-vorbis-header-pureperl-perl: missing libaudio-flac-header-perl: missing docbook-to-man: missing libdigest-sha1-perl: missing libtimedate-perl: already installed (1.1600-9) Checking for source dependency conflicts... /usr/bin/sudo /usr/bin/apt-get --purge $CHROOT_OPTIONS -q -y install debhelper libxml-parser-perl libxml-simple-perl libunicode-string-perl libfile-ncopy-perl libmp3-info-perl libogg-vorbis-header-pureperl-perl libaudio-flac-header-perl docbook-to-man libdigest-sha1-perl Reading package lists... Building dependency tree... Reading state information... The following extra packages will be installed: bsdmainutils docbook file gettext gettext-base groff-base html2text intltool-debian libcroco3 libexpat1 libflac8 libglib2.0-0 libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl libmagic1 libogg0 libpcre3 libsp1c2 liburi-perl libwww-perl libxml-libxml-common-perl libxml-libxml-perl libxml-namespacesupport-perl libxml-sax-perl libxml2 man-db netbase po-debconf sgml-base sgml-data sp ucf xml-core Suggested packages: wamerican wordlist whois vacation dh-make psgml docbook-dsssl docbook-xml docbook-defguide cvs gettext-doc groff libdata-dump-perl libcrypt-ssleay-perl libio-socket-ssl-perl less www-browser libmail-box-perl sgml-base-doc perlsgml doc-html-w3 opensp libxml2-utils doc-base Recommended packages: curl wget lynx libglib2.0-data shared-mime-info libmailtools-perl libhtml-format-perl libcompress-bzip2-perl libxml-sax-expat-perl ifupdown libmail-sendmail-perl The following NEW packages will be installed: bsdmainutils debhelper docbook docbook-to-man file gettext gettext-base groff-base html2text intltool-debian libaudio-flac-header-perl libcroco3 libdigest-sha1-perl libexpat1 libfile-ncopy-perl libflac8 libglib2.0-0 libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl libmagic1 libmp3-info-perl libogg-vorbis-header-pureperl-perl libogg0 libpcre3 libsp1c2 libunicode-string-perl liburi-perl libwww-perl libxml-libxml-common-perl libxml-libxml-perl libxml-namespacesupport-perl libxml-parser-perl libxml-sax-perl libxml-simple-perl libxml2 man-db netbase po-debconf sgml-base sgml-data sp ucf xml-core 0 upgraded, 44 newly installed, 0 to remove and 0 not upgraded. Need to get 266kB/12.6MB of archives. After this operation, 44.1MB of additional disk space will be used. WARNING: The following packages cannot be authenticated! libmagic1 file libpcre3 libglib2.0-0 libxml2 netbase sgml-base ucf xml-core bsdmainutils gettext-base groff-base libexpat1 libhtml-tagset-perl liburi-perl libhtml-parser-perl libhtml-tree-perl libwww-perl libxml-parser-perl man-db html2text libcroco3 gettext intltool-debian po-debconf debhelper sgml-data docbook libsp1c2 sp docbook-to-man libogg0 libflac8 libaudio-flac-header-perl libdigest-sha1-perl libfile-ncopy-perl libunicode-string-perl libmp3-info-perl libogg-vorbis-header-pureperl-perl libxml-libxml-common-perl libxml-namespacesupport-perl libxml-sax-perl libxml-libxml-perl libxml-simple-perl Authentication warning overridden. Get:1 http://ftpmaster.internal karmic/universe libaudio-flac-header-perl 2.3-1 [31.2kB] Get:2 http://ftpmaster.internal karmic/main libdigest-sha1-perl 2.12-1 [26.5kB] Get:3 http://ftpmaster.internal karmic/universe libfile-ncopy-perl 0.34-1 [14.2kB] Get:4 http://ftpmaster.internal karmic/main libunicode-string-perl 2.09-3build2 [135kB] Get:5 http://ftpmaster.internal karmic/universe libmp3-info-perl 1.23-1 [45.1kB] Get:6 http://ftpmaster.internal karmic/universe libogg-vorbis-header-pureperl-perl 1.0-2 [13.2kB] debconf: delaying package configuration, since apt-utils is not installed Fetched 266kB in 0s (1618kB/s) Selecting previously deselected package libmagic1. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 9399 files and directories currently installed.) Unpacking libmagic1 (from .../libmagic1_5.03-1ubuntu1_i386.deb) ... Selecting previously deselected package file. Unpacking file (from .../file_5.03-1ubuntu1_i386.deb) ... Selecting previously deselected package libpcre3. Unpacking libpcre3 (from .../libpcre3_7.8-2ubuntu1_i386.deb) ... Selecting previously deselected package libglib2.0-0. Unpacking libglib2.0-0 (from .../libglib2.0-0_2.21.6-0ubuntu3_i386.deb) ... Selecting previously deselected package libxml2. Unpacking libxml2 (from .../libxml2_2.7.3.dfsg-1ubuntu1_i386.deb) ... Selecting previously deselected package netbase. Unpacking netbase (from .../netbase_4.35ubuntu1_all.deb) ... Selecting previously deselected package sgml-base. Unpacking sgml-base (from .../sgml-base_1.26_all.deb) ... Selecting previously deselected package ucf. Unpacking ucf (from .../ucf_3.0018ubuntu1_all.deb) ... Moving old data out of the way Selecting previously deselected package xml-core. Unpacking xml-core (from .../archives/xml-core_0.12_all.deb) ... Selecting previously deselected package bsdmainutils. Unpacking bsdmainutils (from .../bsdmainutils_6.1.10ubuntu4_i386.deb) ... Selecting previously deselected package gettext-base. Unpacking gettext-base (from .../gettext-base_0.17-6ubuntu2_i386.deb) ... Selecting previously deselected package groff-base. Unpacking groff-base (from .../groff-base_1.20.1-5_i386.deb) ... Selecting previously deselected package libexpat1. Unpacking libexpat1 (from .../libexpat1_2.0.1-4_i386.deb) ... Selecting previously deselected package libhtml-tagset-perl. Unpacking libhtml-tagset-perl (from .../libhtml-tagset-perl_3.20-2_all.deb) ... Selecting previously deselected package liburi-perl. Unpacking liburi-perl (from .../liburi-perl_1.37+dfsg-1ubuntu1_all.deb) ... Selecting previously deselected package libhtml-parser-perl. Unpacking libhtml-parser-perl (from .../libhtml-parser-perl_3.61-1_i386.deb) ... Selecting previously deselected package libhtml-tree-perl. Unpacking libhtml-tree-perl (from .../libhtml-tree-perl_3.23-1_all.deb) ... Selecting previously deselected package libwww-perl. Unpacking libwww-perl (from .../libwww-perl_5.831-1_all.deb) ... Selecting previously deselected package libxml-parser-perl. Unpacking libxml-parser-perl (from .../libxml-parser-perl_2.36-1.1build2_i386.deb) ... Selecting previously deselected package man-db. Unpacking man-db (from .../man-db_2.5.6-2_i386.deb) ... Selecting previously deselected package html2text. Unpacking html2text (from .../html2text_1.3.2a-14_i386.deb) ... Selecting previously deselected package libcroco3. Unpacking libcroco3 (from .../libcroco3_0.6.1-2_i386.deb) ... Selecting previously deselected package gettext. Unpacking gettext (from .../gettext_0.17-6ubuntu2_i386.deb) ... Selecting previously deselected package intltool-debian. Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ... Selecting previously deselected package po-debconf. Unpacking po-debconf (from .../po-debconf_1.0.16_all.deb) ... Selecting previously deselected package debhelper. Unpacking debhelper (from .../debhelper_7.3.15ubuntu1_all.deb) ... Selecting previously deselected package sgml-data. Unpacking sgml-data (from .../sgml-data_2.0.3_all.deb) ... Selecting previously deselected package docbook. Unpacking docbook (from .../archives/docbook_4.5-4_all.deb) ... Selecting previously deselected package libsp1c2. Unpacking libsp1c2 (from .../libsp1c2_1.3.4-1.2.1-47build2_i386.deb) ... Selecting previously deselected package sp. Unpacking sp (from .../sp_1.3.4-1.2.1-47build2_i386.deb) ... Selecting previously deselected package docbook-to-man. Unpacking docbook-to-man (from .../docbook-to-man_1%3a2.0.0-27_i386.deb) ... Selecting previously deselected package libogg0. Unpacking libogg0 (from .../libogg0_1.1.4~dfsg-1_i386.deb) ... Selecting previously deselected package libflac8. Unpacking libflac8 (from .../libflac8_1.2.1-2build1_i386.deb) ... Selecting previously deselected package libaudio-flac-header-perl. Unpacking libaudio-flac-header-perl (from .../libaudio-flac-header-perl_2.3-1_i386.deb) ... Selecting previously deselected package libdigest-sha1-perl. Unpacking libdigest-sha1-perl (from .../libdigest-sha1-perl_2.12-1_i386.deb) ... Selecting previously deselected package libfile-ncopy-perl. Unpacking libfile-ncopy-perl (from .../libfile-ncopy-perl_0.34-1_all.deb) ... Selecting previously deselected package libunicode-string-perl. Unpacking libunicode-string-perl (from .../libunicode-string-perl_2.09-3build2_i386.deb) ... Selecting previously deselected package libmp3-info-perl. Unpacking libmp3-info-perl (from .../libmp3-info-perl_1.23-1_all.deb) ... Selecting previously deselected package libogg-vorbis-header-pureperl-perl. Unpacking libogg-vorbis-header-pureperl-perl (from .../libogg-vorbis-header-pureperl-perl_1.0-2_all.deb) ... Selecting previously deselected package libxml-libxml-common-perl. Unpacking libxml-libxml-common-perl (from .../libxml-libxml-common-perl_0.13-6build2_i386.deb) ... Selecting previously deselected package libxml-namespacesupport-perl. Unpacking libxml-namespacesupport-perl (from .../libxml-namespacesupport-perl_1.09-3_all.deb) ... Selecting previously deselected package libxml-sax-perl. Unpacking libxml-sax-perl (from .../libxml-sax-perl_0.96+dfsg-1_all.deb) ... Selecting previously deselected package libxml-libxml-perl. Unpacking libxml-libxml-perl (from .../libxml-libxml-perl_1.69.ds-2_i386.deb) ... Selecting previously deselected package libxml-simple-perl. Unpacking libxml-simple-perl (from .../libxml-simple-perl_2.18-2_all.deb) ... Setting up libmagic1 (5.03-1ubuntu1) ... Setting up file (5.03-1ubuntu1) ... Setting up libpcre3 (7.8-2ubuntu1) ... Setting up libglib2.0-0 (2.21.6-0ubuntu3) ... Setting up libxml2 (2.7.3.dfsg-1ubuntu1) ... Setting up netbase (4.35ubuntu1) ... Setting up sgml-base (1.26) ... Setting up ucf (3.0018ubuntu1) ... Setting up xml-core (0.12) ... Setting up bsdmainutils (6.1.10ubuntu4) ... update-alternatives: using /usr/bin/bsd-write to provide /usr/bin/write (write) in auto mode. Setting up gettext-base (0.17-6ubuntu2) ... Setting up groff-base (1.20.1-5) ... Setting up libexpat1 (2.0.1-4) ... Setting up libhtml-tagset-perl (3.20-2) ... Setting up liburi-perl (1.37+dfsg-1ubuntu1) ... Setting up libhtml-parser-perl (3.61-1) ... Setting up libhtml-tree-perl (3.23-1) ... Setting up libwww-perl (5.831-1) ... Setting up libxml-parser-perl (2.36-1.1build2) ... Setting up man-db (2.5.6-2) ... Building database of manual pages ... ... skipping, since this is a buildd Setting up html2text (1.3.2a-14) ... Setting up libcroco3 (0.6.1-2) ... Setting up gettext (0.17-6ubuntu2) ... Setting up intltool-debian (0.35.0+20060710.1) ... Setting up po-debconf (1.0.16) ... Setting up debhelper (7.3.15ubuntu1) ... Setting up sgml-data (2.0.3) ... Setting up docbook (4.5-4) ... Setting up libsp1c2 (1.3.4-1.2.1-47build2) ... Setting up sp (1.3.4-1.2.1-47build2) ... Setting up docbook-to-man (1:2.0.0-27) ... Setting up libogg0 (1.1.4~dfsg-1) ... Setting up libflac8 (1.2.1-2build1) ... Setting up libaudio-flac-header-perl (2.3-1) ... Setting up libdigest-sha1-perl (2.12-1) ... Setting up libfile-ncopy-perl (0.34-1) ... Setting up libunicode-string-perl (2.09-3build2) ... Setting up libmp3-info-perl (1.23-1) ... Setting up libogg-vorbis-header-pureperl-perl (1.0-2) ... Setting up libxml-libxml-common-perl (0.13-6build2) ... Setting up libxml-namespacesupport-perl (1.09-3) ... Setting up libxml-sax-perl (0.96+dfsg-1) ... update-perl-sax-parsers: Registering Perl SAX parser XML::SAX::PurePerl with priority 10... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Creating config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libxml-libxml-perl (1.69.ds-2) ... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX::Parser with priority 50... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX with priority 50... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Replacing config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libxml-simple-perl (2.18-2) ... Processing triggers for libc6 ... ldconfig deferred processing now taking place Checking correctness of source dependencies... Toolchain package versions: libc6-dev_2.10.1-0ubuntu9 make_3.81-6 dpkg-dev_1.15.3.1ubuntu1 g++-4.4_4.4.1-4ubuntu1 gcc-4.4_4.4.1-4ubuntu1 binutils_2.19.91.20090910-0ubuntu1 libstdc++6_4.4.1-4ubuntu1 libstdc++6-4.4-dev_4.4.1-4ubuntu1 ------------------------------------------------------------------------------ sh: gcc: not found dpkg-source: warning: Couldn't determine gcc system type, falling back to default (native compilation) gpg: Signature made Sat Sep 12 09:54:18 2009 BST using RSA key ID 7D86500B gpg: Can't check signature: public key not found dpkg-source: extracting gnupod-tools in gnupod-tools-0.99.7 dpkg-source: unpacking gnupod-tools_0.99.7.orig.tar.gz dpkg-source: applying /home/buildd/build-1240156-2607213/gnupod-tools_0.99.7-2ubuntu1.diff.gz dpkg-buildpackage: set CFLAGS to default value: -g -O2 dpkg-buildpackage: set CPPFLAGS to default value: dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions dpkg-buildpackage: set FFLAGS to default value: -g -O2 dpkg-buildpackage: set CXXFLAGS to default value: -g -O2 dpkg-buildpackage: source package gnupod-tools dpkg-buildpackage: source version 0.99.7-2ubuntu1 dpkg-buildpackage: host architecture i386 /usr/bin/fakeroot debian/rules clean dh_testdir rm -rf gnupod-0.99.7 rm -f build-indep-stamp config-stamp dh_clean debian/rules build tar -xzf gnupod-0.99.7.tgz test -d gnupod-0.99.7 sh /build/buildd/gnupod-tools-0.99.7/debian/maintenance/01patch_rename.sh gnupod-0.99.7 0.99.7 Created gnupod-0.99.7/man/gnupod_convert_APE.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:38.000000000 +0000 @@ -39,7 +39,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.pl', ftyp=>'OGG' }, - 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' }, + 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; Patched gnupod-0.99.7/man/gnupod_INIT.pl.1.gz --- gnupod-0.99.7/doc/gnupod.html 2008-02-17 08:57:04.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:38.000000000 +0000 @@ -596,15 +596,15 @@

If the iPod is freshly formatted or you never used GNUpod before with this iPod, run -
 
gnupod_INIT.pl -m /mnt/ipod
+
 
gnupod_INIT -m /mnt/ipod
 

-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB +gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)

Use -
 
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). --- gnupod-0.99.7/doc/gnupod.info 2008-02-17 08:57:00.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:38.000000000 +0000 @@ -434,14 +434,14 @@ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run - gnupod_INIT.pl -m /mnt/ipod + gnupod_INIT -m /mnt/ipod - gnupod_INIT.pl will create the default directory tree and creates an + gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) Use - gnupod_INIT.pl -m /mnt/ipod --france + gnupod_INIT -m /mnt/ipod --france if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume). This only works for iPods running Firmware 1.x --- gnupod-0.99.7/doc/gnupod.texi 2008-02-17 08:56:52.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:38.000000000 +0000 @@ -455,15 +455,15 @@ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run @example -gnupod_INIT.pl -m /mnt/ipod +gnupod_INIT -m /mnt/ipod @end example -gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB +gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) Use @example -gnupod_INIT.pl -m /mnt/ipod --france +gnupod_INIT -m /mnt/ipod --france @end example if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume). --- gnupod-0.99.7/src/ext/XMLhelper.pm 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/ext/XMLhelper.pm.new 2009-09-12 09:02:38.000000000 +0000 @@ -69,7 +69,7 @@ my @aviable_targets = bsd_glob($xconn->{musicdir}."/*", 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.7/src/ext/Mktunes.pm 2007-10-04 20:30:43.000000000 +0000 +++ gnupod-0.99.7/src/ext/Mktunes.pm.new 2009-09-12 09:02:38.000000000 +0000 @@ -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.7/src/gnupod_INIT.pl 2007-12-08 10:10:29.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -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 ;) ) ********************************************************* @@ -142,7 +142,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 @@ -162,7 +162,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.7/src/gnupod_addsong.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -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"); } if($opts{playlist}) { #Create this playlist --- gnupod-0.99.7/src/gnupod_check.pl 2007-12-08 10:01:24.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -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.7/src/gnupod_search.pl 2008-02-17 08:51:25.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -89,7 +89,7 @@ } pview(undef,1); - GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n"); + GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n"); #XML::Parser finished, write new file if we deleted or renamed if($dirty) { GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}}); --- gnupod-0.99.7/src/mktunes.pl 2007-12-08 09:31:47.000000000 +0000 +++ gnupod-0.99.7/src/mktunes.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -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.7/tools/extractArtwork.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/tools/extractArtwork.pl.new 2009-09-12 09:02:38.000000000 +0000 @@ -22,7 +22,7 @@ my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0); $AWDB->LoadArtworkDb; -GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT.pl?\n"); +GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT?\n"); #print Data::Dumper::Dumper($AWDB); --- gnupod-0.99.7/CHANGES 2008-04-27 08:44:20.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:38.000000000 +0000 @@ -87,7 +87,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.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) @@ -540,7 +540,7 @@ * Can read from STDIN again (use 'gnupod_addsong.pl -') (I forgot this feature ;) ) -gnupod_INIT.pl +gnupod_INIT * Added '--france' switch (Limit volume to 100 db for 1.x Firmware) --- gnupod-0.99.7/FAQ 2005-05-01 16:42:51.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:38.000000000 +0000 @@ -48,7 +48,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.pl -m /mnt/ipod *blabla.mp3 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod' 5 umount the iPod and enjoy! --- gnupod-0.99.7/README 2007-09-26 16:05:54.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:38.000000000 +0000 @@ -29,7 +29,7 @@ GNUpod commands (cheatsheet) ---------------------------- -gnupod_INIT.pl INIT a new iPod (create empty Database + Directories) +gnupod_INIT INIT a new iPod (create empty Database + Directories) gnupod_addsong.pl Add files gnupod_check.pl Check for 'zombie' files gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) Patched gnupod-0.99.7/man/gnupod_addsong.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2007-11-28 06:20:43.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:38.000000000 +0000 @@ -57,7 +57,7 @@ # gnupod_search.match-once = 1 -# *** gnupod_addsong.pl *** +# *** gnupod_addsong *** ## Disable ID3V2 Tag reading # gnupod_addsong.disable-v2 = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:38.000000000 +0000 @@ -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
 

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.

-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: @@ -689,14 +689,14 @@ 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

@@ -878,7 +878,7 @@ 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.

@@ -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
 

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!

@@ -956,8 +956,8 @@
 
model = nano_3g
 

-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: @@ -1045,14 +1045,14 @@

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

-
 
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

I think nobody will ever have to do this.. but it maybe usefull to know that it's possible @@ -1216,7 +1216,7 @@

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 --- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:39.000000000 +0000 @@ -469,23 +469,23 @@ 4.3 Add files ============= -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 +gnupod_addsong like this: + gnupod_addsong -m /mnt/ipod /tmp/foo.mp3 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 (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. - 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. 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! @@ -669,8 +669,8 @@ model = nano_3g 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: @@ -728,12 +728,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 @@ -843,7 +843,7 @@ 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 +format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:39.000000000 +0000 @@ -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') @@ -656,14 +656,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 @@ -687,9 +687,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 @@ -747,14 +747,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) @@ -851,7 +851,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.7/src/gnupod_addsong.pl 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -37,7 +37,7 @@ use constant MACTIME => GNUpod::FooBar::MACTIME; use vars qw(%opts %dupdb_normal %dupdb_lazy %dupdb_podcast $int_count %podcast_infos %podcast_channel_infos %per_file_info); -print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n"; $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop @@ -693,7 +693,7 @@ #Sighandler sub handle_int { if($int_count) { - warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n"; + warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n"; $int_count--; } else { @@ -708,7 +708,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ... +Usage: gnupod_addsong [-h] [-m directory] File1 File2 ... -h, --help display this help and exit --version output version information and exit @@ -752,7 +752,7 @@ sub version { die << "EOF"; -gnupod_addsong.pl (gnupod) ###__VERSION__### +gnupod_addsong (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2008 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/src/gnupod_check.pl 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -85,7 +85,7 @@ if($TRACKER{ERR} > 25) { print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n"; print " '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n"; - print " 'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n"; + print " 'gnupod_addsong --restore'. This would wipe all your Playlists\n"; print " but would cure your iPod for sure.\n"; } } --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:39.000000000 +0000 @@ -7,7 +7,7 @@ flooded me with patches, many thanks to him: - Fix DBID width in gnupod_search.pl output - Added --bitrate switch to gnupod_search.pl -- Added --podcast-files-limit switch to gnupod_addsong.pl +- Added --podcast-files-limit switch to gnupod_addsong - Added Podcast-Date patch (GNUpod now depends on Date::Parse) - Added --unique switch to extractArtwork.pl - Added xescaped() patch. GNUpod will now store @@ -26,7 +26,7 @@ - Use udevinfo to find the iPods Firewire-GUID (as /proc/bus/usb/devices is depricated) - Support for iPhone: Edit ~/.gnupodrc and add 'model = iphone' - Some documentation 'fixes', thanks a lot to Toby Cabot -- gnupod_addsong.pl: replace wget with curl +- gnupod_addsong: replace wget with curl - Use binmode() more often to help Win32 @@ -88,9 +88,9 @@ - Filter out bad chars from '--rename' command. - Added RVA2 (Normalize) patch by Peter Liljenberg - 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) +- 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) - Raised video-bitrate for on-the-fly converting - Added configuration option 'automktunes'. Setting 'automktunes = 1' inside ~/.gnupodrc eliminates the need @@ -117,13 +117,13 @@ ------- - iPod-Video support - gnupod_addsong.pl can now read/add .mp4 files + gnupod_addsong can now read/add .mp4 files Converting .avi (RIFF) files on-the-fly works only IF your ffmpeg binary has AAC Support! (Adding preencoded files works witout ffmpeg) - Try: gnupod_addsong.pl --decode=video *.avi + Try: gnupod_addsong --decode=video *.avi - Fixes a playlist problem with iTunes5 (new 100 Mhods) @@ -152,8 +152,8 @@ Summary ------- -- gnupod_addsong.pl can now fetch podcast-rss feeds! - Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast' +- gnupod_addsong can now fetch podcast-rss feeds! + Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' - Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl @@ -215,8 +215,8 @@ - Added support for multiple On-The-Go playlists. -- gnupod_addsong.pl can now reenocde aac and mp3 'on-the-fly' - Usage: gnupod_addsong.pl --reencode 6 *.mp3 +- gnupod_addsong can now reenocde aac and mp3 'on-the-fly' + Usage: gnupod_addsong --reencode 6 *.mp3 This would reenocde everything with 'lame -V 6' Use this if you don't have much space left (iPod Shuffle?!) Note: The Reencode option also changes the quality of @@ -273,7 +273,7 @@ - You can now add MIDI files ;-) (with timidity) -- Added --set-songnum option for gnupod_addsong.pl +- Added --set-songnum option for gnupod_addsong - Rewritten ConverterCore.. shouldn't break anything... @@ -297,18 +297,18 @@ Summary ------- -- Changed --decode switch from gnupod_addsong.pl +- Changed --decode switch from gnupod_addsong You can now select the output format of --decode -> pcm(old default) / MP3 (using lame) / AAC (using FAAC) - Example: # gnupod_addsong.pl --decode=mp3 *.flac + Example: # gnupod_addsong --decode=mp3 *.flac (Idea and original patch from ) - GNUpod can now also convert OGG-Vorbis files (Use --decode=XXX, same as FLAC) -- Added --playlist=STRING switch to gnupod_addsong.pl +- Added --playlist=STRING switch to gnupod_addsong This creates the playlist 'STRING' and adds all songs - passed to gnupod_addsong.pl to this playlist. + passed to gnupod_addsong to this playlist. (Thanks to Bob Cotton) - Many changes for the M4A parser, should work better now @@ -336,21 +336,21 @@ (Needs JavaScript + DOM => Mozilla) ** SMARTPLAYLIST SYNTAX CHANGED ** -- gnupod_addsong.pl can now add FLAC files. +- gnupod_addsong can now add FLAC files. 'flac' needs to be in your $PATH and it's disabled - per default. (Enable it using gnupod_addsong.pl --decode + per default. (Enable it using gnupod_addsong --decode or set 'gnupod_addsong.decode=1' in your config) -- gnupod_addsong.pl can read ALAC (Apples Loseless Audio Codec) +- gnupod_addsong can read ALAC (Apples Loseless Audio Codec) files (iTunes creates normal .m4a files) - Polished Playcounts parser (no hardcoded offsets anymore) - added '--disable-v2' and '--disable-v1' to - gnupod_addsong.pl (Disable parsing of ID3TAG version X) + gnupod_addsong (Disable parsing of ID3TAG version X) - Fixed small bug with .m4a files and added more fields. - gnupod_addsong.pl can now read M4A/AAC files from www.allofmp3.com + gnupod_addsong can now read M4A/AAC files from www.allofmp3.com - added tools/m4a-info.pl: Use this tool to read Title/Artist tags from .m4a files (not installed by 'make install') @@ -358,7 +358,7 @@ - You can modify the output of gnupod_search.pl using --view (See 'gnupod_search.pl --help') -- gnupod_addsong.pl checks for wrong extensions +- gnupod_addsong checks for wrong extensions (like a mp3-file called 'test.wav'). The iPod wouldn't play such a file. @@ -385,7 +385,7 @@ - I bought one myself -- gnupod_addsong.pl understands .m4a files +- gnupod_addsong understands .m4a files (= AAC Files written by iTunes) I don't know if it works with DRM files (.m4p?) I don't have any DRM files and i'm not interested @@ -409,7 +409,7 @@ mktunes.pl will drop old (= now invalid) ratings, no autoconvert... sorry.. but does anyone care? -- gnupod_addsong.pl understands ID3v2.2 tags +- gnupod_addsong understands ID3v2.2 tags - You'll have to install Digest::MD5 @@ -454,7 +454,7 @@ Summary: -------- - Reading MusicMatch files should work (again) -- gnupod_addsong.pl can add WAVE files +- gnupod_addsong can add WAVE files - Parsing large iTunesDB files should be faster (-> we skip the MainPlayList) @@ -513,7 +513,7 @@ * Added SPL-Write support * regex-matches are sorted by id -gnupod_addsong.pl: +gnupod_addsong: * duplicate-checker displayed the wrong number of the dup, works again @@ -536,8 +536,8 @@ * Playlist-Cleanup works now.. (another stupid bug.. :-/) * Added '--title' switch to usage -gnupod_addsong.pl: - * Can read from STDIN again (use 'gnupod_addsong.pl -') +gnupod_addsong: + * Can read from STDIN again (use 'gnupod_addsong -') (I forgot this feature ;) ) gnupod_INIT @@ -590,7 +590,7 @@ Use an UNICODE Texteditor to edit the GNUtunesDB.. (Like 'yudit' or the gnome2 texteditor) Your old latin1 GNUtunesDB will get converted to an - UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or + UTF8 version after running tunes2pod.pl/gnupod_addsong or gnupod_delete.pl UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more @@ -633,7 +633,7 @@ in the GNUtunesDB - file - mktunes.pl no longer accepts when was not found. -- gnupod_addsong.pl handles long filenames now better +- gnupod_addsong handles long filenames now better - Timestamp should now be set correct (utime(undef,undef.. didn't work on every OS..) - new playist keywords. You can now use /dev/null | tail +4 --- gnupod-0.99.7/README 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:39.000000000 +0000 @@ -30,7 +30,7 @@ ---------------------------- gnupod_INIT INIT a new iPod (create empty Database + Directories) -gnupod_addsong.pl Add files +gnupod_addsong Add files gnupod_check.pl Check for 'zombie' files gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) Patched gnupod-0.99.7/man/gnupod_check.pl.1.gz --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:39.000000000 +0000 @@ -1040,11 +1040,11 @@ 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.

-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

--- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:39.000000000 +0000 @@ -723,10 +723,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. - 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' --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:39.000000000 +0000 @@ -742,11 +742,11 @@ 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. -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} @example --- gnupod-0.99.7/src/gnupod_check.pl 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -32,7 +32,7 @@ #Get maximal Pathlength from XMLHelper constant my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH; -print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; #Don't add xml and itunes opts.. we *NEED* the mount opt to be set.. @@ -121,7 +121,7 @@ my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path}); my $id = $el->{file}->{id}; - my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie"; + my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie"; $TRACKER{SIZE}+=int($el->{file}->{filesize}); $TRACKER{TIME}+=int($el->{file}->{time}); @@ -222,8 +222,8 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: gnupod_check.pl [-h] [-m directory] -gnupod_check.pl checks for 'lost' files +Usage: gnupod_check [-h] [-m directory] +gnupod_check checks for 'lost' files -h, --help display this help and exit --version output version information and exit @@ -237,7 +237,7 @@ sub version { die << "EOF"; -gnupod_check.pl (gnupod) ###__VERSION__### +gnupod_check (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2004 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:39.000000000 +0000 @@ -191,14 +191,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. -- 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 - Updated documentation: Tell how to extract a @@ -365,7 +365,7 @@ - Fixed some SmartPlaylist stuff and added support for last playtime -- Added gnupod_check.pl, it check's for 'lost' files +- Added gnupod_check, it check's for 'lost' files - I changed the 'build' system. Btw, you can now uninstall GNUpod using 'make uninstall' .. but why? :) --- gnupod-0.99.7/README 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:39.000000000 +0000 @@ -31,7 +31,7 @@ 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.pl Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB Created gnupod-0.99.7/man/gnupod_convert_FLAC.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:39.000000000 +0000 @@ -37,7 +37,7 @@ # my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'}, - 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'}, + 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'}, 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/src/gnupod_convert_FLAC.pl 2008-01-06 19:40:34.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_convert_FLAC.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -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); } Created gnupod-0.99.7/man/gnupod_convert_MIDI.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:39.000000000 +0000 @@ -36,7 +36,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', ftyp=>'FLAC'}, 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, Created gnupod-0.99.7/man/gnupod_convert_OGG.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:39.000000000 +0000 @@ -38,7 +38,7 @@ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'}, 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'}, - 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, + 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/src/gnupod_convert_OGG.pl 2008-01-06 19:39:24.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_convert_OGG.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -48,8 +48,8 @@ } ## 3. = no errors if($@) { - warn "gnupod_convert_OGG.pl: Could not read OGG-Metadata from $file (".ref($ftag).")\n"; - warn "gnupod_convert_OGG.pl: Maybe $ogg_pmod is not installed?\n"; + warn "gnupod_convert_OGG: Could not read OGG-Metadata from $file (".ref($ftag).")\n"; + warn "gnupod_convert_OGG: Maybe $ogg_pmod is not installed?\n"; warn "Error: *$@*\n"; exit(1); } Created gnupod-0.99.7/man/gnupod_convert_RIFF.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:39.000000000 +0000 @@ -40,7 +40,7 @@ '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.pl', ftyp=>'RIFF', magic2=>'AVI '}}; + 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:39.000000000 +0000 @@ -74,7 +74,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 Patched gnupod-0.99.7/man/gnupod_otgsync.pl.1.gz --- gnupod-0.99.7/src/ext/FooBar.pm 2007-12-08 11:18:07.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:39.000000000 +0000 @@ -149,11 +149,11 @@ } ###################################################################### -# Call gnupod_otgsync.pl +# Call gnupod_otgsync sub StartOnTheGoSync { my($con) = @_; - my $XBIN = "$con->{bindir}/gnupod_otgsync.pl"; + my $XBIN = "$con->{bindir}/gnupod_otgsync"; if(-x $XBIN) { { --- gnupod-0.99.7/src/gnupod_otgsync.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -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: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n"; } ##Check if GNUtunesDB <-> iTunesDB is really in-sync --- gnupod-0.99.7/tools/otgtest.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/tools/otgtest.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -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.7/CHANGES 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:39.000000000 +0000 @@ -443,7 +443,7 @@ QTfile.pm * A dirty QuickTime parser -gnupod_otgsync.pl +gnupod_otgsync * A new tool, don't use it yourself :) It's only used internal. --- gnupod-0.99.7/README 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:39.000000000 +0000 @@ -32,7 +32,7 @@ gnupod_INIT INIT a new iPod (create empty Database + Directories) gnupod_addsong Add files gnupod_check Check for 'zombie' files -gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) +gnupod_otgsync Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml Patched gnupod-0.99.7/man/gnupod_search.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:39.000000000 +0000 @@ -51,7 +51,7 @@ ## Enforce iPod serial number: # mktunes.fwguid = 000ba3100310abcf -# *** gnupod_search.pl *** +# *** gnupod_search *** ## Always match only once # gnupod_search.match-once = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:39.000000000 +0000 @@ -722,15 +722,15 @@

-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"
 

-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.

@@ -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 @@ -960,9 +960,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.7/doc/gnupod.info 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:39.000000000 +0000 @@ -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) @@ -672,10 +672,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. --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:39.000000000 +0000 @@ -529,33 +529,33 @@ @node Search files @section Search files -GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files. +GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files. Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run @example -gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" +gnupod_search -m /mnt/ipod -a "Schlummiguch" @end example -Note: gnupod_search.pl assumes RegExp input. -Please have a look at @code{@w{gnupod_search.pl --help}} for more information. +Note: gnupod_search assumes RegExp input. +Please have a look at @code{@w{gnupod_search --help}} for more information. @node Remove files @section Remove files -Removing files is done using @code{@w{gnupod_search.pl -d}}. +Removing files is done using @code{@w{gnupod_search -d}}. To Remove all files from the artist 'Schlummiguch', run @example -gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d +gnupod_search -m /mnt/ipod -a "Schlummiguch" -d @end example @node Edit tags @section Edit tags -You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..) +You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..) @example -gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100" +gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100" @end example This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and @@ -693,10 +693,10 @@ @end example -Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example: +Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example: @example # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i -gnupod_search.pl --artwork cover.jpg --album Katamari +gnupod_search --artwork cover.jpg --album Katamari @end example don't forget to run @code{@w{mktunes.pl}} afterwards. --- gnupod-0.99.7/src/gnupod_search.pl 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:39.000000000 +0000 @@ -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.7/CHANGES 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:40.000000000 +0000 @@ -5,8 +5,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 @@ -142,7 +142,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) @@ -277,7 +277,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: @@ -355,8 +355,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 @@ -531,7 +531,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 @@ -615,7 +615,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.7/AUTHORS 2003-12-27 16:58:10.000000000 +0000 +++ gnupod-0.99.7/AUTHORS.new 2009-09-12 09:02:40.000000000 +0000 @@ -10,7 +10,7 @@ Contributed to the 'old' GNUpod (< 0.9) - gnupod_list.pl - gnupod_renumber.pl - - gnupod_search.pl (Most important tool ;) ) + - gnupod_search (Most important tool ;) ) And also many thanks to the many other people --- gnupod-0.99.7/FAQ 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:40.000000000 +0000 @@ -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? @@ -134,13 +134,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.7/README 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:40.000000000 +0000 @@ -33,7 +33,7 @@ gnupod_addsong Add files gnupod_check Check for 'zombie' files gnupod_otgsync Handles On-The-Go Sync (not for humans) -gnupod_search.pl Search ;) +gnupod_search Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml Patched gnupod-0.99.7/man/mktunes.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:40.000000000 +0000 @@ -21,9 +21,9 @@ ## * nano_3g (the late 2007 nano) # model = video -## Let GNUpod call mktunes.pl itself. +## Let GNUpod call mktunes itself. ## This may cause a slow-down when dealing with -## large databases on slow CPUs because mktunes.pl +## large databases on slow CPUs because mktunes ## may take some time to complete # automktunes = 1 @@ -31,7 +31,7 @@ ##### NON GLOBAL OPTIONS ###### -# *** mktunes.pl *** +# *** mktunes *** ## Specify the iPods name # mktunes.ipod-name = Wurstli @@ -45,7 +45,7 @@ # tunes2pod.force = 1 -# *** mktunes.pl *** +# *** mktunes *** ## Set --volume boost to +10 percent # mktunes.volume = +10 ## Enforce iPod serial number: --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:40.000000000 +0000 @@ -475,7 +475,7 @@

Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod. -Mount the iPod and run mktunes.pl to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes +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:

@@ -784,7 +784,7 @@ 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 :-) @@ -911,7 +911,7 @@ </playlist>

-Such a playlist will show up as a Podcast after running mktunes.pl +Such a playlist will show up as a Podcast after running mktunes

gnupod_addsong can also download podcasts and create such playlists itself: @@ -965,7 +965,7 @@ gnupod_search --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. @@ -990,32 +990,32 @@

-Before umounting the iPod, you have to call mktunes.pl which will +Before umounting the iPod, you have to call mktunes which will parse the GNUtunesDB XML file and convert it into the iTunesDB format.

Simply run -
 
mktunes.pl -m /mnt/ipod
+
 
mktunes -m /mnt/ipod
 

-Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you 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
 

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
 

-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)

@@ -1145,7 +1145,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.

@@ -1211,16 +1211,16 @@ Everytime you run tunes2pod.pl, 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)

-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong 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.

If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before* --- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:40.000000000 +0000 @@ -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: @@ -677,7 +677,7 @@ # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i gnupod_search --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 @@ -690,28 +690,28 @@ 4.10 Unplug the iPod ==================== -Before umounting the iPod, you have to call `mktunes.pl' which will +Before umounting the iPod, you have to call `mktunes' which will parse the GNUtunesDB XML file and convert it into the iTunesDB format. Simply run - mktunes.pl -m /mnt/ipod + mktunes -m /mnt/ipod - Note: Since GNUpod 0.91, mktunes.pl has a '-volume' option which you + Note: Since GNUpod 0.91, mktunes has a '-volume' option which you can use to boost the Volume. - mktunes.pl -m /mnt/ipod --volume 40 + mktunes -m /mnt/ipod --volume 40 This would adjust the volume +40 percent. (You can also use '-100' to get a silent iPod ;) ) - After `mktunes.pl' is done, you can umount the iPod and remove the + After `mktunes' is done, you can umount the iPod and remove the sbp2 module umount /mnt/ipod rmmod sbp2 Added songs won't be visible on the iPod if you did not run -mktunes.pl before umounting the iPod. (If you forgot to run -`mktunes.pl' before unpluging/umounting, simply mount the iPod again +mktunes before umounting the iPod. (If you forgot to run +`mktunes' before unpluging/umounting, simply mount the iPod again and run it)  @@ -801,7 +801,7 @@ should be autodetected on GNU/Linux (via `/proc/bus/usb/devices') and Solaris (via `prtconf -v'). If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct -value using the `--fwguid' switch of `mktunes.pl'. +value using the `--fwguid' switch of `mktunes'.  File: gnupod.info, Node: Problems, Next: GNU Free Documentation License, Prev: Using GNUpod, Up: Top @@ -838,17 +838,17 @@ understand by humans and easy to edit by hand. Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and -converted into an XML File (the GNUtunesDB). `mktunes.pl' does the +converted into an XML File (the GNUtunesDB). `mktunes' does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) - Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB + Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the GNUtunesDB (by hand or using -gnupod_something.pl) you'll have to run `mktunes.pl'. +gnupod_something.pl) you'll have to run `mktunes'. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run `tunes2pod.pl' *before* using any other GNUpod commands. --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:40.000000000 +0000 @@ -359,7 +359,7 @@ Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano). Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod. -Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes +Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}: First you need to get a new Firmware image. @@ -561,7 +561,7 @@ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and sets the rating to 5 Stars (5*20=100) -Don't forget to run mktunes.pl! +Don't forget to run mktunes! You could also edit the GNUtunesDB.xml with a text editor :-) @@ -654,7 +654,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_addsong can also download podcasts and create such playlists itself: @@ -699,7 +699,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. 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. @@ -708,32 +708,32 @@ @node Unplug the iPod @section Unplug the iPod -Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will +Before umounting the iPod, you have to call @code{@w{mktunes}} which will parse the GNUtunesDB XML file and convert it into the iTunesDB format. Simply run @example -mktunes.pl -m /mnt/ipod +mktunes -m /mnt/ipod @end example -Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to +Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to boost the Volume. @example -mktunes.pl -m /mnt/ipod --volume 40 +mktunes -m /mnt/ipod --volume 40 @end example This would adjust the volume +40 percent. (You can also use '-100' to get a silent iPod ;) ) -After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module +After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module @example umount /mnt/ipod rmmod sbp2 @end example -Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. -(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it) +Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. +(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it) @node Recovering files @@ -813,7 +813,7 @@ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}). If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch -of @code{mktunes.pl}. +of @code{mktunes}. @c =========================================================================================== @@ -847,14 +847,14 @@ Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). -@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the +@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) -Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the -GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}. +GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* using any other GNUpod commands. --- gnupod-0.99.7/src/ext/FooBar.pm 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:40.000000000 +0000 @@ -104,10 +104,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.7/src/ext/Mktunes.pm 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/ext/Mktunes.pm.new 2009-09-12 09:02:40.000000000 +0000 @@ -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.7/src/gnupod_INIT.pl 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -120,9 +120,9 @@ $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount}); } else { - #No iTunesDB, run mktunes.pl - print "No iTunesDB found, running mktunes.pl\n"; - $t2pfail = system("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}"); + #No iTunesDB, run mktunes + print "No iTunesDB found, running mktunes\n"; + $t2pfail = system("$con->{bindir}/mktunes", "-m" ,"$opts{mount}"); } if($t2pfail) { @@ -152,7 +152,7 @@ Maximal-volume without this is ~104dB (VERY LOUD) *WARNING* This works only for iPods running Firmware 1.x (1st & 2nd generation) - You can also use mktunes.pl '--volume PERCENT' + You can also use mktunes '--volume PERCENT' to adjust the volume (Works with Firmware 1.x AND 2.x) --noask Do not wait for any user input --- gnupod-0.99.7/src/gnupod_addsong.pl 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -196,11 +196,11 @@ #This breaks perl < 5.8 if we don't use int(time()) ! $fh->{addtime} = int(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.7/src/gnupod_otgsync.pl 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -129,9 +129,9 @@ sub newfile { my($el) = @_; - #This has to be 'in-sync' with the mktunes.pl method + #This has to be 'in-sync' with the mktunes method # (GNUtunesDB_id <-> iTunesDB_id) - # in mktunes.pl, every {file}->{id})); --- gnupod-0.99.7/src/gnupod_search.pl 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -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.7/src/mktunes.pl 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/mktunes.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -37,7 +37,7 @@ my %opts = (); -print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n"; +print "mktunes ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s"); @@ -140,7 +140,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: mktunes.pl [-h] [-m directory] [-v VALUE] +Usage: mktunes [-h] [-m directory] [-v VALUE] -h, --help display this help and exit --version output version information and exit @@ -159,7 +159,7 @@ # Displays current version sub version { die << "EOF"; -mktunes.pl (gnupod) ###__VERSION__### +mktunes (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2007 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:40.000000000 +0000 @@ -51,7 +51,7 @@ ------- - Added README_FIRMWARE.txt file - Added compilation-patch, thanks to Ray Lortie -- Rewrote mktunes.pl to be faster and more readable :-) +- Rewrote mktunes to be faster and more readable :-) - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) ) Apple attempted to lockout non-iTunes software by implementing an obscure @@ -94,8 +94,8 @@ - Raised video-bitrate for on-the-fly converting - Added configuration option 'automktunes'. Setting 'automktunes = 1' inside ~/.gnupodrc eliminates the need - to call mktunes.pl after adding/deleting/renaming songs because GNUpod - will call mktunes.pl itself. + to call mktunes after adding/deleting/renaming songs because GNUpod + will call mktunes itself. - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect written mhip size. Playlist parsing has also been rewritten and cleaned up. - Bugfix: Do not detect PCM files as movies when using --decode @@ -155,7 +155,7 @@ - gnupod_addsong can now fetch podcast-rss feeds! Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' -- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl +- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work. Thanks to Chris Abajian for reporting this issue. @@ -225,7 +225,7 @@ - Added support for m4a 'gnre' tags - Fixed some iPod-Shuffle issues - * mktunes.pl removes the iTunesShuffle leftover + * mktunes removes the iTunesShuffle leftover - Remove TARGET-File if File::Copy() failed for any reason => Better handling of 'disk full' but still not perfect @@ -406,7 +406,7 @@ - Changed rating-schema to match SPL-Rating -> Rating 5 is now 100 (newrating=oldrating*20) - mktunes.pl will drop old (= now invalid) ratings, + mktunes will drop old (= now invalid) ratings, no autoconvert... sorry.. but does anyone care? - gnupod_addsong understands ID3v2.2 tags @@ -490,7 +490,7 @@ a 'feature' of iTunes) * Added 'eq syntax check', you can use (since 0.90) 'eq="#!#NUMBER#!#' to specify the EQ-Setting per song. - mktunes.pl will now check if this syntax is correct. + mktunes will now check if this syntax is correct. (You'll see a warning if it failed) * Fixed get_string() to handle null-size strings correct * Changed some internal things (using hrefs.. etc) @@ -509,7 +509,7 @@ * Added paranoia checks (stricter parsing) * Added SPL-Read code (BETA!) -mktunes.pl +mktunes * Added SPL-Write support * regex-matches are sorted by id @@ -544,13 +544,13 @@ * Added '--france' switch (Limit volume to 100 db for 1.x Firmware) -mktunes.pl +mktunes * New Playlist-Code.. MUCH faster now (Wow.. again? no.. the code of 0.90 was VERY slow with many files (~3000) and more than ~15 big playlists) * Added '--volume' switch: Adjust the volume on the iPod! - Use something like 'mktunes.pl --volume 70' to boost + Use something like 'mktunes --volume 70' to boost the volume by 70% (same as volume="70" in the GNUtunesDB) XMLhelper.pm @@ -604,9 +604,9 @@ - Rewritten Playlistcode for tunes2pod.pl - tunes2pod.pl doesn't kill your empty GNUtunesDB anymore if it can't find the iTunesDB -- mktunes.pl uses now binmode(), maybe this helps +- mktunes uses now binmode(), maybe this helps RedHat 8 ? .. (and win32 ;) ) -- mktunes.pl is now *much* faster!! +- mktunes is now *much* faster!! - the GNUtunesDB written by gnupod_delete.pl looks nicer now :) (id= is now always the first element..) @@ -631,7 +631,7 @@ written by MusicMatch - Playlists are now sorted on the iPod as they are found in the GNUtunesDB - file -- mktunes.pl no longer accepts when was +- mktunes no longer accepts when was not found. - gnupod_addsong handles long filenames now better - Timestamp should now be set correct --- gnupod-0.99.7/BUGS 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/BUGS.new 2009-09-12 09:02:40.000000000 +0000 @@ -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.7/README.about_m4a 2009-09-12 09:02:39.000000000 +0000 +++ gnupod-0.99.7/README.about_m4a.new 2009-09-12 09:02:40.000000000 +0000 @@ -30,6 +30,6 @@ Now you can add the file using gnupod_addsong # gnupod_addsong file.m4a -# mktunes.pl +# mktunes :) --- gnupod-0.99.7/FAQ 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:40.000000000 +0000 @@ -50,13 +50,13 @@ 1 Mount the iPod (eg. /mnt/ipod) 2 run gnupod_INIT -m /mnt/ipod 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3 - 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod' + 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod' 5 umount the iPod and enjoy! If you add more songs, repeat step 1-5 (without step 2!) : 1 Mount the iPod 2 use gnupod_addsong - 3 build the database with mktunes.pl + 3 build the database with mktunes 4 umount Please read the README file and the info page @@ -73,7 +73,7 @@ But there are some GNUpod 'forks' -- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes.pl / iTunesDB.pm) +- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes / iTunesDB.pm) - Rhythmbox http://www.rhythmbox.org/ (Uses GTKpod code) (..and some companies created commercial iPod apps.. and i'm sure @@ -156,7 +156,7 @@ To fix it: - Open the GNUtunesDB.xml (/mnt/ipod/iPod_Control/.gnupod/) - Search the faulty entries, fix them and save -- Run mktunes.pl to update the iPod. +- Run mktunes to update the iPod. 10. Why? @@ -180,7 +180,7 @@ But the iTunesDB-format isn't so complicated if you know how to write the specific parts and how you'll have to assemble them. -Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes.pl +Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes ..or feel free to ask me questions about it: --- gnupod-0.99.7/README 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:40.000000000 +0000 @@ -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.pl Convert the iTunesDB into a GNUtunesDB.xml -You'll have to use mktunes.pl if you added/deleted/changed something +You'll have to use mktunes if you added/deleted/changed something on the iPod. Patched gnupod-0.99.7/man/tunes2pod.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:40.000000000 +0000 @@ -40,7 +40,7 @@ ## Uncomment this to skip 'on-the-go' sync # otgsync.nosync = 1 -# *** tunes2pod.pl *** +# *** tunes2pod *** ## Uncomment to set '--force' switch to true (DANGEROUS) # tunes2pod.force = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:40.000000000 +0000 @@ -600,7 +600,7 @@

gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB -(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) +(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)

Use @@ -1082,11 +1082,11 @@ 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.

Mount the iPod and run -
 
tunes2pod.pl -m /mnt/ipod
+
 
tunes2pod -m /mnt/ipod
 

The iPod is now ready again for GNUpod. @@ -1094,7 +1094,7 @@ You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would -lose any changes you made with iTunes. Running 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.

@@ -1111,7 +1111,7 @@ </playlist>

-..would look like this after using tunes2pod.pl +..would look like this after using tunes2pod
 
...
 <playist name="extended">
  <add id="1" />
@@ -1209,13 +1209,13 @@
 the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
 

-Everytime you run tunes2pod.pl, the iTunesDB will get parsed and converted into an +Everytime you run tunes2pod, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes)

-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.

@@ -1223,7 +1223,7 @@ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.

-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.

--- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:40.000000000 +0000 @@ -437,7 +437,7 @@ gnupod_INIT -m /mnt/ipod gnupod_INIT will create the default directory tree and creates an -empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to +empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB) Use @@ -750,17 +750,17 @@ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes) to perform the last update (adding songs, editing playists.. doing something..), you'll have to use -`tunes2pod.pl' to update the (outdated) GNUtunesDB. +`tunes2pod' to update the (outdated) GNUtunesDB. Mount the iPod and run - tunes2pod.pl -m /mnt/ipod + tunes2pod -m /mnt/ipod The iPod is now ready again for GNUpod. You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and -you would lose any changes you made with iTunes. Running `tunes2pod.pl' +you would lose any changes you made with iTunes. Running `tunes2pod' will write a new GNUtunesDB which reflects the content of the current iTunesDB. @@ -776,7 +776,7 @@ - ..would look like this after using tunes2pod.pl + ..would look like this after using tunes2pod ... @@ -837,12 +837,12 @@ information like the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand. - Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and + Everytime you run `tunes2pod', the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). `mktunes' does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) - Only mktunes and tunes2pod.pl have to worry about the iTunesDB + Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. @@ -851,7 +851,7 @@ gnupod_something.pl) you'll have to run `mktunes'. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run -`tunes2pod.pl' *before* using any other GNUpod commands. +`tunes2pod' *before* using any other GNUpod commands.  File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:40.000000000 +0000 @@ -459,7 +459,7 @@ @end example gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB -(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) +(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB) Use @example @@ -766,18 +766,18 @@ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes) to perform the last update (adding songs, editing playists.. doing something..), you'll have to - use @code{@w{tunes2pod.pl}} to update the (outdated) GNUtunesDB. + use @code{@w{tunes2pod}} to update the (outdated) GNUtunesDB. Mount the iPod and run @example -tunes2pod.pl -m /mnt/ipod +tunes2pod -m /mnt/ipod @end example The iPod is now ready again for GNUpod. You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would -lose any changes you made with iTunes. Running @code{@w{tunes2pod.pl}} will write a new GNUtunesDB which +lose any changes you made with iTunes. Running @code{@w{tunes2pod}} will write a new GNUtunesDB which reflects the content of the current iTunesDB. @@ -794,7 +794,7 @@ @end example -..would look like this after using tunes2pod.pl +..would look like this after using tunes2pod @example ... @@ -845,18 +845,18 @@ The GNUtunesDB (@code{@w{iPod_Control/.gnupod/GNUtunesDB}}) holds the same information like the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand. -Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an +Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). @code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) -Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}. -If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* +If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before* using any other GNUpod commands. --- gnupod-0.99.7/src/ext/XMLhelper.pm 2009-09-12 09:02:38.000000000 +0000 +++ gnupod-0.99.7/src/ext/XMLhelper.pm.new 2009-09-12 09:02:40.000000000 +0000 @@ -186,7 +186,7 @@ } ############################################################## -# Add a playlist to output (Called by eventer or tunes2pod.pl) +# Add a playlist to output (Called by eventer or tunes2pod) # This thing doesn't create xml-encoded output! sub addpl { my($name, $opt) = @_; @@ -205,7 +205,7 @@ } ############################################################## -# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl) +# Add a SmartPlaylist to output (Called by eventer or tunes2pod) # Like addpl(), 'output' isn't xml-encoded sub addspl { my($name, $opt) = @_; --- gnupod-0.99.7/src/ext/FooBar.pm 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:40.000000000 +0000 @@ -128,7 +128,7 @@ sub StartItunesDBSync { my($con) = @_; - my $XBIN = "$con->{bindir}/tunes2pod.pl"; + my $XBIN = "$con->{bindir}/tunes2pod"; if(-x $XBIN) { { --- gnupod-0.99.7/src/ext/iTunesDB.pm 2008-05-10 14:39:25.000000000 +0000 +++ gnupod-0.99.7/src/ext/iTunesDB.pm.new 2009-09-12 09:02:40.000000000 +0000 @@ -1007,7 +1007,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.7/src/gnupod_INIT.pl 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -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 --- gnupod-0.99.7/src/gnupod_otgsync.pl 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -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.7/src/tunes2pod.pl 2008-02-02 11:39:41.000000000 +0000 +++ gnupod-0.99.7/src/tunes2pod.pl.new 2009-09-12 09:02:40.000000000 +0000 @@ -36,7 +36,7 @@ $| = 1; -print "tunes2pod.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "tunes2pod Version ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; @@ -58,7 +58,7 @@ #We disabled all autosyncing (_no_sync set to 1), so we do a test #ourself if(!$opts{force} && !(GNUpod::FooBar::ItunesDBNeedsSync($con))) { - print "I don't think that you have to run tunes2pod.pl\n"; + print "I don't think that you have to run tunes2pod\n"; print "The GNUtunesDB looks up-to-date\n"; print "\n"; print "If you think i'm wrong, use '$0 --force'\n"; @@ -354,7 +354,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: tunes2pod.pl [-h] [-m directory] +Usage: tunes2pod [-h] [-m directory] -h, --help display this help and exit --version output version information and exit @@ -367,7 +367,7 @@ sub version { die << "EOF"; -tunes2pod.pl (gnupod) ###__VERSION__### +tunes2pod (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2007 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:40.000000000 +0000 @@ -69,7 +69,7 @@ Summary ------- -- Fixed invalid warning about broken mhip header. (tunes2pod.pl) +- Fixed invalid warning about broken mhip header. (tunes2pod) - Less stricter Podcast-Playlist parsing - Reduced MP3::Info false-positives: Empty files are no longer detected as .mp3 files @@ -135,7 +135,7 @@ - Workaround for broken files written by 'Anapod' Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc - to enable it. Enabling it slows down tunes2pod.pl + to enable it. Enabling it slows down tunes2pod (because it deactivates the fast-skip of the (useless) MasterPlaylist) @@ -155,7 +155,7 @@ - gnupod_addsong can now fetch podcast-rss feeds! Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' -- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes +- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work. Thanks to Chris Abajian for reporting this issue. @@ -402,7 +402,7 @@ iPods - GNUpod checks if the iTunesDB did change and - runs tunes2pod.pl if it has to run it + runs tunes2pod if it has to run it - Changed rating-schema to match SPL-Rating -> Rating 5 is now 100 (newrating=oldrating*20) @@ -463,7 +463,7 @@ -------- iTunesDB.pm and co: * Can read and write Playlist-Elements without child - tunes2pod.pl couldn't read files written by + tunes2pod couldn't read files written by (newer) MusicMatch releases.. this should fix the issue :) * Don't parse MasterPlaylists, do a seek() -> Speeds up parsing @@ -505,7 +505,7 @@ FileMagic.pm * Fixed (?) ID3v2 reading -tunes2pod.pl: +tunes2pod: * Added paranoia checks (stricter parsing) * Added SPL-Read code (BETA!) @@ -590,7 +590,7 @@ Use an UNICODE Texteditor to edit the GNUtunesDB.. (Like 'yudit' or the gnome2 texteditor) Your old latin1 GNUtunesDB will get converted to an - UTF8 version after running tunes2pod.pl/gnupod_addsong or + UTF8 version after running tunes2pod/gnupod_addsong or gnupod_delete.pl UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more @@ -601,8 +601,8 @@ gnuPod 0.28 -- Rewritten Playlistcode for tunes2pod.pl -- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore +- Rewritten Playlistcode for tunes2pod +- tunes2pod doesn't kill your empty GNUtunesDB anymore if it can't find the iTunesDB - mktunes uses now binmode(), maybe this helps RedHat 8 ? .. (and win32 ;) ) @@ -668,7 +668,7 @@ gnuPod 0.21 -- Fixed stupid tunes2pod.pl bug with big iTunesDBs +- Fixed stupid tunes2pod bug with big iTunesDBs (Thanks to Ciamac Moallemi for reporting and providing a patch) - Support for songnum, songs, cdnum, cds and year --- gnupod-0.99.7/FAQ 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:40.000000000 +0000 @@ -180,7 +180,7 @@ But the iTunesDB-format isn't so complicated if you know how to write the specific parts and how you'll have to assemble them. -Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes +Just have a look at iTunesDB.pm and tunes2pod+mktunes ..or feel free to ask me questions about it: --- gnupod-0.99.7/README 2009-09-12 09:02:40.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:40.000000000 +0000 @@ -35,7 +35,7 @@ gnupod_otgsync Handles On-The-Go Sync (not for humans) gnupod_search Search ;) mktunes Convert the GNUtunesDB.xml to a iTunesDB -tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml +tunes2pod Convert the iTunesDB into a GNUtunesDB.xml You'll have to use mktunes if you added/deleted/changed something on the iPod. sh /build/buildd/gnupod-tools-0.99.7/debian/maintenance/02install_incdir.sh gnupod-0.99.7 0.99.7 dh_testdir cd gnupod-0.99.7 && ./configure --host=i486-linux-gnu --build=i486-linux-gnu --prefix=/usr --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info checking for perl-5.8... no checking for perl-5.6... no checking for perl... /usr/bin/perl GNUpod will use /usr/bin/perl checking for Digest::MD5... ok checking for Digest::SHA1... ok checking for XML::Parser... ok checking for Unicode::String... ok checking for MP3::Info... ok checking for File::Copy... ok checking for LWP::UserAgent... ok checking for HTTP::Request... ok checking for Date::Parse... ok checking for optional Audio::FLAC::Header... ok checking for optional Ogg::Vorbis::Header::PurePerl... ok installed version of MP3::Info looks good checking installed encoders... done checking installed decoders... done checking for ffmpeg with AAC support... not found, --decode=video won't work checking for ImageMagick...not found, --artwork won't work configure: creating ./config.status config.status: creating Makefile config.status: WARNING: Makefile.in seems to ignore the --datarootdir setting Settings: --------- Release : 0.99.7 Perl Version : 5.10.0 Prefix : /usr Perl INC : /etc/perl Encoders : (mpeg4/no ffmpeg with aac support found) (disabled faac: Binary not found) (disabled lame: Binary not found) wav Decoders : (disabled timidity: Binary not found) (disabled flac: Binary not found) (disabled oggdec: Binary not found) Artwork Support : No (ImageMagick is not installed) -> use 'make install' to install GNUpod -> use 'info GNUpod' to read the documentation after you installed GNUpod -> use 'make uninstall' to remove GNUpod from /usr dh_testdir /usr/bin/fakeroot debian/rules binary tar -xzf gnupod-0.99.7.tgz test -d gnupod-0.99.7 sh /build/buildd/gnupod-tools-0.99.7/debian/maintenance/01patch_rename.sh gnupod-0.99.7 0.99.7 Patched gnupod-0.99.7/man/gnupod_convert_APE.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:41.000000000 +0000 @@ -39,7 +39,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.pl', ftyp=>'OGG' }, - 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' }, + 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; Patched gnupod-0.99.7/man/gnupod_INIT.pl.1.gz --- gnupod-0.99.7/doc/gnupod.html 2008-02-17 08:57:04.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:41.000000000 +0000 @@ -596,15 +596,15 @@

If the iPod is freshly formatted or you never used GNUpod before with this iPod, run -
 
gnupod_INIT.pl -m /mnt/ipod
+
 
gnupod_INIT -m /mnt/ipod
 

-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB +gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)

Use -
 
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). --- gnupod-0.99.7/doc/gnupod.info 2008-02-17 08:57:00.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:41.000000000 +0000 @@ -434,14 +434,14 @@ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run - gnupod_INIT.pl -m /mnt/ipod + gnupod_INIT -m /mnt/ipod - gnupod_INIT.pl will create the default directory tree and creates an + gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) Use - gnupod_INIT.pl -m /mnt/ipod --france + gnupod_INIT -m /mnt/ipod --france if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume). This only works for iPods running Firmware 1.x --- gnupod-0.99.7/doc/gnupod.texi 2008-02-17 08:56:52.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:41.000000000 +0000 @@ -455,15 +455,15 @@ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run @example -gnupod_INIT.pl -m /mnt/ipod +gnupod_INIT -m /mnt/ipod @end example -gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB +gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) Use @example -gnupod_INIT.pl -m /mnt/ipod --france +gnupod_INIT -m /mnt/ipod --france @end example if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume). --- gnupod-0.99.7/src/ext/XMLhelper.pm 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/ext/XMLhelper.pm.new 2009-09-12 09:02:41.000000000 +0000 @@ -69,7 +69,7 @@ my @aviable_targets = bsd_glob($xconn->{musicdir}."/*", 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.7/src/ext/Mktunes.pm 2007-10-04 20:30:43.000000000 +0000 +++ gnupod-0.99.7/src/ext/Mktunes.pm.new 2009-09-12 09:02:41.000000000 +0000 @@ -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.7/src/gnupod_INIT.pl 2007-12-08 10:10:29.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:41.000000000 +0000 @@ -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 ;) ) ********************************************************* @@ -142,7 +142,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 @@ -162,7 +162,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.7/src/gnupod_addsong.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:41.000000000 +0000 @@ -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"); } if($opts{playlist}) { #Create this playlist --- gnupod-0.99.7/src/gnupod_check.pl 2007-12-08 10:01:24.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:41.000000000 +0000 @@ -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.7/src/gnupod_search.pl 2008-02-17 08:51:25.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:41.000000000 +0000 @@ -89,7 +89,7 @@ } pview(undef,1); - GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n"); + GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n"); #XML::Parser finished, write new file if we deleted or renamed if($dirty) { GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}}); --- gnupod-0.99.7/src/mktunes.pl 2007-12-08 09:31:47.000000000 +0000 +++ gnupod-0.99.7/src/mktunes.pl.new 2009-09-12 09:02:41.000000000 +0000 @@ -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.7/tools/extractArtwork.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/tools/extractArtwork.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -22,7 +22,7 @@ my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0); $AWDB->LoadArtworkDb; -GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT.pl?\n"); +GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT?\n"); #print Data::Dumper::Dumper($AWDB); --- gnupod-0.99.7/CHANGES 2008-04-27 08:44:20.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -87,7 +87,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.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) @@ -540,7 +540,7 @@ * Can read from STDIN again (use 'gnupod_addsong.pl -') (I forgot this feature ;) ) -gnupod_INIT.pl +gnupod_INIT * Added '--france' switch (Limit volume to 100 db for 1.x Firmware) --- gnupod-0.99.7/FAQ 2005-05-01 16:42:51.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:42.000000000 +0000 @@ -48,7 +48,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.pl -m /mnt/ipod *blabla.mp3 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod' 5 umount the iPod and enjoy! --- gnupod-0.99.7/README 2007-09-26 16:05:54.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:42.000000000 +0000 @@ -29,7 +29,7 @@ GNUpod commands (cheatsheet) ---------------------------- -gnupod_INIT.pl INIT a new iPod (create empty Database + Directories) +gnupod_INIT INIT a new iPod (create empty Database + Directories) gnupod_addsong.pl Add files gnupod_check.pl Check for 'zombie' files gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) Patched gnupod-0.99.7/man/gnupod_addsong.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2007-11-28 06:20:43.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:42.000000000 +0000 @@ -57,7 +57,7 @@ # gnupod_search.match-once = 1 -# *** gnupod_addsong.pl *** +# *** gnupod_addsong *** ## Disable ID3V2 Tag reading # gnupod_addsong.disable-v2 = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:42.000000000 +0000 @@ -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
 

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.

-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: @@ -689,14 +689,14 @@ 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

@@ -878,7 +878,7 @@ 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.

@@ -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
 

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!

@@ -956,8 +956,8 @@
 
model = nano_3g
 

-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: @@ -1045,14 +1045,14 @@

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

-
 
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

I think nobody will ever have to do this.. but it maybe usefull to know that it's possible @@ -1216,7 +1216,7 @@

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 --- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:42.000000000 +0000 @@ -469,23 +469,23 @@ 4.3 Add files ============= -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 +gnupod_addsong like this: + gnupod_addsong -m /mnt/ipod /tmp/foo.mp3 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 (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. - 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. 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! @@ -669,8 +669,8 @@ model = nano_3g 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: @@ -728,12 +728,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 @@ -843,7 +843,7 @@ 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 +format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:42.000000000 +0000 @@ -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') @@ -656,14 +656,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 @@ -687,9 +687,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 @@ -747,14 +747,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) @@ -851,7 +851,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.7/src/gnupod_addsong.pl 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -37,7 +37,7 @@ use constant MACTIME => GNUpod::FooBar::MACTIME; use vars qw(%opts %dupdb_normal %dupdb_lazy %dupdb_podcast $int_count %podcast_infos %podcast_channel_infos %per_file_info); -print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n"; $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop @@ -693,7 +693,7 @@ #Sighandler sub handle_int { if($int_count) { - warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n"; + warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n"; $int_count--; } else { @@ -708,7 +708,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ... +Usage: gnupod_addsong [-h] [-m directory] File1 File2 ... -h, --help display this help and exit --version output version information and exit @@ -752,7 +752,7 @@ sub version { die << "EOF"; -gnupod_addsong.pl (gnupod) ###__VERSION__### +gnupod_addsong (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2008 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/src/gnupod_check.pl 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -85,7 +85,7 @@ if($TRACKER{ERR} > 25) { print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n"; print " '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n"; - print " 'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n"; + print " 'gnupod_addsong --restore'. This would wipe all your Playlists\n"; print " but would cure your iPod for sure.\n"; } } --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -7,7 +7,7 @@ flooded me with patches, many thanks to him: - Fix DBID width in gnupod_search.pl output - Added --bitrate switch to gnupod_search.pl -- Added --podcast-files-limit switch to gnupod_addsong.pl +- Added --podcast-files-limit switch to gnupod_addsong - Added Podcast-Date patch (GNUpod now depends on Date::Parse) - Added --unique switch to extractArtwork.pl - Added xescaped() patch. GNUpod will now store @@ -26,7 +26,7 @@ - Use udevinfo to find the iPods Firewire-GUID (as /proc/bus/usb/devices is depricated) - Support for iPhone: Edit ~/.gnupodrc and add 'model = iphone' - Some documentation 'fixes', thanks a lot to Toby Cabot -- gnupod_addsong.pl: replace wget with curl +- gnupod_addsong: replace wget with curl - Use binmode() more often to help Win32 @@ -88,9 +88,9 @@ - Filter out bad chars from '--rename' command. - Added RVA2 (Normalize) patch by Peter Liljenberg - 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) +- 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) - Raised video-bitrate for on-the-fly converting - Added configuration option 'automktunes'. Setting 'automktunes = 1' inside ~/.gnupodrc eliminates the need @@ -117,13 +117,13 @@ ------- - iPod-Video support - gnupod_addsong.pl can now read/add .mp4 files + gnupod_addsong can now read/add .mp4 files Converting .avi (RIFF) files on-the-fly works only IF your ffmpeg binary has AAC Support! (Adding preencoded files works witout ffmpeg) - Try: gnupod_addsong.pl --decode=video *.avi + Try: gnupod_addsong --decode=video *.avi - Fixes a playlist problem with iTunes5 (new 100 Mhods) @@ -152,8 +152,8 @@ Summary ------- -- gnupod_addsong.pl can now fetch podcast-rss feeds! - Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast' +- gnupod_addsong can now fetch podcast-rss feeds! + Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' - Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl @@ -215,8 +215,8 @@ - Added support for multiple On-The-Go playlists. -- gnupod_addsong.pl can now reenocde aac and mp3 'on-the-fly' - Usage: gnupod_addsong.pl --reencode 6 *.mp3 +- gnupod_addsong can now reenocde aac and mp3 'on-the-fly' + Usage: gnupod_addsong --reencode 6 *.mp3 This would reenocde everything with 'lame -V 6' Use this if you don't have much space left (iPod Shuffle?!) Note: The Reencode option also changes the quality of @@ -273,7 +273,7 @@ - You can now add MIDI files ;-) (with timidity) -- Added --set-songnum option for gnupod_addsong.pl +- Added --set-songnum option for gnupod_addsong - Rewritten ConverterCore.. shouldn't break anything... @@ -297,18 +297,18 @@ Summary ------- -- Changed --decode switch from gnupod_addsong.pl +- Changed --decode switch from gnupod_addsong You can now select the output format of --decode -> pcm(old default) / MP3 (using lame) / AAC (using FAAC) - Example: # gnupod_addsong.pl --decode=mp3 *.flac + Example: # gnupod_addsong --decode=mp3 *.flac (Idea and original patch from ) - GNUpod can now also convert OGG-Vorbis files (Use --decode=XXX, same as FLAC) -- Added --playlist=STRING switch to gnupod_addsong.pl +- Added --playlist=STRING switch to gnupod_addsong This creates the playlist 'STRING' and adds all songs - passed to gnupod_addsong.pl to this playlist. + passed to gnupod_addsong to this playlist. (Thanks to Bob Cotton) - Many changes for the M4A parser, should work better now @@ -336,21 +336,21 @@ (Needs JavaScript + DOM => Mozilla) ** SMARTPLAYLIST SYNTAX CHANGED ** -- gnupod_addsong.pl can now add FLAC files. +- gnupod_addsong can now add FLAC files. 'flac' needs to be in your $PATH and it's disabled - per default. (Enable it using gnupod_addsong.pl --decode + per default. (Enable it using gnupod_addsong --decode or set 'gnupod_addsong.decode=1' in your config) -- gnupod_addsong.pl can read ALAC (Apples Loseless Audio Codec) +- gnupod_addsong can read ALAC (Apples Loseless Audio Codec) files (iTunes creates normal .m4a files) - Polished Playcounts parser (no hardcoded offsets anymore) - added '--disable-v2' and '--disable-v1' to - gnupod_addsong.pl (Disable parsing of ID3TAG version X) + gnupod_addsong (Disable parsing of ID3TAG version X) - Fixed small bug with .m4a files and added more fields. - gnupod_addsong.pl can now read M4A/AAC files from www.allofmp3.com + gnupod_addsong can now read M4A/AAC files from www.allofmp3.com - added tools/m4a-info.pl: Use this tool to read Title/Artist tags from .m4a files (not installed by 'make install') @@ -358,7 +358,7 @@ - You can modify the output of gnupod_search.pl using --view (See 'gnupod_search.pl --help') -- gnupod_addsong.pl checks for wrong extensions +- gnupod_addsong checks for wrong extensions (like a mp3-file called 'test.wav'). The iPod wouldn't play such a file. @@ -385,7 +385,7 @@ - I bought one myself -- gnupod_addsong.pl understands .m4a files +- gnupod_addsong understands .m4a files (= AAC Files written by iTunes) I don't know if it works with DRM files (.m4p?) I don't have any DRM files and i'm not interested @@ -409,7 +409,7 @@ mktunes.pl will drop old (= now invalid) ratings, no autoconvert... sorry.. but does anyone care? -- gnupod_addsong.pl understands ID3v2.2 tags +- gnupod_addsong understands ID3v2.2 tags - You'll have to install Digest::MD5 @@ -454,7 +454,7 @@ Summary: -------- - Reading MusicMatch files should work (again) -- gnupod_addsong.pl can add WAVE files +- gnupod_addsong can add WAVE files - Parsing large iTunesDB files should be faster (-> we skip the MainPlayList) @@ -513,7 +513,7 @@ * Added SPL-Write support * regex-matches are sorted by id -gnupod_addsong.pl: +gnupod_addsong: * duplicate-checker displayed the wrong number of the dup, works again @@ -536,8 +536,8 @@ * Playlist-Cleanup works now.. (another stupid bug.. :-/) * Added '--title' switch to usage -gnupod_addsong.pl: - * Can read from STDIN again (use 'gnupod_addsong.pl -') +gnupod_addsong: + * Can read from STDIN again (use 'gnupod_addsong -') (I forgot this feature ;) ) gnupod_INIT @@ -590,7 +590,7 @@ Use an UNICODE Texteditor to edit the GNUtunesDB.. (Like 'yudit' or the gnome2 texteditor) Your old latin1 GNUtunesDB will get converted to an - UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or + UTF8 version after running tunes2pod.pl/gnupod_addsong or gnupod_delete.pl UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more @@ -633,7 +633,7 @@ in the GNUtunesDB - file - mktunes.pl no longer accepts when was not found. -- gnupod_addsong.pl handles long filenames now better +- gnupod_addsong handles long filenames now better - Timestamp should now be set correct (utime(undef,undef.. didn't work on every OS..) - new playist keywords. You can now use /dev/null | tail +4 --- gnupod-0.99.7/README 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:42.000000000 +0000 @@ -30,7 +30,7 @@ ---------------------------- gnupod_INIT INIT a new iPod (create empty Database + Directories) -gnupod_addsong.pl Add files +gnupod_addsong Add files gnupod_check.pl Check for 'zombie' files gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) Patched gnupod-0.99.7/man/gnupod_check.pl.1.gz --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:42.000000000 +0000 @@ -1040,11 +1040,11 @@ 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.

-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

--- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:42.000000000 +0000 @@ -723,10 +723,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. - 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' --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:42.000000000 +0000 @@ -742,11 +742,11 @@ 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. -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} @example --- gnupod-0.99.7/src/gnupod_check.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_check.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -32,7 +32,7 @@ #Get maximal Pathlength from XMLHelper constant my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH; -print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; #Don't add xml and itunes opts.. we *NEED* the mount opt to be set.. @@ -121,7 +121,7 @@ my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path}); my $id = $el->{file}->{id}; - my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie"; + my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie"; $TRACKER{SIZE}+=int($el->{file}->{filesize}); $TRACKER{TIME}+=int($el->{file}->{time}); @@ -222,8 +222,8 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: gnupod_check.pl [-h] [-m directory] -gnupod_check.pl checks for 'lost' files +Usage: gnupod_check [-h] [-m directory] +gnupod_check checks for 'lost' files -h, --help display this help and exit --version output version information and exit @@ -237,7 +237,7 @@ sub version { die << "EOF"; -gnupod_check.pl (gnupod) ###__VERSION__### +gnupod_check (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2004 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -191,14 +191,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. -- 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 - Updated documentation: Tell how to extract a @@ -365,7 +365,7 @@ - Fixed some SmartPlaylist stuff and added support for last playtime -- Added gnupod_check.pl, it check's for 'lost' files +- Added gnupod_check, it check's for 'lost' files - I changed the 'build' system. Btw, you can now uninstall GNUpod using 'make uninstall' .. but why? :) --- gnupod-0.99.7/README 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:42.000000000 +0000 @@ -31,7 +31,7 @@ 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.pl Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB Patched gnupod-0.99.7/man/gnupod_convert_FLAC.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -37,7 +37,7 @@ # my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'}, - 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'}, + 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'}, 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/src/gnupod_convert_FLAC.pl 2008-01-06 19:40:34.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_convert_FLAC.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -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.7/man/gnupod_convert_MIDI.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -36,7 +36,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', ftyp=>'FLAC'}, 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, Patched gnupod-0.99.7/man/gnupod_convert_OGG.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -38,7 +38,7 @@ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'}, 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'}, - 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' }, + 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' }, 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' }, 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/src/gnupod_convert_OGG.pl 2008-01-06 19:39:24.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_convert_OGG.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -48,8 +48,8 @@ } ## 3. = no errors if($@) { - warn "gnupod_convert_OGG.pl: Could not read OGG-Metadata from $file (".ref($ftag).")\n"; - warn "gnupod_convert_OGG.pl: Maybe $ogg_pmod is not installed?\n"; + warn "gnupod_convert_OGG: Could not read OGG-Metadata from $file (".ref($ftag).")\n"; + warn "gnupod_convert_OGG: Maybe $ogg_pmod is not installed?\n"; warn "Error: *$@*\n"; exit(1); } Patched gnupod-0.99.7/man/gnupod_convert_RIFF.pl.1.gz --- gnupod-0.99.7/src/ext/FileMagic.pm 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/ext/FileMagic.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -40,7 +40,7 @@ '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.pl', ftyp=>'RIFF', magic2=>'AVI '}}; + 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}}; --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -74,7 +74,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 Patched gnupod-0.99.7/man/gnupod_otgsync.pl.1.gz --- gnupod-0.99.7/src/ext/FooBar.pm 2007-12-08 11:18:07.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -149,11 +149,11 @@ } ###################################################################### -# Call gnupod_otgsync.pl +# Call gnupod_otgsync sub StartOnTheGoSync { my($con) = @_; - my $XBIN = "$con->{bindir}/gnupod_otgsync.pl"; + my $XBIN = "$con->{bindir}/gnupod_otgsync"; if(-x $XBIN) { { --- gnupod-0.99.7/src/gnupod_otgsync.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -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: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n"; } ##Check if GNUtunesDB <-> iTunesDB is really in-sync --- gnupod-0.99.7/tools/otgtest.pl 2008-08-10 07:12:49.000000000 +0000 +++ gnupod-0.99.7/tools/otgtest.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -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.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -443,7 +443,7 @@ QTfile.pm * A dirty QuickTime parser -gnupod_otgsync.pl +gnupod_otgsync * A new tool, don't use it yourself :) It's only used internal. --- gnupod-0.99.7/README 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:42.000000000 +0000 @@ -32,7 +32,7 @@ gnupod_INIT INIT a new iPod (create empty Database + Directories) gnupod_addsong Add files gnupod_check Check for 'zombie' files -gnupod_otgsync.pl Handles On-The-Go Sync (not for humans) +gnupod_otgsync Handles On-The-Go Sync (not for humans) gnupod_search.pl Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml Patched gnupod-0.99.7/man/gnupod_search.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:42.000000000 +0000 @@ -51,7 +51,7 @@ ## Enforce iPod serial number: # mktunes.fwguid = 000ba3100310abcf -# *** gnupod_search.pl *** +# *** gnupod_search *** ## Always match only once # gnupod_search.match-once = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:42.000000000 +0000 @@ -722,15 +722,15 @@

-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"
 

-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.

@@ -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 @@ -960,9 +960,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.7/doc/gnupod.info 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:42.000000000 +0000 @@ -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) @@ -672,10 +672,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. --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:42.000000000 +0000 @@ -529,33 +529,33 @@ @node Search files @section Search files -GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files. +GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files. Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run @example -gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" +gnupod_search -m /mnt/ipod -a "Schlummiguch" @end example -Note: gnupod_search.pl assumes RegExp input. -Please have a look at @code{@w{gnupod_search.pl --help}} for more information. +Note: gnupod_search assumes RegExp input. +Please have a look at @code{@w{gnupod_search --help}} for more information. @node Remove files @section Remove files -Removing files is done using @code{@w{gnupod_search.pl -d}}. +Removing files is done using @code{@w{gnupod_search -d}}. To Remove all files from the artist 'Schlummiguch', run @example -gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d +gnupod_search -m /mnt/ipod -a "Schlummiguch" -d @end example @node Edit tags @section Edit tags -You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..) +You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..) @example -gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100" +gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100" @end example This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and @@ -693,10 +693,10 @@ @end example -Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example: +Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example: @example # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i -gnupod_search.pl --artwork cover.jpg --album Katamari +gnupod_search --artwork cover.jpg --album Katamari @end example don't forget to run @code{@w{mktunes.pl}} afterwards. --- gnupod-0.99.7/src/gnupod_search.pl 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -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.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:42.000000000 +0000 @@ -5,8 +5,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 @@ -142,7 +142,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) @@ -277,7 +277,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: @@ -355,8 +355,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 @@ -531,7 +531,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 @@ -615,7 +615,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.7/AUTHORS 2003-12-27 16:58:10.000000000 +0000 +++ gnupod-0.99.7/AUTHORS.new 2009-09-12 09:02:42.000000000 +0000 @@ -10,7 +10,7 @@ Contributed to the 'old' GNUpod (< 0.9) - gnupod_list.pl - gnupod_renumber.pl - - gnupod_search.pl (Most important tool ;) ) + - gnupod_search (Most important tool ;) ) And also many thanks to the many other people --- gnupod-0.99.7/FAQ 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:42.000000000 +0000 @@ -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? @@ -134,13 +134,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.7/README 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:42.000000000 +0000 @@ -33,7 +33,7 @@ gnupod_addsong Add files gnupod_check Check for 'zombie' files gnupod_otgsync Handles On-The-Go Sync (not for humans) -gnupod_search.pl Search ;) +gnupod_search Search ;) mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml Patched gnupod-0.99.7/man/mktunes.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:42.000000000 +0000 @@ -21,9 +21,9 @@ ## * nano_3g (the late 2007 nano) # model = video -## Let GNUpod call mktunes.pl itself. +## Let GNUpod call mktunes itself. ## This may cause a slow-down when dealing with -## large databases on slow CPUs because mktunes.pl +## large databases on slow CPUs because mktunes ## may take some time to complete # automktunes = 1 @@ -31,7 +31,7 @@ ##### NON GLOBAL OPTIONS ###### -# *** mktunes.pl *** +# *** mktunes *** ## Specify the iPods name # mktunes.ipod-name = Wurstli @@ -45,7 +45,7 @@ # tunes2pod.force = 1 -# *** mktunes.pl *** +# *** mktunes *** ## Set --volume boost to +10 percent # mktunes.volume = +10 ## Enforce iPod serial number: --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:42.000000000 +0000 @@ -475,7 +475,7 @@

Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod. -Mount the iPod and run mktunes.pl to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes +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:

@@ -784,7 +784,7 @@ 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 :-) @@ -911,7 +911,7 @@ </playlist>

-Such a playlist will show up as a Podcast after running mktunes.pl +Such a playlist will show up as a Podcast after running mktunes

gnupod_addsong can also download podcasts and create such playlists itself: @@ -965,7 +965,7 @@ gnupod_search --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. @@ -990,32 +990,32 @@

-Before umounting the iPod, you have to call mktunes.pl which will +Before umounting the iPod, you have to call mktunes which will parse the GNUtunesDB XML file and convert it into the iTunesDB format.

Simply run -
 
mktunes.pl -m /mnt/ipod
+
 
mktunes -m /mnt/ipod
 

-Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you 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
 

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
 

-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)

@@ -1145,7 +1145,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.

@@ -1211,16 +1211,16 @@ Everytime you run tunes2pod.pl, 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)

-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong 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.

If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before* --- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:42.000000000 +0000 @@ -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: @@ -677,7 +677,7 @@ # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i gnupod_search --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 @@ -690,28 +690,28 @@ 4.10 Unplug the iPod ==================== -Before umounting the iPod, you have to call `mktunes.pl' which will +Before umounting the iPod, you have to call `mktunes' which will parse the GNUtunesDB XML file and convert it into the iTunesDB format. Simply run - mktunes.pl -m /mnt/ipod + mktunes -m /mnt/ipod - Note: Since GNUpod 0.91, mktunes.pl has a '-volume' option which you + Note: Since GNUpod 0.91, mktunes has a '-volume' option which you can use to boost the Volume. - mktunes.pl -m /mnt/ipod --volume 40 + mktunes -m /mnt/ipod --volume 40 This would adjust the volume +40 percent. (You can also use '-100' to get a silent iPod ;) ) - After `mktunes.pl' is done, you can umount the iPod and remove the + After `mktunes' is done, you can umount the iPod and remove the sbp2 module umount /mnt/ipod rmmod sbp2 Added songs won't be visible on the iPod if you did not run -mktunes.pl before umounting the iPod. (If you forgot to run -`mktunes.pl' before unpluging/umounting, simply mount the iPod again +mktunes before umounting the iPod. (If you forgot to run +`mktunes' before unpluging/umounting, simply mount the iPod again and run it)  @@ -801,7 +801,7 @@ should be autodetected on GNU/Linux (via `/proc/bus/usb/devices') and Solaris (via `prtconf -v'). If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct -value using the `--fwguid' switch of `mktunes.pl'. +value using the `--fwguid' switch of `mktunes'.  File: gnupod.info, Node: Problems, Next: GNU Free Documentation License, Prev: Using GNUpod, Up: Top @@ -838,17 +838,17 @@ understand by humans and easy to edit by hand. Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and -converted into an XML File (the GNUtunesDB). `mktunes.pl' does the +converted into an XML File (the GNUtunesDB). `mktunes' does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) - Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB + Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the GNUtunesDB (by hand or using -gnupod_something.pl) you'll have to run `mktunes.pl'. +gnupod_something.pl) you'll have to run `mktunes'. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run `tunes2pod.pl' *before* using any other GNUpod commands. --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:42.000000000 +0000 @@ -359,7 +359,7 @@ Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano). Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod. -Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes +Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}: First you need to get a new Firmware image. @@ -561,7 +561,7 @@ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and sets the rating to 5 Stars (5*20=100) -Don't forget to run mktunes.pl! +Don't forget to run mktunes! You could also edit the GNUtunesDB.xml with a text editor :-) @@ -654,7 +654,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_addsong can also download podcasts and create such playlists itself: @@ -699,7 +699,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. 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. @@ -708,32 +708,32 @@ @node Unplug the iPod @section Unplug the iPod -Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will +Before umounting the iPod, you have to call @code{@w{mktunes}} which will parse the GNUtunesDB XML file and convert it into the iTunesDB format. Simply run @example -mktunes.pl -m /mnt/ipod +mktunes -m /mnt/ipod @end example -Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to +Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to boost the Volume. @example -mktunes.pl -m /mnt/ipod --volume 40 +mktunes -m /mnt/ipod --volume 40 @end example This would adjust the volume +40 percent. (You can also use '-100' to get a silent iPod ;) ) -After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module +After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module @example umount /mnt/ipod rmmod sbp2 @end example -Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod. -(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it) +Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod. +(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it) @node Recovering files @@ -813,7 +813,7 @@ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}). If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch -of @code{mktunes.pl}. +of @code{mktunes}. @c =========================================================================================== @@ -847,14 +847,14 @@ Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). -@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the +@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) -Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the -GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}. +GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* using any other GNUpod commands. --- gnupod-0.99.7/src/ext/FooBar.pm 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -104,10 +104,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.7/src/ext/Mktunes.pm 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/ext/Mktunes.pm.new 2009-09-12 09:02:42.000000000 +0000 @@ -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.7/src/gnupod_INIT.pl 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -120,9 +120,9 @@ $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount}); } else { - #No iTunesDB, run mktunes.pl - print "No iTunesDB found, running mktunes.pl\n"; - $t2pfail = system("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}"); + #No iTunesDB, run mktunes + print "No iTunesDB found, running mktunes\n"; + $t2pfail = system("$con->{bindir}/mktunes", "-m" ,"$opts{mount}"); } if($t2pfail) { @@ -152,7 +152,7 @@ Maximal-volume without this is ~104dB (VERY LOUD) *WARNING* This works only for iPods running Firmware 1.x (1st & 2nd generation) - You can also use mktunes.pl '--volume PERCENT' + You can also use mktunes '--volume PERCENT' to adjust the volume (Works with Firmware 1.x AND 2.x) --noask Do not wait for any user input --- gnupod-0.99.7/src/gnupod_addsong.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_addsong.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -196,11 +196,11 @@ #This breaks perl < 5.8 if we don't use int(time()) ! $fh->{addtime} = int(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.7/src/gnupod_otgsync.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -129,9 +129,9 @@ sub newfile { my($el) = @_; - #This has to be 'in-sync' with the mktunes.pl method + #This has to be 'in-sync' with the mktunes method # (GNUtunesDB_id <-> iTunesDB_id) - # in mktunes.pl, every {file}->{id})); --- gnupod-0.99.7/src/gnupod_search.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_search.pl.new 2009-09-12 09:02:42.000000000 +0000 @@ -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.7/src/mktunes.pl 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/mktunes.pl.new 2009-09-12 09:02:43.000000000 +0000 @@ -37,7 +37,7 @@ my %opts = (); -print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n"; +print "mktunes ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s"); @@ -140,7 +140,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: mktunes.pl [-h] [-m directory] [-v VALUE] +Usage: mktunes [-h] [-m directory] [-v VALUE] -h, --help display this help and exit --version output version information and exit @@ -159,7 +159,7 @@ # Displays current version sub version { die << "EOF"; -mktunes.pl (gnupod) ###__VERSION__### +mktunes (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2007 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:43.000000000 +0000 @@ -51,7 +51,7 @@ ------- - Added README_FIRMWARE.txt file - Added compilation-patch, thanks to Ray Lortie -- Rewrote mktunes.pl to be faster and more readable :-) +- Rewrote mktunes to be faster and more readable :-) - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) ) Apple attempted to lockout non-iTunes software by implementing an obscure @@ -94,8 +94,8 @@ - Raised video-bitrate for on-the-fly converting - Added configuration option 'automktunes'. Setting 'automktunes = 1' inside ~/.gnupodrc eliminates the need - to call mktunes.pl after adding/deleting/renaming songs because GNUpod - will call mktunes.pl itself. + to call mktunes after adding/deleting/renaming songs because GNUpod + will call mktunes itself. - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect written mhip size. Playlist parsing has also been rewritten and cleaned up. - Bugfix: Do not detect PCM files as movies when using --decode @@ -155,7 +155,7 @@ - gnupod_addsong can now fetch podcast-rss feeds! Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' -- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl +- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work. Thanks to Chris Abajian for reporting this issue. @@ -225,7 +225,7 @@ - Added support for m4a 'gnre' tags - Fixed some iPod-Shuffle issues - * mktunes.pl removes the iTunesShuffle leftover + * mktunes removes the iTunesShuffle leftover - Remove TARGET-File if File::Copy() failed for any reason => Better handling of 'disk full' but still not perfect @@ -406,7 +406,7 @@ - Changed rating-schema to match SPL-Rating -> Rating 5 is now 100 (newrating=oldrating*20) - mktunes.pl will drop old (= now invalid) ratings, + mktunes will drop old (= now invalid) ratings, no autoconvert... sorry.. but does anyone care? - gnupod_addsong understands ID3v2.2 tags @@ -490,7 +490,7 @@ a 'feature' of iTunes) * Added 'eq syntax check', you can use (since 0.90) 'eq="#!#NUMBER#!#' to specify the EQ-Setting per song. - mktunes.pl will now check if this syntax is correct. + mktunes will now check if this syntax is correct. (You'll see a warning if it failed) * Fixed get_string() to handle null-size strings correct * Changed some internal things (using hrefs.. etc) @@ -509,7 +509,7 @@ * Added paranoia checks (stricter parsing) * Added SPL-Read code (BETA!) -mktunes.pl +mktunes * Added SPL-Write support * regex-matches are sorted by id @@ -544,13 +544,13 @@ * Added '--france' switch (Limit volume to 100 db for 1.x Firmware) -mktunes.pl +mktunes * New Playlist-Code.. MUCH faster now (Wow.. again? no.. the code of 0.90 was VERY slow with many files (~3000) and more than ~15 big playlists) * Added '--volume' switch: Adjust the volume on the iPod! - Use something like 'mktunes.pl --volume 70' to boost + Use something like 'mktunes --volume 70' to boost the volume by 70% (same as volume="70" in the GNUtunesDB) XMLhelper.pm @@ -604,9 +604,9 @@ - Rewritten Playlistcode for tunes2pod.pl - tunes2pod.pl doesn't kill your empty GNUtunesDB anymore if it can't find the iTunesDB -- mktunes.pl uses now binmode(), maybe this helps +- mktunes uses now binmode(), maybe this helps RedHat 8 ? .. (and win32 ;) ) -- mktunes.pl is now *much* faster!! +- mktunes is now *much* faster!! - the GNUtunesDB written by gnupod_delete.pl looks nicer now :) (id= is now always the first element..) @@ -631,7 +631,7 @@ written by MusicMatch - Playlists are now sorted on the iPod as they are found in the GNUtunesDB - file -- mktunes.pl no longer accepts when was +- mktunes no longer accepts when was not found. - gnupod_addsong handles long filenames now better - Timestamp should now be set correct --- gnupod-0.99.7/BUGS 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/BUGS.new 2009-09-12 09:02:43.000000000 +0000 @@ -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.7/README.about_m4a 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.about_m4a.new 2009-09-12 09:02:43.000000000 +0000 @@ -30,6 +30,6 @@ Now you can add the file using gnupod_addsong # gnupod_addsong file.m4a -# mktunes.pl +# mktunes :) --- gnupod-0.99.7/FAQ 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:43.000000000 +0000 @@ -50,13 +50,13 @@ 1 Mount the iPod (eg. /mnt/ipod) 2 run gnupod_INIT -m /mnt/ipod 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3 - 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod' + 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod' 5 umount the iPod and enjoy! If you add more songs, repeat step 1-5 (without step 2!) : 1 Mount the iPod 2 use gnupod_addsong - 3 build the database with mktunes.pl + 3 build the database with mktunes 4 umount Please read the README file and the info page @@ -73,7 +73,7 @@ But there are some GNUpod 'forks' -- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes.pl / iTunesDB.pm) +- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes / iTunesDB.pm) - Rhythmbox http://www.rhythmbox.org/ (Uses GTKpod code) (..and some companies created commercial iPod apps.. and i'm sure @@ -156,7 +156,7 @@ To fix it: - Open the GNUtunesDB.xml (/mnt/ipod/iPod_Control/.gnupod/) - Search the faulty entries, fix them and save -- Run mktunes.pl to update the iPod. +- Run mktunes to update the iPod. 10. Why? @@ -180,7 +180,7 @@ But the iTunesDB-format isn't so complicated if you know how to write the specific parts and how you'll have to assemble them. -Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes.pl +Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes ..or feel free to ask me questions about it: --- gnupod-0.99.7/README 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:43.000000000 +0000 @@ -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.pl Convert the iTunesDB into a GNUtunesDB.xml -You'll have to use mktunes.pl if you added/deleted/changed something +You'll have to use mktunes if you added/deleted/changed something on the iPod. Patched gnupod-0.99.7/man/tunes2pod.pl.1.gz --- gnupod-0.99.7/doc/gnupodrc.example 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupodrc.example.new 2009-09-12 09:02:43.000000000 +0000 @@ -40,7 +40,7 @@ ## Uncomment this to skip 'on-the-go' sync # otgsync.nosync = 1 -# *** tunes2pod.pl *** +# *** tunes2pod *** ## Uncomment to set '--force' switch to true (DANGEROUS) # tunes2pod.force = 1 --- gnupod-0.99.7/doc/gnupod.html 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.html.new 2009-09-12 09:02:43.000000000 +0000 @@ -600,7 +600,7 @@

gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB -(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) +(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)

Use @@ -1082,11 +1082,11 @@ 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.

Mount the iPod and run -
 
tunes2pod.pl -m /mnt/ipod
+
 
tunes2pod -m /mnt/ipod
 

The iPod is now ready again for GNUpod. @@ -1094,7 +1094,7 @@ You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would -lose any changes you made with iTunes. Running 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.

@@ -1111,7 +1111,7 @@ </playlist>

-..would look like this after using tunes2pod.pl +..would look like this after using tunes2pod
 
...
 <playist name="extended">
  <add id="1" />
@@ -1209,13 +1209,13 @@
 the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
 

-Everytime you run tunes2pod.pl, the iTunesDB will get parsed and converted into an +Everytime you run tunes2pod, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes)

-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.

@@ -1223,7 +1223,7 @@ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.

-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.

--- gnupod-0.99.7/doc/gnupod.info 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.info.new 2009-09-12 09:02:43.000000000 +0000 @@ -437,7 +437,7 @@ gnupod_INIT -m /mnt/ipod gnupod_INIT will create the default directory tree and creates an -empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to +empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB) Use @@ -750,17 +750,17 @@ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes) to perform the last update (adding songs, editing playists.. doing something..), you'll have to use -`tunes2pod.pl' to update the (outdated) GNUtunesDB. +`tunes2pod' to update the (outdated) GNUtunesDB. Mount the iPod and run - tunes2pod.pl -m /mnt/ipod + tunes2pod -m /mnt/ipod The iPod is now ready again for GNUpod. You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and -you would lose any changes you made with iTunes. Running `tunes2pod.pl' +you would lose any changes you made with iTunes. Running `tunes2pod' will write a new GNUtunesDB which reflects the content of the current iTunesDB. @@ -776,7 +776,7 @@ - ..would look like this after using tunes2pod.pl + ..would look like this after using tunes2pod ... @@ -837,12 +837,12 @@ information like the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand. - Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and + Everytime you run `tunes2pod', the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). `mktunes' does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) - Only mktunes and tunes2pod.pl have to worry about the iTunesDB + Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. @@ -851,7 +851,7 @@ gnupod_something.pl) you'll have to run `mktunes'. If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run -`tunes2pod.pl' *before* using any other GNUpod commands. +`tunes2pod' *before* using any other GNUpod commands.  File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems --- gnupod-0.99.7/doc/gnupod.texi 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/doc/gnupod.texi.new 2009-09-12 09:02:43.000000000 +0000 @@ -459,7 +459,7 @@ @end example gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB -(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB) +(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB) Use @example @@ -766,18 +766,18 @@ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes) to perform the last update (adding songs, editing playists.. doing something..), you'll have to - use @code{@w{tunes2pod.pl}} to update the (outdated) GNUtunesDB. + use @code{@w{tunes2pod}} to update the (outdated) GNUtunesDB. Mount the iPod and run @example -tunes2pod.pl -m /mnt/ipod +tunes2pod -m /mnt/ipod @end example The iPod is now ready again for GNUpod. You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would -lose any changes you made with iTunes. Running @code{@w{tunes2pod.pl}} will write a new GNUtunesDB which +lose any changes you made with iTunes. Running @code{@w{tunes2pod}} will write a new GNUtunesDB which reflects the content of the current iTunesDB. @@ -794,7 +794,7 @@ @end example -..would look like this after using tunes2pod.pl +..would look like this after using tunes2pod @example ... @@ -845,18 +845,18 @@ The GNUtunesDB (@code{@w{iPod_Control/.gnupod/GNUtunesDB}}) holds the same information like the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand. -Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an +Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an XML File (the GNUtunesDB). @code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the iPod and iTunes) -Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools +Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB. It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}. -If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before* +If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before* using any other GNUpod commands. --- gnupod-0.99.7/src/ext/XMLhelper.pm 2009-09-12 09:02:41.000000000 +0000 +++ gnupod-0.99.7/src/ext/XMLhelper.pm.new 2009-09-12 09:02:43.000000000 +0000 @@ -186,7 +186,7 @@ } ############################################################## -# Add a playlist to output (Called by eventer or tunes2pod.pl) +# Add a playlist to output (Called by eventer or tunes2pod) # This thing doesn't create xml-encoded output! sub addpl { my($name, $opt) = @_; @@ -205,7 +205,7 @@ } ############################################################## -# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl) +# Add a SmartPlaylist to output (Called by eventer or tunes2pod) # Like addpl(), 'output' isn't xml-encoded sub addspl { my($name, $opt) = @_; --- gnupod-0.99.7/src/ext/FooBar.pm 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/ext/FooBar.pm.new 2009-09-12 09:02:43.000000000 +0000 @@ -128,7 +128,7 @@ sub StartItunesDBSync { my($con) = @_; - my $XBIN = "$con->{bindir}/tunes2pod.pl"; + my $XBIN = "$con->{bindir}/tunes2pod"; if(-x $XBIN) { { --- gnupod-0.99.7/src/ext/iTunesDB.pm 2008-05-10 14:39:25.000000000 +0000 +++ gnupod-0.99.7/src/ext/iTunesDB.pm.new 2009-09-12 09:02:43.000000000 +0000 @@ -1007,7 +1007,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.7/src/gnupod_INIT.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_INIT.pl.new 2009-09-12 09:02:43.000000000 +0000 @@ -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 --- gnupod-0.99.7/src/gnupod_otgsync.pl 2009-09-12 09:02:42.000000000 +0000 +++ gnupod-0.99.7/src/gnupod_otgsync.pl.new 2009-09-12 09:02:43.000000000 +0000 @@ -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.7/src/tunes2pod.pl 2008-02-02 11:39:41.000000000 +0000 +++ gnupod-0.99.7/src/tunes2pod.pl.new 2009-09-12 09:02:43.000000000 +0000 @@ -36,7 +36,7 @@ $| = 1; -print "tunes2pod.pl Version ###__VERSION__### (C) Adrian Ulrich\n"; +print "tunes2pod Version ###__VERSION__### (C) Adrian Ulrich\n"; $opts{mount} = $ENV{IPOD_MOUNTPOINT}; @@ -58,7 +58,7 @@ #We disabled all autosyncing (_no_sync set to 1), so we do a test #ourself if(!$opts{force} && !(GNUpod::FooBar::ItunesDBNeedsSync($con))) { - print "I don't think that you have to run tunes2pod.pl\n"; + print "I don't think that you have to run tunes2pod\n"; print "The GNUtunesDB looks up-to-date\n"; print "\n"; print "If you think i'm wrong, use '$0 --force'\n"; @@ -354,7 +354,7 @@ my($rtxt) = @_; die << "EOF"; $rtxt -Usage: tunes2pod.pl [-h] [-m directory] +Usage: tunes2pod [-h] [-m directory] -h, --help display this help and exit --version output version information and exit @@ -367,7 +367,7 @@ sub version { die << "EOF"; -tunes2pod.pl (gnupod) ###__VERSION__### +tunes2pod (gnupod) ###__VERSION__### Copyright (C) Adrian Ulrich 2002-2007 This is free software; see the source for copying conditions. There is NO --- gnupod-0.99.7/CHANGES 2009-09-12 09:02:43.000000000 +0000 +++ gnupod-0.99.7/CHANGES.new 2009-09-12 09:02:43.000000000 +0000 @@ -69,7 +69,7 @@ Summary ------- -- Fixed invalid warning about broken mhip header. (tunes2pod.pl) +- Fixed invalid warning about broken mhip header. (tunes2pod) - Less stricter Podcast-Playlist parsing - Reduced MP3::Info false-positives: Empty files are no longer detected as .mp3 files @@ -135,7 +135,7 @@ - Workaround for broken files written by 'Anapod' Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc - to enable it. Enabling it slows down tunes2pod.pl + to enable it. Enabling it slows down tunes2pod (because it deactivates the fast-skip of the (useless) MasterPlaylist) @@ -155,7 +155,7 @@ - gnupod_addsong can now fetch podcast-rss feeds! Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast' -- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes +- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work. Thanks to Chris Abajian for reporting this issue. @@ -402,7 +402,7 @@ iPods - GNUpod checks if the iTunesDB did change and - runs tunes2pod.pl if it has to run it + runs tunes2pod if it has to run it - Changed rating-schema to match SPL-Rating -> Rating 5 is now 100 (newrating=oldrating*20) @@ -463,7 +463,7 @@ -------- iTunesDB.pm and co: * Can read and write Playlist-Elements without child - tunes2pod.pl couldn't read files written by + tunes2pod couldn't read files written by (newer) MusicMatch releases.. this should fix the issue :) * Don't parse MasterPlaylists, do a seek() -> Speeds up parsing @@ -505,7 +505,7 @@ FileMagic.pm * Fixed (?) ID3v2 reading -tunes2pod.pl: +tunes2pod: * Added paranoia checks (stricter parsing) * Added SPL-Read code (BETA!) @@ -590,7 +590,7 @@ Use an UNICODE Texteditor to edit the GNUtunesDB.. (Like 'yudit' or the gnome2 texteditor) Your old latin1 GNUtunesDB will get converted to an - UTF8 version after running tunes2pod.pl/gnupod_addsong or + UTF8 version after running tunes2pod/gnupod_addsong or gnupod_delete.pl UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more @@ -601,8 +601,8 @@ gnuPod 0.28 -- Rewritten Playlistcode for tunes2pod.pl -- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore +- Rewritten Playlistcode for tunes2pod +- tunes2pod doesn't kill your empty GNUtunesDB anymore if it can't find the iTunesDB - mktunes uses now binmode(), maybe this helps RedHat 8 ? .. (and win32 ;) ) @@ -668,7 +668,7 @@ gnuPod 0.21 -- Fixed stupid tunes2pod.pl bug with big iTunesDBs +- Fixed stupid tunes2pod bug with big iTunesDBs (Thanks to Ciamac Moallemi for reporting and providing a patch) - Support for songnum, songs, cdnum, cds and year --- gnupod-0.99.7/FAQ 2009-09-12 09:02:43.000000000 +0000 +++ gnupod-0.99.7/FAQ.new 2009-09-12 09:02:43.000000000 +0000 @@ -180,7 +180,7 @@ But the iTunesDB-format isn't so complicated if you know how to write the specific parts and how you'll have to assemble them. -Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes +Just have a look at iTunesDB.pm and tunes2pod+mktunes ..or feel free to ask me questions about it: --- gnupod-0.99.7/README 2009-09-12 09:02:43.000000000 +0000 +++ gnupod-0.99.7/README.new 2009-09-12 09:02:43.000000000 +0000 @@ -35,7 +35,7 @@ gnupod_otgsync Handles On-The-Go Sync (not for humans) gnupod_search Search ;) mktunes Convert the GNUtunesDB.xml to a iTunesDB -tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml +tunes2pod Convert the iTunesDB into a GNUtunesDB.xml You'll have to use mktunes if you added/deleted/changed something on the iPod. sh /build/buildd/gnupod-tools-0.99.7/debian/maintenance/02install_incdir.sh gnupod-0.99.7 0.99.7 dh_testdir dh_testdir dh_testroot dh_clean -k -i dh_installdirs -i /usr/bin/make -C gnupod-0.99.7 install DESTDIR=/build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools make[1]: Entering directory `/build/buildd/gnupod-tools-0.99.7/gnupod-0.99.7' /bin/bash ./mkinstalldirs /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin /bin/bash ./mkinstalldirs /build/buildd/gnupod-tools-0.99.7/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/buildd/gnupod-tools-0.99.7/debian/gnupod-tools" Installing GNUpod 0.99.7-CVS using gnupod_install 0.25 > src/gnupod_addsong.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_addsong.pl > src/gnupod_check.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_check.pl > src/gnupod_convert_APE.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_convert_APE.pl > src/gnupod_convert_FLAC.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_convert_FLAC.pl > src/gnupod_convert_MIDI.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_convert_MIDI.pl > src/gnupod_convert_OGG.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_convert_OGG.pl > src/gnupod_convert_RIFF.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_convert_RIFF.pl > src/gnupod_INIT.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_INIT.pl > src/gnupod_otgsync.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_otgsync.pl > src/gnupod_search.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/gnupod_search.pl > src/mktunes.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/mktunes.pl > src/tunes2pod.pl --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/tunes2pod.pl Installing Modules at /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/ > src/ext/ArtworkDB.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/ArtworkDB.pm > src/ext/FileMagic.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/FileMagic.pm > src/ext/FooBar.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/FooBar.pm > src/ext/Hash58.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/Hash58.pm > src/ext/iTunesDB.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/iTunesDB.pm > src/ext/Mktunes.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/Mktunes.pm > src/ext/QTfile.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/QTfile.pm > src/ext/SysInfo.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/SysInfo.pm > src/ext/XMLhelper.pm --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/perl5/GNUpod/XMLhelper.pm Installing info-documentation (/build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/info/) install-info(doc/gnupod.info): no file /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/info//dir, retrieving backup file /var/backups/infodir.bak. * GNUpod: (gnupod). Manage your iPod. install-info(doc/gnupod.info): creating new section `GNU Packages' cp: cannot create regular file `/var/backups/infodir.bak': Permission denied install-info(doc/gnupod.info): could not backup /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/info//dir in /var/backups/infodir.bak: No such file or directory Installed info file, use 'info gnupod' to read the documentation. Installing manual pages > man/gnupod_addsong.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_addsong.pl.1.gz > man/gnupod_check.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_check.pl.1.gz > man/gnupod_convert_APE.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_convert_APE.pl.1.gz > man/gnupod_convert_FLAC.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_convert_FLAC.pl.1.gz > man/gnupod_convert_MIDI.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_convert_MIDI.pl.1.gz > man/gnupod_convert_OGG.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_convert_OGG.pl.1.gz > man/gnupod_convert_RIFF.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_convert_RIFF.pl.1.gz > man/gnupod_INIT.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_INIT.pl.1.gz > man/gnupod_otgsync.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_otgsync.pl.1.gz > man/gnupod_search.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/gnupod_search.pl.1.gz > man/mktunes.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/mktunes.pl.1.gz > man/tunes2pod.pl.1.gz --> /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/tunes2pod.pl.1.gz done! make[1]: Leaving directory `/build/buildd/gnupod-tools-0.99.7/gnupod-0.99.7' : # Drop the .pl from each manpage and executable name rename 's/\.pl//' /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/bin/*.pl rename 's/\.pl//' /build/buildd/gnupod-tools-0.99.7/debian/gnupod-tools/usr/share/man/man1/*.gz rm -f debian/gnupod-tools/usr/share/info/dir* /usr/bin/make -f debian/rules DH_OPTIONS=-i binary-common make[1]: Entering directory `/build/buildd/gnupod-tools-0.99.7' dh_testdir dh_testroot dh_installdocs gnupod-0.99.7/TODO gnupod-0.99.7/doc/fdl.texi gnupod-0.99.7/doc/version.texi gnupod-0.99.7/doc/gnupod.texi gnupod-0.99.7/doc/gnupod.html gnupod-0.99.7/doc/gnupodrc.example dh_installexamples gnupod-0.99.7/doc/gnutunesdb.example dh_installinfo gnupod-0.99.7/doc/gnupod.info dh_installman dh_installchangelogs gnupod-0.99.7/CHANGES dh_link dh_compress dh_fixperms dh_installdeb dh_perl dh_gencontrol dh_md5sums dh_builddeb pkgstriptranslations: processing control file: ./debian/gnupod-tools/DEBIAN/control, package gnupod-tools, directory ./debian/gnupod-tools pkgstriptranslations: gnupod-tools does not contain translations, skipping pkgstriptranslations: no translation files, not creating tarball pkgstriptranslations: static tarball already exists pkgmaintainermangler: Not overriding Maintainer for domain lists.ubuntu.com dpkg-deb: warning: 'debian/gnupod-tools/DEBIAN/control' contains user-defined field 'Original-Maintainer' dpkg-deb: ignoring 1 warnings about the control file(s) dpkg-deb: building package `gnupod-tools' in `../gnupod-tools_0.99.7-2ubuntu1_all.deb'. make[1]: Leaving directory `/build/buildd/gnupod-tools-0.99.7' dpkg-genchanges -b -mUbuntu/i386 Build Daemon >../gnupod-tools_0.99.7-2ubuntu1_i386.changes dpkg-genchanges: binary-only upload - not including any source code dpkg-buildpackage: binary only upload (no source included) ****************************************************************************** Build finished at 20090912-1002 chroot-autobuild/build/buildd/gnupod-tools_0.99.7-2ubuntu1_all.deb: new debian package, version 2.0. size 153038 bytes: control archive= 1977 bytes. 859 bytes, 16 lines control 3149 bytes, 46 lines md5sums Package: gnupod-tools Version: 0.99.7-2ubuntu1 Architecture: all Maintainer: Ubuntu Developers Installed-Size: 576 Depends: perl, dpkg (>= 1.15.4) | install-info, libxml-parser-perl, libunicode-string-perl, libxml-simple-perl, libmp3-info-perl, libogg-vorbis-header-pureperl-perl, libaudio-flac-header-perl, libdigest-sha1-perl, libtimedate-perl Recommends: gtkpod Suggests: timidity, lame, flac, faac, vorbis-tools Section: sound Priority: optional Homepage: http://www.gnu.org/software/gnupod Description: command-line tools for the iPod family of portable music players GNUpod is made up of scripts that allow a user to manage a collection of songs and playlists on an Apple iPod. The original iPod, iPod Mini, and iPod Shuffle players are all supported. Original-Maintainer: Raphael Bossek chroot-autobuild/build/buildd/gnupod-tools_0.99.7-2ubuntu1_all.deb: drwxr-xr-x root/root 0 2009-09-12 10:02 ./ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/bin/ -rwxr-xr-x root/root 7466 2009-09-12 10:02 ./usr/bin/gnupod_check -rwxr-xr-x root/root 2849 2009-09-12 10:02 ./usr/bin/gnupod_convert_APE -rwxr-xr-x root/root 3591 2009-09-12 10:02 ./usr/bin/gnupod_convert_FLAC -rwxr-xr-x root/root 3107 2009-09-12 10:02 ./usr/bin/gnupod_convert_MIDI -rwxr-xr-x root/root 3769 2009-09-12 10:02 ./usr/bin/gnupod_convert_OGG -rwxr-xr-x root/root 2004 2009-09-12 10:02 ./usr/bin/gnupod_convert_RIFF -rwxr-xr-x root/root 5209 2009-09-12 10:02 ./usr/bin/gnupod_otgsync -rwxr-xr-x root/root 9796 2009-09-12 10:02 ./usr/bin/gnupod_search -rwxr-xr-x root/root 28937 2009-09-12 10:02 ./usr/bin/gnupod_addsong -rwxr-xr-x root/root 5675 2009-09-12 10:02 ./usr/bin/mktunes -rwxr-xr-x root/root 12344 2009-09-12 10:02 ./usr/bin/tunes2pod -rwxr-xr-x root/root 5219 2009-09-12 10:02 ./usr/bin/gnupod_INIT drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/perl5/ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/perl5/GNUpod/ -rw-r--r-- root/root 19982 2009-09-12 10:02 ./usr/share/perl5/GNUpod/ArtworkDB.pm -rw-r--r-- root/root 15096 2009-09-12 10:02 ./usr/share/perl5/GNUpod/FileMagic.pm -rw-r--r-- root/root 11893 2009-09-12 10:02 ./usr/share/perl5/GNUpod/FooBar.pm -rw-r--r-- root/root 11828 2009-09-12 10:02 ./usr/share/perl5/GNUpod/Hash58.pm -rw-r--r-- root/root 54790 2009-09-12 10:02 ./usr/share/perl5/GNUpod/iTunesDB.pm -rw-r--r-- root/root 17771 2009-09-12 10:02 ./usr/share/perl5/GNUpod/Mktunes.pm -rw-r--r-- root/root 8477 2009-09-12 10:02 ./usr/share/perl5/GNUpod/QTfile.pm -rw-r--r-- root/root 4232 2009-09-12 10:02 ./usr/share/perl5/GNUpod/SysInfo.pm -rw-r--r-- root/root 11709 2009-09-12 10:02 ./usr/share/perl5/GNUpod/XMLhelper.pm drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/man/ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/man/man1/ -rw-r--r-- root/root 590 2009-09-12 10:02 ./usr/share/man/man1/gnupod_convert_FLAC.1.gz -rw-r--r-- root/root 590 2009-09-12 10:02 ./usr/share/man/man1/gnupod_convert_MIDI.1.gz -rw-r--r-- root/root 590 2009-09-12 10:02 ./usr/share/man/man1/gnupod_convert_OGG.1.gz -rw-r--r-- root/root 590 2009-09-12 10:02 ./usr/share/man/man1/gnupod_convert_RIFF.1.gz -rw-r--r-- root/root 520 2009-09-12 10:02 ./usr/share/man/man1/gnupod_otgsync.1.gz -rw-r--r-- root/root 1166 2009-09-12 10:02 ./usr/share/man/man1/mktunes.1.gz -rw-r--r-- root/root 1561 2009-09-12 10:02 ./usr/share/man/man1/gnupod_addsong.1.gz -rw-r--r-- root/root 1028 2009-09-12 10:02 ./usr/share/man/man1/gnupod_search.1.gz -rw-r--r-- root/root 661 2009-09-12 10:02 ./usr/share/man/man1/tunes2pod.1.gz -rw-r--r-- root/root 660 2009-09-12 10:02 ./usr/share/man/man1/gnupod_check.1.gz -rw-r--r-- root/root 590 2009-09-12 10:02 ./usr/share/man/man1/gnupod_convert_APE.1.gz -rw-r--r-- root/root 787 2009-09-12 10:02 ./usr/share/man/man1/gnupod_INIT.1.gz drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/info/ -rw-r--r-- root/root 19036 2009-09-12 10:02 ./usr/share/info/gnupod.info.gz drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/doc/ drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/ -rw-r--r-- root/root 151 2008-02-17 08:57 ./usr/share/doc/gnupod-tools/TODO -rw-r--r-- root/root 63 2008-02-17 08:56 ./usr/share/doc/gnupod-tools/version.texi -rw-r--r-- root/root 8433 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/changelog.gz -rw-r--r-- root/root 98723 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/gnupod.html -rw-r--r-- root/root 1559 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/gnupodrc.example -rw-r--r-- root/root 889 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/README.Debian -rw-r--r-- root/root 763 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/copyright drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/examples/ -rw-r--r-- root/root 1856 2004-10-12 17:00 ./usr/share/doc/gnupod-tools/examples/gnutunesdb.example.gz -rw-r--r-- root/root 7301 2003-02-09 14:20 ./usr/share/doc/gnupod-tools/fdl.texi.gz -rw-r--r-- root/root 11422 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/gnupod.texi.gz -rw-r--r-- root/root 2289 2009-09-12 10:02 ./usr/share/doc/gnupod-tools/changelog.Debian.gz drwxr-xr-x root/root 0 2009-09-12 10:02 ./usr/share/doc-base/ -rw-r--r-- root/root 275 2009-09-12 10:02 ./usr/share/doc-base/gnupod-tools gnupod-tools_0.99.7-2ubuntu1_i386.changes: Format: 1.8 Date: Sat, 12 Sep 2009 09:44:41 +0100 Source: gnupod-tools Binary: gnupod-tools Architecture: all Version: 0.99.7-2ubuntu1 Distribution: karmic Urgency: low Maintainer: Ubuntu/i386 Build Daemon Changed-By: Colin Watson Description: gnupod-tools - command-line tools for the iPod family of portable music players Changes: gnupod-tools (0.99.7-2ubuntu1) karmic; urgency=low . * Don't ship /usr/share/info/dir.gz or /usr/share/info/dir.old.gz (LP: #358854). Checksums-Sha1: 089ce15200514c88f46ee88aea83e6d5e8415360 153038 gnupod-tools_0.99.7-2ubuntu1_all.deb Checksums-Sha256: b7d1d37477885be3c86b1c1675a8402d525a5e4f0ebc3f3cdb59ad7036bb74db 153038 gnupod-tools_0.99.7-2ubuntu1_all.deb Files: aa44ed0c4fa887cae4c0f28ad2e60a35 153038 sound optional gnupod-tools_0.99.7-2ubuntu1_all.deb Launchpad-Bugs-Fixed: 358854 Original-Maintainer: Raphael Bossek ****************************************************************************** Built successfully Purging chroot-autobuild/build/buildd/gnupod-tools-0.99.7 ------------------------------------------------------------------------------ /usr/bin/sudo dpkg --purge sp groff-base libglib2.0-0 libdigest-sha1-perl gettext file libhtml-parser-perl libogg0 libwww-perl liburi-perl sgml-data libxml-libxml-common-perl libhtml-tree-perl po-debconf docbook libxml-parser-perl libogg-vorbis-header-pureperl-perl libcroco3 libhtml-tagset-perl libxml2 netbase man-db intltool-debian libxml-namespacesupport-perl libflac8 libxml-sax-perl xml-core libunicode-string-perl ucf libmp3-info-perl html2text libsp1c2 gettext-base debhelper libxml-libxml-perl sgml-base libxml-simple-perl libfile-ncopy-perl libmagic1 libaudio-flac-header-perl libexpat1 bsdmainutils docbook-to-man libpcre3 (Reading database ... 11576 files and directories currently installed.) Removing libdigest-sha1-perl ... Removing libxml-parser-perl ... Removing libogg-vorbis-header-pureperl-perl ... Removing libmp3-info-perl ... Removing debhelper ... Removing libxml-simple-perl ... Removing libfile-ncopy-perl ... Removing libaudio-flac-header-perl ... Removing libexpat1 ... Purging configuration files for libexpat1 ... Removing docbook-to-man ... Removing sp ... Removing file ... Purging configuration files for file ... Removing libwww-perl ... Removing libhtml-tree-perl ... Removing po-debconf ... Removing docbook ... Purging configuration files for docbook ... dpkg: warning: while removing docbook, directory '/usr/share/sgml/docbook' not empty so not removed. Removing netbase ... Purging configuration files for netbase ... Removing man-db ... Purging configuration files for man-db ... Removing intltool-debian ... Removing libflac8 ... Purging configuration files for libflac8 ... Removing libunicode-string-perl ... Removing html2text ... Purging configuration files for html2text ... Removing libsp1c2 ... Purging configuration files for libsp1c2 ... Removing libxml-libxml-perl ... update-perl-sax-parsers: Unregistering Perl SAX parser XML::LibXML::SAX::Parser with priority 50... update-perl-sax-parsers: Unregistering Perl SAX parser XML::LibXML::SAX with priority 50... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Replacing config file /etc/perl/XML/SAX/ParserDetails.ini with new version Removing libmagic1 ... Purging configuration files for libmagic1 ... Removing bsdmainutils ... Purging configuration files for bsdmainutils ... Removing groff-base ... Purging configuration files for groff-base ... Removing gettext ... Removing libhtml-parser-perl ... Removing libogg0 ... Purging configuration files for libogg0 ... Removing liburi-perl ... Removing sgml-data ... Purging configuration files for sgml-data ... Removing libxml-libxml-common-perl ... Removing libcroco3 ... Purging configuration files for libcroco3 ... Removing libhtml-tagset-perl ... Removing libxml2 ... Purging configuration files for libxml2 ... Removing libxml-sax-perl ... update-perl-sax-parsers: Unregistering Perl SAX parser XML::SAX::PurePerl with priority 50... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Purging configuration files for libxml-sax-perl ... Removing xml-core ... Purging configuration files for xml-core ... dpkg: warning: while removing xml-core, directory '/etc/sgml' not empty so not removed. Removing ucf ... Purging configuration files for ucf ... Removing gettext-base ... Removing sgml-base ... Purging configuration files for sgml-base ... dpkg: warning: while removing sgml-base, directory '/usr/share/sgml' not empty so not removed. Removing libglib2.0-0 ... Purging configuration files for libglib2.0-0 ... Removing libxml-namespacesupport-perl ... Removing libpcre3 ... Purging configuration files for libpcre3 ... Processing triggers for libc6 ... ldconfig deferred processing now taking place ****************************************************************************** Finished at 20090912-1002 Build needed 00:00:11, 1924k disk space RUN: /usr/share/launchpad-buildd/slavebin/scan-for-processes ['/usr/share/launchpad-buildd/slavebin/scan-for-processes', '1240156-2607213'] Scanning for processes to kill in build /home/buildd/build-1240156-2607213/chroot-autobuild... RUN: /usr/share/launchpad-buildd/slavebin/umount-chroot ['umount-chroot', '1240156-2607213'] Unmounting chroot for build 1240156-2607213... RUN: /usr/share/launchpad-buildd/slavebin/remove-build ['remove-build', '1240156-2607213'] Removing build 1240156-2607213