--- gtkpod-aac-0.99.12.orig/debian/watch +++ gtkpod-aac-0.99.12/debian/watch @@ -0,0 +1,3 @@ +version=3 +# yes, this is to avoid sf's perverse mirror system +http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz debian uupdate --- gtkpod-aac-0.99.12.orig/debian/rules +++ gtkpod-aac-0.99.12/debian/rules @@ -0,0 +1,68 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + +build: build-stamp + +build-stamp: patch config.status + dh_testdir + + $(MAKE) + pod2man --release "gtkpod 0.99.12" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1 + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade* + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod-aac + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installman gtkpod.1 + dh_install + dh_desktop + dh_icons + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gtkpod-aac-0.99.12.orig/debian/copyright +++ gtkpod-aac-0.99.12/debian/copyright @@ -0,0 +1,65 @@ +This package was debianized by Quôc Peyrot on +Tue, 22 Apr 2003 05:16:37 +0000. + +It was downloaded from http://gtkpod.sourceforge.net/ + +Upstream Authors: +Jorg Schuler +Corey Donohoe +Adrian Ulrich + +Copyright: + +src/getopt*.{c,h}: + Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001 + Free Software Foundation, Inc. +src/misc.{c,h}: + Copyright (C) 1994-2001 Jeff Tranter + Copyright (C) 2002-2003 Jorg Schuler +src/dirbrowser.{c,h}: + Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, + Thomas Nilsson and 4Front Technologies + Copyright (C) 1999-2002 Haavard Kvaalen + Copyright (C) 2003 Jorg Schuler +src/wavfile.{c,h}: + Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, + Thomas Nilsson and 4Front Technologies + Copyright (C) 2002-2003 Jorg Schuler +src/prefs_window.{c,h}, +src/md5.{c,h}, +src/file_export.c, +src/context_menus.{c,h}: + Copyright (C) 2002-2003 Corey Donohoe +src/mp3file.{c,h}: + Copyright (C) 2000-2001 Cedric Tefft + Copyright (C) 2002-2003 Jorg Schuler + Copyright (C) 2004 Jens Taprogge +src/playlist.{c,h}: + Copyright (C) 2002 Adrian Ulrich + Copyright (C) 2002-2003 Jorg Schuler +src/itunessd.{c,h}: + Copyright 2005 Steve Wahl + +All other files: + Copyright (C) 2002-2003 Jorg Schuler + +iTunes and iPod are trademarks of Apple. + +This product is not supported/written/published by Apple! + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- gtkpod-aac-0.99.12.orig/debian/patches/00list +++ gtkpod-aac-0.99.12/debian/patches/00list @@ -0,0 +1,2 @@ +01_mountpoint +aac-configure --- gtkpod-aac-0.99.12.orig/debian/patches/01_mountpoint.dpatch +++ gtkpod-aac-0.99.12/debian/patches/01_mountpoint.dpatch @@ -0,0 +1,275 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_mountpoint.dpatch by Nico Golde +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gtkpod-aac-0.99.10~/README gtkpod-aac-0.99.10/README +--- gtkpod-aac-0.99.10~/README 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/README 2007-11-20 02:15:23.000000000 -0500 +@@ -52,7 +52,7 @@ + 1) If your iPod is not mounted automatically when connecting it to + your computer follow steps 1-7 in the "Connecting your iPod to a + Linux box" (basically you need to get the iPod partition mounted to +- /mnt/ipod). In most cases this should not be necessary any more ++ /media/ipod). In most cases this should not be necessary any more + these days. + + 2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will +@@ -699,13 +699,13 @@ + (Obviously you need to change the filesystem type from 'vfat' to + 'hfsplus' when you use an HFS formatted iPod.) + +- Then simply add a link from /mnt/ipod: ++ Then simply add a link from /media/ipod: + +- ln -s /var/autofs/removable/ipod /mnt/ipod ++ ln -s /var/autofs/removable/ipod /media/ipod + + + Now your system is configured to mount the iPod every time you access +-/mnt/ipod and to unmount it again after two seconds of inactivity. You ++/media/ipod and to unmount it again after two seconds of inactivity. You + won't have to worry about doing mounting/unmouting yourself any more. + + +@@ -750,19 +750,19 @@ + * -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) + + +-3) Create /mnt/ipod: ++3) Create /media/ipod: + +- mkdir /mnt/ipod ++ mkdir /media/ipod + + 4) Add a line to /etc/fstab. You should edit uid to match your user + id. Also, /dev/sda2 may not be appropriate, if you have other scsi + devices. + +-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,errors=remount 0 0 ++/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,errors=remount 0 0 + + (For HFS this line should read + +-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0 ++/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0 + + please note that it's just '/dev/sda') + +@@ -770,7 +770,7 @@ + NOTE: Some users have had problems with newer versions of mount(newer than + mount-2.11h) The following fstab entry might work better for you. + +-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0 ++/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0 + + 5) Install the hotplug utilities + (http://linux-hotplug.sourceforge.net/, debian package: 'hotplug') +@@ -819,13 +819,13 @@ + + 7) Mount the iPod hard drive + +- mount /mnt/ipod ++ mount /media/ipod + + 8) do whatever you need to do (e.g. start gtkpod, see below) + + 9) Unmount the iPod: + +- umount /mnt/ipod ++ umount /media/ipod + + 10) Unload the module sbp2 (as most likely as root): + +@@ -874,19 +874,19 @@ + * -> Codepage 437 (CONFIG_NLS_CODEPAGE_437) + * -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1) + +-3) Create /mnt/ipod: ++3) Create /media/ipod: + +- mkdir /mnt/ipod ++ mkdir /media/ipod + + 4) Add a line to /etc/fstab. You should edit uid to match your user + id. Also, /dev/sda2 may not be appropriate, if you have other scsi + devices. + +-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime 0 0 ++/dev/sda2 /media/ipod vfat rw,user,noauto,noatime 0 0 + + (For HFS this line should read + +-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0 ++/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0 + + please note that it's just '/dev/sda') + +@@ -894,7 +894,7 @@ + NOTE: Some users have had problems with newer versions of mount(newer than + mount-2.11h) The following fstab entry might work better for you. + +-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0 ++/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0 + + NOTE: You can add ",umask=0" to the options to make the iPod + readable/writable for all users. +@@ -934,13 +934,13 @@ + + 7) Mount the iPod hard drive + +- mount /mnt/ipod ++ mount /media/ipod + + 8) do whatever you need to do (e.g. start gtkpod, see below) + + 9) Unmount the iPod: + +- umount /mnt/ipod ++ umount /media/ipod + + 10) Unload the module sbp2 (as most likely as root): + +@@ -974,7 +974,7 @@ + - since the iPod's hdd was already spun up, the SCSI subsystem now + recognizes it and mounts it as /dev/sda + +-- You can then mount /dev/sda2 to /mnt/ipod as normal." ++- You can then mount /dev/sda2 to /media/ipod as normal." + + On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had + any problem whatsoever getting the iPod to work. With IEEE it was +@@ -1030,10 +1030,10 @@ + /**********/ + Add a line similar to the below to your /etc/fstab, this will enable users + to mount the ipod with read/write capabilities. Example line assumes your +-ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda ++ipod mount point is /media/ipod and your ipod is detected as /dev/sda + + ------------------------------- Begin Here --------------------------------- +-/dev/sda2 /mnt/ipod vfat rw,user,noauto 0 0 ++/dev/sda2 /media/ipod vfat rw,user,noauto 0 0 + ------------------------------- End Here ----------------------------------- + + +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-abook.sh gtkpod-aac-0.99.10/scripts/sync-abook.sh +--- gtkpod-aac-0.99.10~/scripts/sync-abook.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-abook.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -9,7 +9,7 @@ + # + # with the following defaults: + +-IPOD_MOUNT='/mnt/ipod' # mount point of ipod ++IPOD_MOUNT='/media/ipod' # mount point of ipod + DATAFILE='~/.abook/addressbook' # the abook db + ENCODING_FROM=UTF-8 # encoding used by abook + ENCODING=ISO-8859-15 # encoding used by ipod +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh +--- gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -10,7 +10,7 @@ + # + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + + #the path to a script that will be passed the ical information from STDIN and filter, if needed + #FILTER_SCRIPT= +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evolution.sh gtkpod-aac-0.99.10/scripts/sync-evolution.sh +--- gtkpod-aac-0.99.10~/scripts/sync-evolution.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-evolution.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -13,6 +13,6 @@ + # + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + ENCODING=ISO-8859-15 # encoding used by ipod + +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh +--- gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -9,7 +9,7 @@ + # + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file + ENCODING=ISO-8859-15 # encoding used by ipod + +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh gtkpod-aac-0.99.10/scripts/sync-korganizer.sh +--- gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-korganizer.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -9,7 +9,7 @@ + # + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file + ENCODING=ISO-8859-15 # encoding used by ipod + +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-ldif.sh gtkpod-aac-0.99.10/scripts/sync-ldif.sh +--- gtkpod-aac-0.99.10~/scripts/sync-ldif.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-ldif.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -15,7 +15,7 @@ + # differently...This is still Chinese for me!! :) + + export LDIFAMILYNAME=contactIPOD # Filenames will look like $LDIFAMILYNAMEXX.vcf, X=[0-9] +-export IPOD_MOUNT=/mnt/ipod # Mount point of the ipod ++export IPOD_MOUNT=/media/ipod # Mount point of the ipod + declare LDIFILE=addressbook.ldif # default filename 'addressbook.ldif' + declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv --list' + declare DELETE="NO" # To delete old .vcf files by default? 'NO'!! +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh +--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -25,7 +25,7 @@ + + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + ENCODING=ISO-8859-15 # encoding used by ipod + NAME=thunderbird # default file export name + FILE_FLAG='' # flag used to determine end of file +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh +--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -18,7 +18,7 @@ + + # with the following defaults: + +-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod ++IPOD_MOUNT=/media/ipod # mountpoint of ipod + ENCODING=ISO-8859-15 # encoding used by ipod + NAME=thunderbird # default file export name + +diff -urNad gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh +--- gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh 2007-11-20 01:41:04.000000000 -0500 ++++ gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh 2007-11-20 02:15:23.000000000 -0500 +@@ -9,7 +9,7 @@ + # with the following defaults: + + # mount point of ipod +-IPOD_MOUNT='/mnt/ipod' ++IPOD_MOUNT='/media/ipod' + # uri for webcalendar (example) + DATAFILE='https://somewhere.local/calendar.ics' + # calendar name +diff -urNad gtkpod-aac-0.99.10~/src/prefs.c gtkpod-aac-0.99.10/src/prefs.c +--- gtkpod-aac-0.99.10~/src/prefs.c 2007-11-20 02:14:59.000000000 -0500 ++++ gtkpod-aac-0.99.10/src/prefs.c 2007-11-20 02:15:42.000000000 -0500 +@@ -178,7 +178,7 @@ + prefs_set_int("delete_file", TRUE); + prefs_set_int("delete_local_file", TRUE); + prefs_set_int("delete_database", TRUE); +- prefs_set_string("initial_mountpoint", "/mnt/ipod"); ++ prefs_set_string("initial_mountpoint", "/media/ipod"); + prefs_set_string ("path_play_now", "xmms %s"); + prefs_set_string ("path_play_enqueue", "xmms -e %s"); + prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/"); --- gtkpod-aac-0.99.12.orig/debian/patches/aac-configure.dpatch +++ gtkpod-aac-0.99.12/debian/patches/aac-configure.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## aac-configure.dpatch by Timo Aaltonen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change the indentity of the package. + +@DPATCH@ +diff -urNad gtkpod-0.99.10~/configure gtkpod-0.99.10/configure +--- gtkpod-0.99.10~/configure 2007-06-28 05:30:23.000000000 +1000 ++++ gtkpod-0.99.10/configure 2007-07-17 18:01:38.000000000 +1000 +@@ -2098,7 +2098,7 @@ + + + # Define the identity of the package. +- PACKAGE=gtkpod ++ PACKAGE=gtkpod-aac + VERSION=0.99.12 + + --- gtkpod-aac-0.99.12.orig/debian/gtkpod-aac.diff +++ gtkpod-aac-0.99.12/debian/gtkpod-aac.diff @@ -0,0 +1,412 @@ +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/changelog /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/changelog +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/control /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/control +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/control 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/control 2007-11-20 02:24:30.000000000 -0500 +@@ -1,21 +1,27 @@ +-Source: gtkpod ++Source: gtkpod-aac + Section: sound + Priority: extra +-Maintainer: gtkpod Maintainers ++Maintainer: Timo Aaltonen ++XSBC-Original-Maintainer: gtkpod Maintainers + Uploaders: Frank Lichtenheld , Nico Golde +-Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch ++Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch, libmp4v2-dev + Standards-Version: 3.7.2 + Homepage: http://www.gtkpod.org + Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk + Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk + +-Package: gtkpod ++Package: gtkpod-aac + Architecture: any + Depends: ${shlibs:Depends} + Suggests: mp3gain, recode, python ++Conflicts: gtkpod ++Provides: gtkpod ++Replaces: gtkpod + Description: manage songs and playlists on an Apple iPod + gtkpod is a platform independent GUI for Apple's iPod using GTK2. It + allows you to upload songs and playlists to your iPod. It supports ID3 + tag editing, multiple charsets for ID3 tags, detects duplicate songs, + allows offline modification of the database with later synchronisation, + and more. ++ . ++ This version has aac/mp4-support. +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/gtkpod.desktop /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/gtkpod.desktop +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/gtkpod.desktop 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/gtkpod.desktop 2007-11-20 02:24:30.000000000 -0500 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Name=gtkpod +-Icon=gtkpod-icon-32x32.png ++Icon=gtkpod-icon-32x32 + Comment=Manage songs and playlists on your Apple iPod + Exec=gtkpod + Terminal=false +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/00list /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/00list +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/00list 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/00list 2007-11-20 02:24:30.000000000 -0500 +@@ -1,3 +1,5 @@ + 01_mountpoint + 02_missing_fclose + 03_itdb-set-local-to-imported ++aac-configure ++disable-mp4-grouping +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/01_mountpoint.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/01_mountpoint.dpatch +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/01_mountpoint.dpatch 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/01_mountpoint.dpatch 2007-11-20 02:24:30.000000000 -0500 +@@ -5,9 +5,9 @@ + ## DP: No description. + + @DPATCH@ +-diff -urNad trunk~/README trunk/README +---- trunk~/README 2007-11-18 16:47:22.000000000 +0100 +-+++ trunk/README 2007-11-18 16:48:21.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/README gtkpod-aac-0.99.10/README ++--- gtkpod-aac-0.99.10~/README 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/README 2007-11-20 02:15:23.000000000 -0500 + @@ -52,7 +52,7 @@ + 1) If your iPod is not mounted automatically when connecting it to + your computer follow steps 1-7 in the "Connecting your iPod to a +@@ -154,9 +154,9 @@ + ------------------------------- End Here ----------------------------------- + + +-diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh +---- trunk~/scripts/sync-abook.sh 2007-11-18 16:28:19.000000000 +0100 +-+++ trunk/scripts/sync-abook.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-abook.sh gtkpod-aac-0.99.10/scripts/sync-abook.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-abook.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-abook.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -9,7 +9,7 @@ + # + # with the following defaults: +@@ -166,9 +166,9 @@ + DATAFILE='~/.abook/addressbook' # the abook db + ENCODING_FROM=UTF-8 # encoding used by abook + ENCODING=ISO-8859-15 # encoding used by ipod +-diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh +---- trunk~/scripts/sync-evocalendar.sh 2007-11-18 16:28:23.000000000 +0100 +-+++ trunk/scripts/sync-evocalendar.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -10,7 +10,7 @@ + # + # with the following defaults: +@@ -178,9 +178,9 @@ + + #the path to a script that will be passed the ical information from STDIN and filter, if needed + #FILTER_SCRIPT= +-diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh +---- trunk~/scripts/sync-evolution.sh 2007-11-18 16:28:26.000000000 +0100 +-+++ trunk/scripts/sync-evolution.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evolution.sh gtkpod-aac-0.99.10/scripts/sync-evolution.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-evolution.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-evolution.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -13,7 +13,7 @@ + # + # with the following defaults: +@@ -190,9 +190,9 @@ + EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin' # additional path + ENCODING=ISO-8859-15 # encoding used by ipod + +-diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh +---- trunk~/scripts/sync-kaddressbook.sh 2007-11-18 16:28:29.000000000 +0100 +-+++ trunk/scripts/sync-kaddressbook.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -9,7 +9,7 @@ + # + # with the following defaults: +@@ -202,9 +202,9 @@ + DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file + ENCODING=ISO-8859-15 # encoding used by ipod + +-diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh +---- trunk~/scripts/sync-korganizer.sh 2007-11-18 16:28:35.000000000 +0100 +-+++ trunk/scripts/sync-korganizer.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh gtkpod-aac-0.99.10/scripts/sync-korganizer.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-korganizer.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -9,7 +9,7 @@ + # + # with the following defaults: +@@ -214,9 +214,9 @@ + DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file + ENCODING=ISO-8859-15 # encoding used by ipod + +-diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh +---- trunk~/scripts/sync-ldif.sh 2007-11-18 16:28:40.000000000 +0100 +-+++ trunk/scripts/sync-ldif.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-ldif.sh gtkpod-aac-0.99.10/scripts/sync-ldif.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-ldif.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-ldif.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -15,7 +15,7 @@ + # differently...This is still Chinese for me!! :) + +@@ -226,9 +226,9 @@ + declare LDIFILE=addressbook.ldif # default filename 'addressbook.ldif' + declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv --list' + declare DELETE="NO" # To delete old .vcf files by default? 'NO'!! +-diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh +---- trunk~/scripts/sync-thunderbird-nano.sh 2007-11-18 16:28:43.000000000 +0100 +-+++ trunk/scripts/sync-thunderbird-nano.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -25,7 +25,7 @@ + + # with the following defaults: +@@ -238,9 +238,9 @@ + ENCODING=ISO-8859-15 # encoding used by ipod + NAME=thunderbird # default file export name + FILE_FLAG='' # flag used to determine end of file +-diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh +---- trunk~/scripts/sync-thunderbird.sh 2007-11-18 16:28:46.000000000 +0100 +-+++ trunk/scripts/sync-thunderbird.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -18,7 +18,7 @@ + + # with the following defaults: +@@ -250,9 +250,9 @@ + ENCODING=ISO-8859-15 # encoding used by ipod + NAME=thunderbird # default file export name + +-diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh +---- trunk~/scripts/sync-webcalendar.sh 2007-11-18 16:28:52.000000000 +0100 +-+++ trunk/scripts/sync-webcalendar.sh 2007-11-18 16:48:16.000000000 +0100 ++diff -urNad gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh ++--- gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh 2007-11-20 01:41:04.000000000 -0500 +++++ gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh 2007-11-20 02:15:23.000000000 -0500 + @@ -9,7 +9,7 @@ + # with the following defaults: + +@@ -262,3 +262,15 @@ + # uri for webcalendar (example) + DATAFILE='https://somewhere.local/calendar.ics' + # calendar name ++diff -urNad gtkpod-aac-0.99.10~/src/prefs.c gtkpod-aac-0.99.10/src/prefs.c ++--- gtkpod-aac-0.99.10~/src/prefs.c 2007-11-20 02:14:59.000000000 -0500 +++++ gtkpod-aac-0.99.10/src/prefs.c 2007-11-20 02:15:42.000000000 -0500 ++@@ -178,7 +178,7 @@ ++ prefs_set_int("delete_file", TRUE); ++ prefs_set_int("delete_local_file", TRUE); ++ prefs_set_int("delete_database", TRUE); ++- prefs_set_string("initial_mountpoint", "/mnt/ipod"); +++ prefs_set_string("initial_mountpoint", "/media/ipod"); ++ prefs_set_string ("path_play_now", "xmms %s"); ++ prefs_set_string ("path_play_enqueue", "xmms -e %s"); ++ prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/"); +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/aac-configure.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/aac-configure.dpatch 1969-12-31 19:00:00.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/aac-configure.dpatch 2007-11-20 02:24:30.000000000 -0500 +@@ -0,0 +1,19 @@ ++#! /bin/sh /usr/share/dpatch/dpatch-run ++## aac-configure.dpatch by Timo Aaltonen ++## ++## All lines beginning with `## DP:' are a description of the patch. ++## DP: Change the indentity of the package. ++ ++@DPATCH@ ++diff -urNad gtkpod-0.99.10~/configure gtkpod-0.99.10/configure ++--- gtkpod-0.99.10~/configure 2007-06-28 05:30:23.000000000 +1000 +++++ gtkpod-0.99.10/configure 2007-07-17 18:01:38.000000000 +1000 ++@@ -2098,7 +2098,7 @@ ++ ++ ++ # Define the identity of the package. ++- PACKAGE=gtkpod +++ PACKAGE=gtkpod-aac ++ VERSION=0.99.10 ++ ++ +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/disable-mp4-grouping.dpatch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/disable-mp4-grouping.dpatch +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/patches/disable-mp4-grouping.dpatch 1969-12-31 19:00:00.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/patches/disable-mp4-grouping.dpatch 2007-11-20 02:24:30.000000000 -0500 +@@ -0,0 +1,113 @@ ++#! /bin/sh /usr/share/dpatch/dpatch-run ++## 02-disable-mp4-grouping.dpatch by ++## ++## All lines beginning with `## DP:' are a description of the patch. ++## DP: modify m4 handler to support current Ubuntu mp4 library and ++## DP: update the build system to link properly ++ ++@DPATCH@ ++diff -urNad gtkpod-aac-0.99.10~/configure gtkpod-aac-0.99.10/configure ++--- gtkpod-aac-0.99.10~/configure 2007-11-04 21:46:35.000000000 -0500 +++++ gtkpod-aac-0.99.10/configure 2007-11-04 21:46:35.000000000 -0500 ++@@ -8380,9 +8380,9 @@ ++ ++ ++ ++-{ echo "$as_me:$LINENO: checking for library containing MP4GetMetadataGrouping" >&5 ++-echo $ECHO_N "checking for library containing MP4GetMetadataGrouping... $ECHO_C" >&6; } ++-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then +++{ echo "$as_me:$LINENO: checking for library containing MP4FileInfo" >&5 +++echo $ECHO_N "checking for library containing MP4FileInfo... $ECHO_C" >&6; } +++if test "${ac_cv_search_MP4FileInfo+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ ac_func_search_save_LIBS=$LIBS ++@@ -8399,11 +8399,11 @@ ++ #ifdef __cplusplus ++ extern "C" ++ #endif ++-char MP4GetMetadataGrouping (); +++char MP4FileInfo (); ++ int ++ main () ++ { ++-return MP4GetMetadataGrouping (); +++return MP4FileInfo (); ++ ; ++ return 0; ++ } ++@@ -8433,7 +8433,7 @@ ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++- ac_cv_search_MP4GetMetadataGrouping=$ac_res +++ ac_cv_search_MP4FileInfo=$ac_res ++ else ++ echo "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++@@ -8443,21 +8443,21 @@ ++ ++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++- if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then +++ if test "${ac_cv_search_MP4FileInfo+set}" = set; then ++ break ++ fi ++ done ++-if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then +++if test "${ac_cv_search_MP4FileInfo+set}" = set; then ++ : ++ else ++- ac_cv_search_MP4GetMetadataGrouping=no +++ ac_cv_search_MP4FileInfo=no ++ fi ++ rm conftest.$ac_ext ++ LIBS=$ac_func_search_save_LIBS ++ fi ++-{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4GetMetadataGrouping" >&5 ++-echo "${ECHO_T}$ac_cv_search_MP4GetMetadataGrouping" >&6; } ++-ac_res=$ac_cv_search_MP4GetMetadataGrouping +++{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4FileInfo" >&5 +++echo "${ECHO_T}$ac_cv_search_MP4FileInfo" >&6; } +++ac_res=$ac_cv_search_MP4FileInfo ++ if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ if test "${ac_cv_header_mp4_h+set}" = set; then ++diff -urNad gtkpod-aac-0.99.10~/configure.in gtkpod-aac-0.99.10/configure.in ++--- gtkpod-aac-0.99.10~/configure.in 2007-11-04 21:38:38.000000000 -0500 +++++ gtkpod-aac-0.99.10/configure.in 2007-11-04 21:46:35.000000000 -0500 ++@@ -137,7 +137,7 @@ ++ ++ ++ dnl Check for libmp4v2 (and mp4.h) ++-AC_SEARCH_LIBS(MP4GetMetadataGrouping, +++AC_SEARCH_LIBS(MP4FileInfo, ++ ["mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"], ++ [AC_CHECK_HEADER(mp4.h, ++ [have_mp4v2="yes -- will build with aac support" AC_DEFINE_UNQUOTED(HAVE_LIBMP4V2, 1, ["Define to 1 if you have the mp4v2 library"])], ++diff -urNad gtkpod-aac-0.99.10~/src/mp4file.c gtkpod-aac-0.99.10/src/mp4file.c ++--- gtkpod-aac-0.99.10~/src/mp4file.c 2007-11-04 21:38:38.000000000 -0500 +++++ gtkpod-aac-0.99.10/src/mp4file.c 2007-11-04 21:47:20.000000000 -0500 ++@@ -344,11 +344,6 @@ ++ track->cd_nr = numvalue; ++ track->cds = numvalue2; ++ } ++- if (MP4GetMetadataGrouping(mp4File, &value) && value != NULL) ++- { ++- track->grouping = charset_to_utf8 (value); ++- g_free (value); ++- } ++ if (MP4GetMetadataGenre(mp4File, &value) && value != NULL) ++ { ++ track->genre = charset_to_utf8 (value); ++@@ -485,10 +480,6 @@ ++ ++ MP4SetMetadataTempo (mp4File, track->BPM); ++ ++- value = charset_from_utf8 (track->grouping); ++- MP4SetMetadataGrouping (mp4File, value); ++- g_free (value); ++- ++ value = charset_from_utf8 (track->genre); ++ MP4SetMetadataGenre (mp4File, value); ++ g_free (value); +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/rules /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/rules +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/rules 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/rules 2007-11-20 02:24:30.000000000 -0500 +@@ -1,32 +1,33 @@ + #!/usr/bin/make -f + ++include /usr/share/dpatch/dpatch.make ++ + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + CFLAGS = -Wall -g + +-include /usr/share/dpatch/dpatch.make +- + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + else + CFLAGS += -O2 + endif + +-config.status: patch configure ++config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + build: build-stamp + +-build-stamp: config.status ++build-stamp: patch config.status + dh_testdir + + $(MAKE) + pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1 + touch build-stamp + +-clean: unpatch ++clean: clean-patched unpatch ++clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade* +@@ -38,7 +39,7 @@ + dh_testroot + dh_clean -k + dh_installdirs +- $(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod ++ $(MAKE) install DESTDIR=$(CURDIR)/debian/gtkpod-aac + + binary-indep: build install + +@@ -51,6 +52,7 @@ + dh_installman gtkpod.1 + dh_install + dh_desktop ++ dh_icons + dh_link + dh_strip + dh_compress +diff -Nru /tmp/I7M49feGHi/gtkpod-0.99.10/debian/watch /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/watch +--- /tmp/I7M49feGHi/gtkpod-0.99.10/debian/watch 2007-11-20 02:24:30.000000000 -0500 ++++ /tmp/Rkk6sRV9ae/gtkpod-aac-0.99.10/debian/watch 2007-11-20 02:24:30.000000000 -0500 +@@ -1,3 +1,3 @@ + version=3 + # yes, this is to avoid sf's perverse mirror system +-http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz ++http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz debian uupdate --- gtkpod-aac-0.99.12.orig/debian/control +++ gtkpod-aac-0.99.12/debian/control @@ -0,0 +1,27 @@ +Source: gtkpod-aac +Section: sound +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: gtkpod Maintainers +Uploaders: Frank Lichtenheld , Nico Golde +Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl4-gnutls-dev, libhal-dev, dpatch, libmp4v2-dev (>= 1:1.6-0.1) +Standards-Version: 3.7.3 +Homepage: http://www.gtkpod.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk + +Package: gtkpod-aac +Architecture: any +Depends: ${shlibs:Depends} +Suggests: mp3gain, recode, python +Conflicts: gtkpod +Provides: gtkpod +Replaces: gtkpod +Description: manage songs and playlists on an Apple iPod + gtkpod is a platform independent GUI for Apple's iPod using GTK2. It + allows you to upload songs and playlists to your iPod. It supports ID3 + tag editing, multiple charsets for ID3 tags, detects duplicate songs, + allows offline modification of the database with later synchronisation, + and more. + . + This version has aac/mp4-support. --- gtkpod-aac-0.99.12.orig/debian/NEWS +++ gtkpod-aac-0.99.12/debian/NEWS @@ -0,0 +1,9 @@ +gtkpod (0.85.0-1) unstable; urgency=low + + * I have changed the default configuration of gtkpod to + use the mount point /media/ipod instead of /mnt/ipod. + You may have to change either your gtkpod configuration + or your /etc/fstab to get gtkpod working correctly again. + + -- Frank Lichtenheld Fri, 10 Dec 2004 02:04:02 +0100 + --- gtkpod-aac-0.99.12.orig/debian/docs +++ gtkpod-aac-0.99.12/debian/docs @@ -0,0 +1 @@ +README --- gtkpod-aac-0.99.12.orig/debian/gtkpod.pod +++ gtkpod-aac-0.99.12/debian/gtkpod.pod @@ -0,0 +1,91 @@ +=head1 NAME + +gtkpod - GTK2 based software for managing songs and playlists on an Apple iPod + +=head1 SYNOPSIS + +B [B<-h>] [B<-a>] [B<-c>] [B<-o>] [B<-m> I] [B<-p> I] [B<--hash> I] + +=head1 DESCRIPTION + +This manual page briefly describes the gtkpod command. + +=head1 OPTIONS + +B supports the following options: + +=over 4 + +=item B<-h>, B<--help> + +Displays the help message. + +=item B<-m>, B<--mountpoint> I + +Define the mountpoint of your iPod. + +=item B<-p> I + +Increment playcount for file I by one. + +=item B<--hash> I + +Print gtkpod hash for file I. + +=item B<-a>, B<--auto> + +Import database automatically after start. + +=back + +=head1 FILES + +=over 4 + +=item F<~/.gtkpod/prefs> + +Per user configuration file. Should normally only updated through +the program itself. + +=item F + +Global configuration file. Used if no configuration file exist for the user +starting gtkpod. + +=item F<~/.gtkpod/gtkpod.in> + +If this file exists, gtkpod will try to execute it at startup +This is done before attempting to mount the iPod directory (optional) +or read the iTunesDB (optional)). + +=item F<~/.gtkpod/gtkpod.out> + +If this file exists, gtkpod will try to execute it while exiting the +program. This is done after attempting to unmount the iPod directory +(optional) and sending the "eject" command to the iPod (optional). + +=item F, F + +Used instead of the per user scripts if the former ones don't exist +and these do. + +=back + +=head1 AUTHOR + + Jorg Schuler + Corey Donohoe + Adrian Ulrich + and others + +This manpage was written by Frank Lichtenheld . + +=head1 COPYRIGHT AND LICENCE + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +On Debian systems, a copy of the GNU General Public License may be +found in /usr/share/common-licenses/GPL. --- gtkpod-aac-0.99.12.orig/debian/gtkpod.desktop +++ gtkpod-aac-0.99.12/debian/gtkpod.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=gtkpod +Icon=gtkpod-icon-32x32 +Comment=Manage songs and playlists on your Apple iPod +Exec=gtkpod +Terminal=false +Type=Application +Categories=GTK;AudioVideo; --- gtkpod-aac-0.99.12.orig/debian/install +++ gtkpod-aac-0.99.12/debian/install @@ -0,0 +1,2 @@ +debian/gtkpod-icon-32x32.xpm usr/share/pixmaps +debian/gtkpod.desktop usr/share/applications --- gtkpod-aac-0.99.12.orig/debian/compat +++ gtkpod-aac-0.99.12/debian/compat @@ -0,0 +1 @@ +5 --- gtkpod-aac-0.99.12.orig/debian/menu +++ gtkpod-aac-0.99.12/debian/menu @@ -0,0 +1,3 @@ +?package(gtkpod):needs="X11" section="Applications/Sound" \ + title="gtkpod" command="/usr/bin/gtkpod" \ + icon="/usr/share/pixmaps/gtkpod-icon-32x32.xpm" --- gtkpod-aac-0.99.12.orig/debian/changelog +++ gtkpod-aac-0.99.12/debian/changelog @@ -0,0 +1,173 @@ +gtkpod-aac (0.99.12-0ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #180406) + * debian/patches: + - Dropped 02_missing_fclose.dpatch, fixed upstream (another way). + - Dropped 03_itdb-set-local-to-imported.dpatch, merged upstream. + - Dropped disable-mp4-grouping.dpatch, not neede after the libmp4v2 transition. + - Fixed remaining patches for this release. + * debian/control: + - Explicit version for libmp4v2-dev (>= 1:1.6-0.1). + - Updated Standards-Version to 3.7.3. + * debian/rules: + - Updated gtkpod version for pod2man. + + -- Matvey Kozhev Fri, 21 Dec 2007 13:28:39 +0600 + +gtkpod-aac (0.99.10-4ubuntu2) hardy; urgency=low + + * control: Change the maintainer address -> MOTU. + + -- Timo Aaltonen Tue, 11 Dec 2007 09:14:38 +0200 + +gtkpod-aac (0.99.10-4ubuntu1) hardy; urgency=low + + * Resynchronize with gtkpod 0.9.10-4: + - Pulled in 01_mountpoint.dpatch (and deapply it from the diff.gz) + - Pulled in 02_missing-fclose.dpatch + - Applied desktop file and control file changes from -4 + * Ubuntu Changes: + - Dropped .png extension on icon in .desktop file + - Call dh_icons + - Put our prefs.c mountpoint patch into 01_mountpoint + * Updated gtkpod-aac.diff + + -- John Dong Tue, 20 Nov 2007 01:33:01 -0500 + +gtkpod (0.99.10-4) unstable; urgency=low + + * Switched from Xs-Vcs to Vcs control field, dpkg supports them now. + * Switched from old Homepage tag to the new Homepage control field. + * New dependency on dpatch as we don't want to modify the source + directly any longer. + * Added previously modified source code as dpatch patches: + 01_mountpoint, 02_missing_fclose + * Included 03_itdb-set-local-to-imported.dpatch to fix inability to import + into local repos (Closes: #451749). + + -- Nico Golde Tue, 13 Nov 2007 16:18:58 +0100 + +gtkpod (0.99.10-3) unstable; urgency=low + + * Added missing fclose() call in mp3file.c to prevent too many open + file descriptors (Closes: #441308). + * Adapted .desktop file to current freedesktop standards. + + -- Nico Golde Sun, 09 Sep 2007 20:13:31 +0200 + +gtkpod-aac (0.99.10-2ubuntu3) hardy; urgency=low + + * itdb-set-local-to-imported.dpatch: Steal patch from upstream SVN + to fix inability to import into local repos (LP: #145506) + + -- John Dong Sat, 17 Nov 2007 00:02:10 -0500 + +gtkpod-aac (0.99.10-2ubuntu2) hardy; urgency=low + + [ John Dong ] + * disable-mp4-grouping.dpatch: Disable MP4 grouping retrieval + as our libmp4v2 doesn't support it (LP: #135178) + + [ Emmet Hikory ] + * Add the description for the dpatch + + -- Emmet Hikory Tue, 06 Nov 2007 00:17:25 +0900 + +gtkpod-aac (0.99.10-2ubuntu1) gutsy; urgency=low + + * Resynchronise with gtkpod 0.9.10-2. + * Hack in dpatch support, since it was removed. + * Rename debian/patches/03-configure.dpatch to + debian/patches/aac-configure.dpatch. + * Update debian/gtkpod-aac.diff. + + -- Steve Kowalik Tue, 17 Jul 2007 18:25:25 +1000 + +gtkpod-aac (0.99.8-0ubuntu3) gutsy; urgency=low + + * Rebuild for the libgpod1 -> libgpod2 library transition. + * Bump required version of the libgpod development headers. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Tue, 17 Jul 2007 00:38:13 +1000 + +gtkpod-aac (0.99.8-0ubuntu2) feisty; urgency=low + + [ Lionel Le Folgoc ] + * Resynchronise with gtkpod 0.99.8-0ubuntu3: (LP: #91071) + + debian/patches/03_fix_compilation_with_latest_libgpod.dpatch: fix the + build with gpod 0.4.2 + + keep debian/gtkpod-aac.diff up-to-date. + * Rename debian/patches/03-configure.dpatch to + debian/patches/04-configure.dpatch. + + -- Timo Aaltonen Wed, 14 Mar 2007 14:29:27 +0200 + +gtkpod-aac (0.99.8-0ubuntu1) feisty; urgency=low + + * New upstream release + * based on gtkpod-0.99.8-0ubuntu1, diff in debian/gtkpod-aac.diff, to + ease the work in future + + -- Timo Aaltonen Sat, 3 Feb 2007 00:56:01 +0200 + +gtkpod-aac (0.99.4-0ubuntu1) edgy; urgency=low + + * New upstream release + + -- William Alexander Grant Tue, 26 Sep 2006 22:09:14 +1000 + +gtkpod-aac (0.99.2-0ubuntu5) edgy; urgency=low + + * paches/02-japanese_charset.dpatch + - This patch only effects if "Japanese (automatic detection)" is chosen. + - Rewrite autodetection code to support UTF-8 environment. + - The charset cannot be autodetected, the charset is set to "UTF-8" + instead of "EUC-JP". + + -- Jun Kobayashi Tue, 9 May 2006 19:24:04 +0900 + +gtkpod-aac (0.99.2-0ubuntu4) dapper; urgency=low + + * revert some dpatch-sillyness, to keep the delta as low as possible: + -keep the original ubuntu_patch.diff + -remove patches/01-ubuntu_patch.dpatch + -rename patches/02-configure.dpatch to patches/01-configure.dpatch + + -- Timo Aaltonen Wed, 22 Feb 2006 13:28:45 +0200 + +gtkpod-aac (0.99.2-0ubuntu3) dapper; urgency=low + + * debian/rules: correct version for pod2man + * use dpatch: + - move ubuntu_patch.diff to patches/01-ubuntu_patch.dpatch + - create patches/02-configure.dpatch + - modify debian/rules + - add dpatch to Build-Depends + * debian/control: Maintainer: me + * add AUTHORS, TODOandBUGS.txt TROUBLESHOOTING in the package + * debian/menu: change package(gtkpod) -> package(gtkpod-aac) to make + lintian happy. + + -- Timo Aaltonen Mon, 20 Feb 2006 22:09:08 +0200 + +gtkpod-aac (0.99.2-0ubuntu2) dapper; urgency=low + + * correct email-address + * revert changes to ubuntu_patch.diff since they were unnecessary.. + * debian/control: Provides: gtkpod, Replaces: gtkpod + + -- Timo Aaltonen Thu, 19 Jan 2006 10:56:29 +0200 + +gtkpod-aac (0.99.2-0ubuntu1) dapper; urgency=low + + * initial release: + - based on gtkpod_0.99.2, build with aac-support + - debian/control: libmp4v2-dev in build-deps + - debian/control: Conflicts: gtkpod + - debian/rules: DESTDIR=$(CURDIR)/debian/gtkpod-aac + - debian/ubuntu_patch.diff: gtkpod-0* -> gtkpod-aac-0* + - configure: PACKAGE=gtkpod-aac + + -- Timo Aaltonen Tue, 17 Jan 2006 17:44:37 +0200 + --- gtkpod-aac-0.99.12.orig/debian/gtkpod-icon-32x32.xpm +++ gtkpod-aac-0.99.12/debian/gtkpod-icon-32x32.xpm @@ -0,0 +1,253 @@ +/* XPM */ +static char * gtkpod_icon_32x32_xpm[] = { +"32 32 218 2", +" c None", +". c #CACACA", +"+ c #C8C8C8", +"@ c #C6C6C6", +"# c #C4C4C4", +"$ c #C3C3C3", +"% c #C1C1C1", +"& c #BFBFBF", +"* c #BDBDBD", +"= c #BCBCBC", +"- c #BABABA", +"; c #B9B9B9", +"> c #B7B7B7", +", c #B5B5B5", +"' c #B3B3B3", +") c #B1B1B1", +"! c #ADADAD", +"~ c #ABABAB", +"{ c #E5E5E5", +"] c #E2E2E2", +"^ c #E1E1E1", +"/ c #DFDFDF", +"( c #DEDEDE", +"_ c #DCDCDC", +": c #DBDBDB", +"< c #D9D9D9", +"[ c #D8D8D8", +"} c #D6D6D6", +"| c #D5D5D5", +"1 c #D3D3D3", +"2 c #D2D2D2", +"3 c #D0D0D0", +"4 c #CFCFCF", +"5 c #CCCCCC", +"6 c #A6A6A6", +"7 c #E7E7E7", +"8 c #E2E3E2", +"9 c #DADCDB", +"0 c #D8DBDA", +"a c #D8DAD9", +"b c #D6D8D7", +"c c #D4D7D6", +"d c #D4D6D5", +"e c #D2D5D3", +"f c #D1D3D2", +"g c #CFD2D1", +"h c #CED0CF", +"i c #CDCFCE", +"j c #CCCECD", +"k c #D0D1D1", +"l c #D1D1D1", +"m c #A1A1A1", +"n c #E4E4E4", +"o c #B6C1BC", +"p c #879D93", +"q c #869C92", +"r c #859C92", +"s c #B2BBB7", +"t c #CDCDCD", +"u c #9C9C9C", +"v c #E3E3E3", +"w c #A8B6B0", +"x c #849B91", +"y c #6E8179", +"z c #6F827A", +"A c #A6B3AD", +"B c #CBCBCB", +"C c #969696", +"D c #E0E0E0", +"E c #A7B5AF", +"F c #839A90", +"G c #38423E", +"H c #2E3532", +"I c #7F958B", +"J c #A5B2AC", +"K c #C9C9C9", +"L c #909090", +"M c #A7B5AE", +"N c #82988F", +"O c #535F5A", +"P c #434D49", +"Q c #A4B1AB", +"R c #C7C7C7", +"S c #8B8B8B", +"T c #DDDDDD", +"U c #A5B3AD", +"V c #63756D", +"W c #72867E", +"X c #39433F", +"Y c #82998F", +"Z c #A3AFAA", +"` c #C5C5C5", +" . c #858585", +".. c #DADADA", +"+. c #A5B3AC", +"@. c #81988E", +"#. c #56655E", +"$. c #7C9188", +"%. c #7B9087", +"&. c #2D3431", +"*. c #A2AEA9", +"=. c #C2C2C2", +"-. c #7F7F7F", +";. c #D7D7D7", +">. c #A4B2AC", +",. c #788A82", +"'. c #72857D", +"). c #687971", +"!. c #61706A", +"~. c #788C83", +"{. c #A1ADA8", +"]. c #797979", +"^. c #A3B1AB", +"/. c #7D9188", +"(. c #778C83", +"_. c #62716A", +":. c #5B6B65", +"<. c #6D7E77", +"[. c #80968C", +"}. c #A0ACA7", +"|. c #C0C0C0", +"1. c #BEBEBE", +"2. c #747474", +"3. c #D4D4D4", +"4. c #A2B0AA", +"5. c #9FABA6", +"6. c #6E6E6E", +"7. c #B0B9B5", +"8. c #8EA299", +"9. c #8DA199", +"0. c #8DA198", +"a. c #8CA098", +"b. c #8CA097", +"c. c #A8B0AD", +"d. c #BBBBBB", +"e. c #686868", +"f. c #CBCCCC", +"g. c #C3C6C5", +"h. c #C1C4C3", +"i. c #C0C3C2", +"j. c #BFC2C0", +"k. c #BEC0BF", +"l. c #BCBFBE", +"m. c #BBBEBD", +"n. c #BABDBB", +"o. c #B8BBBA", +"p. c #B7BAB9", +"q. c #B6B9B8", +"r. c #B5B8B7", +"s. c #B9BABA", +"t. c #B8B8B8", +"u. c #636363", +"v. c #CECECE", +"w. c #B6B6B6", +"x. c #5C5C5C", +"y. c #575757", +"z. c #9A9A9A", +"A. c #A3A3A3", +"B. c #ACACAC", +"C. c #B0B0B0", +"D. c #A8A8A8", +"E. c #B2B2B2", +"F. c #515151", +"G. c #888888", +"H. c #9E9E9E", +"I. c #999999", +"J. c #AFAFAF", +"K. c #4B4B4B", +"L. c #A2A2A2", +"M. c #454545", +"N. c #9F9F9F", +"O. c #404040", +"P. c #F0F0F0", +"Q. c #A9A9A9", +"R. c #3A3A3A", +"S. c #EAEAEA", +"T. c #E9E9E9", +"U. c #ECECEC", +"V. c #A7A7A7", +"W. c #343434", +"X. c #A4A4A4", +"Y. c #2E2E2E", +"Z. c #8C8C8C", +"`. c #EBEBEB", +" + c #F2F2F2", +".+ c #292929", +"++ c #F4F4F4", +"@+ c #A0A0A0", +"#+ c #232323", +"$+ c #F7F7F7", +"%+ c #1E1E1E", +"&+ c #B4B4B4", +"*+ c #F6F6F6", +"=+ c #181818", +"-+ c #E6E6E6", +";+ c #EFEFEF", +">+ c #F3F3F3", +",+ c #9B9B9B", +"'+ c #121212", +")+ c #AEAEAE", +"!+ c #AAAAAA", +"~+ c #989898", +"{+ c #0C0C0C", +"]+ c #A5A5A5", +"^+ c #979797", +"/+ c #939393", +"(+ c #060606", +"_+ c #767676", +":+ c #030303", +"<+ c #737373", +"[+ c #717171", +"}+ c #707070", +"|+ c #6D6D6D", +"1+ c #6B6B6B", +"2+ c #6A6A6A", +"3+ c #696969", +"4+ c #676767", +"5+ c #5E5E5E", +" . + @ # $ % & * = - ; > , ' ) ! ~ ", +" { ] ^ / ( _ : < [ } | 1 2 3 4 5 - 6 ", +" 7 7 8 9 0 a b c d e f g h i j k l 5 m ", +" { n o p q q q q q r r r r r p s 4 t u ", +" v ] w x x x x x y z x x x x x A t B C ", +" ^ D E x x x x F G H I x x x x J . K L ", +" / ( M x x x x N O P y x x x x Q K R S ", +" T : U x x x x V W y X Y x x x Z @ ` . ", +" : ..+.x x x @.#.$.%.&.I x x x *.# =.-. ", +" < ;.>.x x x ,.'.).y !.~.x x x {.=.% ]. ", +" ;.| ^.x x x /.(._.:.<.[.x x x }.|.1.2. ", +" 3.1 4.x x x x F F F F x x x x 5.1.= 6. ", +" 2 l 7.8.9.9.0.0.0.a.b.b.b.b.b.c.d.- e. ", +" 3 4 f.g.h.i.j.k.l.m.n.o.p.q.r.s.; t.u. ", +" v.5 B . + R 5 3.;.} 2 R 1.d.- t.> w.x. ", +" B . K R t [ 2 * ' ' = v.1 # t.w., ' y. ", +" . + R % 1 w.z.A.B.) C.D., v.w., ' E.F. ", +" + @ K 5 G.H.> * =.@ . v.& I.= * ) J.K. ", +" ` ` } , L.; * =.@ . v.1 ;.v.t.4 ' ! M. ", +" $ + l N.> * % R 3 2 2 ;.: / ` t d.~ O. ", +" % 5 @ 6 * % @ T P.{ 4 ../ v ( ` # Q.R. ", +" & v.= w.=.@ 5 S.T.^ =.v.v 7 U.K B V.W. ", +" * 5 1.& @ . B 1 T < ! $ 7 U.P.2 B X.Y. ", +" - R + d.. v.4 E.> ! Z.: `.P. +2 $ A..+ ", +" t.|.3 d.v.2 } t ~ X.v.`.P.++S.< w.@+#+ ", +" w.> 5 ` 4 } : / v 7 U.P.++$+^ 3 6 H.%+ ", +" &+' - 2 ; ;./ v 7 `.P.++*+_ ;.&+H.u =+ ", +" E.) C.A.d.1 : -+`.;+>+>+T.v.,+H.,+z.'+ ", +" C.)+! !+t.1 : ^ v { `.n ..> u z.I.~+{+ ", +" ! ! ~ Q.D.~ t.@ 5 5 + t.]+u I.~+^+/+(+ ", +" L.Q.Q.V.]+X.A.L.L.m H.,+z.I.^+C /+_+:+ ", +" -._+<+[+}+6.6.|+1+2+3+e.4+4+5+ "}; --- gtkpod-aac-0.99.12.orig/debian/dirs +++ gtkpod-aac-0.99.12/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/pixmaps