--- gnupod-tools-0.98.3.orig/.gnupod_version +++ gnupod-tools-0.98.3/.gnupod_version @@ -1 +1 @@ -0.98.2-CVS \ No newline at end of file +0.98.3 \ No newline at end of file --- gnupod-tools-0.98.3.orig/Makefile.in +++ gnupod-tools-0.98.3/Makefile.in @@ -15,7 +15,7 @@ install: ${SHELL} ./mkinstalldirs ${bindir} ${SHELL} ./mkinstalldirs ${mandir}/man1 - ${perlbinary} tools/gnupod_install.pl INSTALL "${perlbinary}" "${bindir}" "${infodir}" "${mandir}" + ${perlbinary} tools/gnupod_install.pl INSTALL "${perlbinary}" "${bindir}" "${infodir}" "${mandir}" $(DESTDIR) uninstall: ${perlbinary} tools/gnupod_install.pl REMOVE "${perlbinary}" "${bindir}" "${infodir}" "${mandir}" release: --- gnupod-tools-0.98.3.orig/src/ext/FileMagic.pm +++ gnupod-tools-0.98.3/src/ext/FileMagic.pm @@ -34,9 +34,9 @@ # done! # -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'}}; +my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'}, + 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'}, + 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG'}}; --- gnupod-tools-0.98.3.orig/src/ext/FooBar.pm +++ gnupod-tools-0.98.3/src/ext/FooBar.pm @@ -99,7 +99,7 @@ sub do_itbsync { my($con) = @_; -my $XBIN = "$con->{bindir}/tunes2pod.pl"; +my $XBIN = "$con->{bindir}/tunes2pod"; if(-x $XBIN) { { --- gnupod-tools-0.98.3.orig/src/gnupod_INIT.pl +++ gnupod-tools-0.98.3/src/gnupod_INIT.pl @@ -33,7 +33,7 @@ $opts{mount} = $ENV{IPOD_MOUNTPOINT}; #Don't add xml and itunes opts.. we *NEED* the mount opt to be set.. -GetOptions(\%opts, "version", "help|h", "mount|m=s", "disable-convert|d", "france|f"); +GetOptions(\%opts, "version", "help|h", "mount|m=s", "disable-convert|d", "france|f", "assume-yes|y"); #gnupod_INIT does not read configuration files! usage() if $opts{help}; @@ -72,7 +72,7 @@ EOF ## -; + unless $opts{'assume-yes'}; print "Creating directory structure on $opts{mount}\n\n"; print "> AppFolders:\n"; @@ -116,12 +116,12 @@ 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}); + $t2pfail = system("$con->{bindir}/tunes2pod", "--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}"); + $t2pfail = system("$con->{bindir}/mktunes", "-m" ,"$opts{mount}"); } if($t2pfail) { --- gnupod-tools-0.98.3.orig/tools/getINC.pl +++ gnupod-tools-0.98.3/tools/getINC.pl @@ -1 +1 @@ -print $INC[0]; +print $INC[4]; --- gnupod-tools-0.98.3.orig/tools/gnupod_install.pl +++ gnupod-tools-0.98.3/tools/gnupod_install.pl @@ -13,21 +13,22 @@ $opts{bindir} = $ARGV[2]; #Bindir $opts{infodir} = $ARGV[3]; #Infodir $opts{mandir} = $ARGV[4]; #Mandir +$opts{destdir} = $ARGV[5]; my $VINSTALL = `cat .gnupod_version`; #Version of this release #Check if everything looks okay.. die "File .gnupod_version does not exist, did you run configure?\n" unless $VINSTALL; -die "Expected 5 arguments, got ".int(@ARGV)."\n make will run me, not you! stupid human!" if !$opts{mandir} || $ARGV[5]; -die "Strange Perl installation, no \@INC! Can't install Perl-Module(s), killing myself..\n" if !$INC[0]; +die "Expected 6 arguments, got ".int(@ARGV)."\n make will run me, not you! stupid human!" if !$opts{destdir} || $ARGV[6]; +die "Strange Perl installation, no \@INC! Can't install Perl-Module(s), killing myself..\n" if !$INC[4]; if($opts{MODE} eq "INSTALL") { #ok, we are still alive, let's blow up the system ;) print "Installing GNUpod $VINSTALL using gnupod_install 0.24\n"; install_scripts("src/*.pl", $opts{bindir}); - install_pm("src/ext", "GNUpod", $opts{perlbin}, "/"); + install_pm("src/ext", "GNUpod", $opts{perlbin}, $opts{destdir}); install_info("doc/gnupod.info", $opts{infodir}); - install_man("man/*.gz", $opts{mandir}."/man1"); +# install_man("man/*.gz", $opts{mandir}."/man1"); killold("$opts{bindir}/gnupod_delete.pl") if -e "$opts{bindir}/gnupod_delete.pl"; #Kill legacy apps.. ;) print "done!\n"; } @@ -143,13 +144,13 @@ #Uninstall Modules sub remove_pm { my($globme, $modi) = @_; - print " > Removing Modules at $INC[0]/$modi\n"; + print " > Removing Modules at $INC[4]/$modi\n"; foreach (glob($globme)) { - my $rmme = $INC[0]."/$modi/".fof($_); + my $rmme = $INC[4]."/$modi/".fof($_); print " -> Removing $rmme "; killold($rmme); } - rmdir($INC[0]."/$modi") or print "Could not remove $INC[0]/$modi: $!\n"; + rmdir($INC[4]."/$modi") or print "Could not remove $INC[4]/$modi: $!\n"; } @@ -174,11 +175,11 @@ sub install_pm { my($basedir, $modi, $perlbin, $pfix) = @_; -mkdir("$pfix"."$INC[0]/$modi", 0755); #Create $INC[0]/GNUpod -print "Installing Modules at $pfix$INC[0]/$modi\n"; +mkdir("$pfix"."$INC[4]/$modi", 0755); #Create $INC[0]/GNUpod +print "Installing Modules at $pfix$INC[4]/$modi\n"; foreach my $file (glob("$basedir/*.pm")) { - my $dest = "$pfix"."$INC[0]/$modi/".fof($file); + my $dest = "$pfix"."$INC[4]/$modi/".fof($file); print " > $file --> $dest\n"; ncp($file, $dest); chmod 0444, $dest; #Try to chown and chmod .. root should be owner of this modules.. @@ -195,6 +196,7 @@ foreach(glob($glob)) { $file = fof($_); + $file =~ s/\.pl$//; print " > $_ --> $dest/$file\n"; ncp($_,"$dest/$file"); #'fix' premissions... --- gnupod-tools-0.98.3.orig/debian/changelog +++ gnupod-tools-0.98.3/debian/changelog @@ -0,0 +1,130 @@ +gnupod-tools (0.98.3-1.1ubuntu1) feisty; urgency=low + + * Re-sync with Debian. Retained change: + * gnupod-tools (0.98-3ubuntu1) breezy; urgency=low + * src/ext/FooBar.pm, change call from gnupod_otgsync to gnupod_otgsync.pl + * -- Barry deFreese Sat, 17 Sep 2005 14:41:08 -0400 + + -- Barry deFreese Wed, 20 Dec 2006 13:13:51 -0500 + +gnupod-tools (0.98.3-1.1) unstable; urgency=medium + + * NMU from the Cambridge BSP. + * Fix the sed pipeline on manpages so that they don't get truncated. + Closes: #343333 + * Add a binary-arch: target in debian/rules. Closes: #395601 + * Fixed multiple lintian warnings/errors: + + build-depends-indep-should-be-build-depends debhelper + + + + -- Steve McIntyre <93sam@debian.org> Sat, 28 Oct 2006 16:15:12 +0100 + +gnupod-tools (0.98.3-1) unstable; urgency=low + + * New upstream release (Closes: #336630) + + -- Brian Nelson Sat, 12 Nov 2005 15:44:12 -0800 + +gnupod-tools (0.98.2-1) unstable; urgency=low + + * New upstream release + - Crop filenames after 49 chars to cope with iPod Mini's reduction of + maximum length from 64 to 55 (Closes: #320400) + * Bumped standards version to 3.6.2 + * Use ${perl:Depends} and ${misc:Depends} variable substitutions to + generate proper dependencies + + -- Brian Nelson Sat, 20 Aug 2005 00:31:28 -0700 + +gnupod-tools (0.98-3) unstable; urgency=low + + * Removed all of the manpages in the debian dir, use the upstream ones + from now on + * debian/rules: removed the docbook2man stuff + * debian/control: removed the dependency on docbook-utils | + docbook-to-man + * debian/control: (hopefully) improved the package description + + -- Brian Nelson Mon, 20 Jun 2005 11:27:40 +0300 + +gnupod-tools (0.98-2) unstable; urgency=low + + * Changed the libaudio-flac-perl dependency to libaudio-flac-header-perl + + -- Brian Nelson Tue, 5 Apr 2005 09:10:01 -0700 + +gnupod-tools (0.98-1) unstable; urgency=low + + * New maintainer (Closes: #287987) + * New upstream release + - Fixes id3v2.2 tag support (Closes: #240637) + * Added dependencies on libogg-vorbis-header-pureperl-perl and + libaudio-flac-perl. It should be using libaudio-flac-header-perl + instead, but that's currently stuck in the NEW queue. + * Modified scripts to try to run each other without the .pl file + extension. (Closes: #239315) + * src/gnupod_INIT.pl: added an "assume-yes|y" option to disable the + continue prompt. This allows the script to be run noninteractively. + * Fixed broken multi-line build-depends + * Suggest lame, flac, faac, and vorbis-tools + + -- Brian Nelson Wed, 2 Mar 2005 00:21:19 -0800 + +gnupod-tools (0.94rc1-1) unstable; urgency=low + + * New upstream release. Closes: #230570. + * the function getutf8 is rewritten. Closes: #213050. + * The duplicate detection has been re-written from 0.92. Closes: #224886. + Feel free to re-open this bug if you feel the duplicate detection + doesn't match your needs. + * The "restore" fix from Lukas has been applied on this package, and the + "TIT2" bug has been fixed by the upstream author. + Closes: #225052. + + -- Quôc Peyrot Sun, 1 Feb 2004 00:32:51 +0000 + +gnupod-tools (0.91-2) unstable; urgency=low + + * src/ext/FileMagic.pm: Filter null char from idv2 tags. Closes #213050. + + -- Quôc Peyrot Sun, 28 Sep 2003 09:37:27 +0000 + +gnupod-tools (0.91-1) unstable; urgency=low + + * New upstream release. + * Change the debian maintainer email to chojin@debian.org. + * Update policy revision to 3.6.1 (use UTF-8). + * Gnupod-tools has been rewritten by the upstream author and doesn't depend + anymore on Getopt::Mixed. Closes: #193936. + + * debian/gnupod_INITpod.sgml: Rename to gnupod_INIT.sgml. + * debian/gnupod_delete.sgml, debian/gnupod_list.sgml, debian/gnupod_m3u2pl.sgml, + debian/gnupod_mkm3u.sgml, debian/gnupod_renumber.sgml: Delete. + * debian/gnupod_INIT.sgml, debian/gnupod_addsong.sgml, + debian/gnupod_search.sgml, debian/mktunes.sgml, debian/tunes2pod.sgml: Update. + + * Fix the bug #199954 again. The patch has been submitted to the upstream author. + + -- Quôc Peyrot Sun, 21 Sep 2003 12:28:33 +0000 + +gnupod-tools (0.28-3) unstable; urgency=low + + * src/gnupod_addsong.pl: Get raw id3v3 tag and check for existance of + TCOM key instead of the non-existing 'COMPOSER' key. Closes: #199954. + * Update policy revision to 3.5.10 + + -- Quôc Peyrot Mon, 7 Jul 2003 00:00:40 +0000 + +gnupod-tools (0.28-2) unstable; urgency=low + + * Oops, forgot to duplicate build dependencies to package dependencies. Closes: #190298. + * Oops, Remove Julien Lemoine from co-maintainer. + * Update policy revision. + + -- Quôc Peyrot Wed, 23 Apr 2003 15:53:27 +0000 + +gnupod-tools (0.28-1) unstable; urgency=low + + * Initial Release. Closes: #182250. + + -- Quôc Peyrot Mon, 14 Apr 2003 01:16:37 +0000 --- gnupod-tools-0.98.3.orig/debian/control +++ gnupod-tools-0.98.3/debian/control @@ -0,0 +1,20 @@ +Source: gnupod-tools +Section: sound +Priority: optional +Maintainer: Brian Nelson +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 +Standards-Version: 3.6.2 + +Package: gnupod-tools +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, libxml-parser-perl, libunicode-string-perl, libxml-simple-perl, libmp3-info-perl, libogg-vorbis-header-pureperl-perl, libaudio-flac-header-perl +Suggests: lame, flac, faac, vorbis-tools +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. + . + For a GUI application with a similar scope, see the gtkpod package. + . + homepage: http://www.gnu.org/software/gnupod --- gnupod-tools-0.98.3.orig/debian/rules +++ gnupod-tools-0.98.3/debian/rules @@ -0,0 +1,80 @@ +#!/usr/bin/make -f +# debian/rules file for the Debian/GNU Linux gnupod-tools package +# Copyright 2003 by Quôc Peyrot +# Copyright 2005 by Brian Nelson + +export DH_COMPAT=4 +export DH_OPTIONS + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +config.status: configure + dh_testdir + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: build-indep + +build-indep: build-indep-stamp +build-indep-stamp: config.status + dh_testdir + +clean: + dh_testdir + dh_testroot + -$(MAKE) distclean + rm -f build-indep-stamp \ + config-stamp \ + config.cache \ + config.status \ + config.log \ + Makefile + + -chmod ugo-x doc/* + dh_clean + +install: install-indep +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + $(MAKE) install DESTDIR=$(CURDIR)/debian/gnupod-tools prefix=$(CURDIR)/debian/gnupod-tools/usr + +# Install the manpages manually, since for some reason make install +# doesn't do it. + cp man/*.gz $(CURDIR)/debian/gnupod-tools/usr/share/man/man1/ + +# Drop the .pl from each manpage name + rename 's/\.pl//' $(CURDIR)/debian/gnupod-tools/usr/share/man/man1/*.gz +# And drop internal references to the .pl extension + @for i in $(CURDIR)/debian/gnupod-tools/usr/share/man/man1/*.gz; do \ + zcat $$i | sed 's/\.pl//g' | gzip -c --best > $$i.tmp; \ + mv $$i.tmp $$i; \ + done + +binary-common: + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples doc/gnutunesdb.example + dh_installinfo + dh_installman + dh_installchangelogs CHANGES + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build + +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary install install-indep --- gnupod-tools-0.98.3.orig/debian/dirs +++ gnupod-tools-0.98.3/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/perl5 +usr/share/man/man1 --- gnupod-tools-0.98.3.orig/debian/docs +++ gnupod-tools-0.98.3/debian/docs @@ -0,0 +1,6 @@ +CHANGES +TODO +doc/fdl.texi +doc/version.texi +doc/gnupod.texi +doc/gnupod.html --- gnupod-tools-0.98.3.orig/debian/README.Debian +++ gnupod-tools-0.98.3/debian/README.Debian @@ -0,0 +1,6 @@ +gnupod-tools for Debian +----------------- + +All extensions .pl were removed. + + -- Quôc Peyrot , Mon, 14 Apr 2003 01:40:56 +0000 --- gnupod-tools-0.98.3.orig/debian/copyright +++ gnupod-tools-0.98.3/debian/copyright @@ -0,0 +1,16 @@ +This package was debianized by Quôc Peyrot on Mon, +14 Apr 2003 01:08:15 +0000. It is now maintained by Brian Nelson +. + +It was downloaded from http://blinkenlights.ch/gnupod-dist/stable/ + +Upstream Authors: Adrian Ulrich + Eric C. Cooper + +Copyright (C) 2002-2003 Adrian Ulrich + 2002 Eric C. Cooper + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. --- gnupod-tools-0.98.3.orig/debian/info +++ gnupod-tools-0.98.3/debian/info @@ -0,0 +1 @@ +doc/gnupod.info --- gnupod-tools-0.98.3.orig/debian/doc-base +++ gnupod-tools-0.98.3/debian/doc-base @@ -0,0 +1,12 @@ +Document: gnupod-tools +Title: Debian gnupod-tools Manual +Author: Adrian Ulrich +Abstract: This manual describes what gnupod-tools is + and how it can be used. +Section: Apps/Tools + +Format: HTML +Index: /usr/share/doc/gnupod-tools/gnupod.html +Files: /usr/share/doc/gnupod-tools/*.html + +