[Pkg-gtkpod-devel] r298 - in gtkpod/branches/etch-bpo: . debian scripts src
djpig at alioth.debian.org
djpig at alioth.debian.org
Mon Jan 14 14:04:19 UTC 2008
Author: djpig
Date: 2008-01-14 14:04:19 +0000 (Mon, 14 Jan 2008)
New Revision: 298
Added:
gtkpod/branches/etch-bpo/debian/patches/
Removed:
gtkpod/branches/etch-bpo/debian/NEWS
Modified:
gtkpod/branches/etch-bpo/README
gtkpod/branches/etch-bpo/debian/changelog
gtkpod/branches/etch-bpo/debian/control
gtkpod/branches/etch-bpo/debian/rules
gtkpod/branches/etch-bpo/debian/watch
gtkpod/branches/etch-bpo/scripts/sync-abook.sh
gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh
gtkpod/branches/etch-bpo/scripts/sync-evolution.sh
gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh
gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh
gtkpod/branches/etch-bpo/scripts/sync-ldif.sh
gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh
gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh
gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh
gtkpod/branches/etch-bpo/src/mp3file.c
gtkpod/branches/etch-bpo/src/prefs.c
Log:
Merge 0.99.10-5 to etch-bpo
Modified: gtkpod/branches/etch-bpo/README
===================================================================
--- gtkpod/branches/etch-bpo/README 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/README 2008-01-14 14:04:19 UTC (rev 298)
@@ -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
- /media/ipod). In most cases this should not be necessary any more
+ /mnt/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 /media/ipod:
+ Then simply add a link from /mnt/ipod:
- ln -s /var/autofs/removable/ipod /media/ipod
+ ln -s /var/autofs/removable/ipod /mnt/ipod
Now your system is configured to mount the iPod every time you access
-/media/ipod and to unmount it again after two seconds of inactivity. You
+/mnt/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 /media/ipod:
+3) Create /mnt/ipod:
- mkdir /media/ipod
+ mkdir /mnt/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 /media/ipod vfat rw,user,noauto,noatime,errors=remount 0 0
+/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,errors=remount 0 0
(For HFS this line should read
-/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0
+/dev/sda /mnt/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 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
+/dev/sda2 /mnt/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 /media/ipod
+ mount /mnt/ipod
8) do whatever you need to do (e.g. start gtkpod, see below)
9) Unmount the iPod:
- umount /media/ipod
+ umount /mnt/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 /media/ipod:
+3) Create /mnt/ipod:
- mkdir /media/ipod
+ mkdir /mnt/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 /media/ipod vfat rw,user,noauto,noatime 0 0
+/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime 0 0
(For HFS this line should read
-/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0
+/dev/sda /mnt/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 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0
+/dev/sda2 /mnt/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 /media/ipod
+ mount /mnt/ipod
8) do whatever you need to do (e.g. start gtkpod, see below)
9) Unmount the iPod:
- umount /media/ipod
+ umount /mnt/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 /media/ipod as normal."
+- You can then mount /dev/sda2 to /mnt/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 /media/ipod and your ipod is detected as /dev/sda
+ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda
------------------------------- Begin Here ---------------------------------
-/dev/sda2 /media/ipod vfat rw,user,noauto 0 0
+/dev/sda2 /mnt/ipod vfat rw,user,noauto 0 0
------------------------------- End Here -----------------------------------
Deleted: gtkpod/branches/etch-bpo/debian/NEWS
===================================================================
--- gtkpod/branches/etch-bpo/debian/NEWS 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/debian/NEWS 2008-01-14 14:04:19 UTC (rev 298)
@@ -1,9 +0,0 @@
-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 <djpig at debian.org> Fri, 10 Dec 2004 02:04:02 +0100
-
Modified: gtkpod/branches/etch-bpo/debian/changelog
===================================================================
--- gtkpod/branches/etch-bpo/debian/changelog 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/debian/changelog 2008-01-14 14:04:19 UTC (rev 298)
@@ -1,10 +1,31 @@
-gtkpod (0.99.10-3~bpo40+1) etch-backports; urgency=low
+gtkpod (0.99.10-5~bpo40+1) etch-backports; urgency=low
* Build against etch backports.
- replace libcurl4-gnutls-dev with libcurl3-gnutls-dev in build-depends
-- Frank Lichtenheld <djpig at debian.org> Mon, 06 Aug 2007 01:29:01 +0200
+gtkpod (0.99.10-5) unstable; urgency=low
+
+ * Add changing mountpoint as well in prefs.c
+ to 01_mountpoint (Closes: #452056).
+ * Removed NEWS file as its last entry was before sarge.
+
+ -- Nico Golde <nion at debian.org> Tue, 20 Nov 2007 14:22:12 +0100
+
+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 <nion at debian.org> 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
Modified: gtkpod/branches/etch-bpo/debian/control
===================================================================
--- gtkpod/branches/etch-bpo/debian/control 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/debian/control 2008-01-14 14:04:19 UTC (rev 298)
@@ -3,10 +3,11 @@
Priority: extra
Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-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), libcurl3-gnutls-dev, libhal-dev
+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), libcurl3-gnutls-dev, libhal-dev, dpatch
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
+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
Architecture: any
@@ -18,5 +19,3 @@
tag editing, multiple charsets for ID3 tags, detects duplicate songs,
allows offline modification of the database with later synchronisation,
and more.
- .
- Homepage: http://www.gtkpod.org
Copied: gtkpod/branches/etch-bpo/debian/patches (from rev 297, gtkpod/tags/0.99.10-5/debian/patches)
Modified: gtkpod/branches/etch-bpo/debian/rules
===================================================================
--- gtkpod/branches/etch-bpo/debian/rules 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/debian/rules 2008-01-14 14:04:19 UTC (rev 298)
@@ -5,13 +5,15 @@
CFLAGS = -Wall -g
+include /usr/share/dpatch/dpatch.make
+
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-config.status: configure
+config.status: patch 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
@@ -24,7 +26,7 @@
pod2man --release "gtkpod 0.99.10" --center "gtkpod Manual" debian/gtkpod.pod >gtkpod.1
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
Modified: gtkpod/branches/etch-bpo/debian/watch
===================================================================
--- gtkpod/branches/etch-bpo/debian/watch 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/debian/watch 2008-01-14 14:04:19 UTC (rev 298)
@@ -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 debian uupdate
+http://qa.debian.org/watch/sf.php/gtkpod gtkpod-(.*).tar.gz
Modified: gtkpod/branches/etch-bpo/scripts/sync-abook.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-abook.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-abook.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT='/media/ipod' # mount point of ipod
+IPOD_MOUNT='/mnt/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
Modified: gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -10,7 +10,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
#the path to a script that will be passed the ical information from STDIN and filter, if needed
#FILTER_SCRIPT=
Modified: gtkpod/branches/etch-bpo/scripts/sync-evolution.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-evolution.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-evolution.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -13,7 +13,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
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
Modified: gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file
ENCODING=ISO-8859-15 # encoding used by ipod
Modified: gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -9,7 +9,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
ENCODING=ISO-8859-15 # encoding used by ipod
Modified: gtkpod/branches/etch-bpo/scripts/sync-ldif.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-ldif.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-ldif.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -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=/media/ipod # Mount point of the ipod
+export IPOD_MOUNT=/mnt/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'!!
Modified: gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -25,7 +25,7 @@
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/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
Modified: gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -18,7 +18,7 @@
# with the following defaults:
-IPOD_MOUNT=/media/ipod # mountpoint of ipod
+IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
ENCODING=ISO-8859-15 # encoding used by ipod
NAME=thunderbird # default file export name
Modified: gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh 2008-01-14 14:04:19 UTC (rev 298)
@@ -9,7 +9,7 @@
# with the following defaults:
# mount point of ipod
-IPOD_MOUNT='/media/ipod'
+IPOD_MOUNT='/mnt/ipod'
# uri for webcalendar (example)
DATAFILE='https://somewhere.local/calendar.ics'
# calendar name
Modified: gtkpod/branches/etch-bpo/src/mp3file.c
===================================================================
--- gtkpod/branches/etch-bpo/src/mp3file.c 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/src/mp3file.c 2008-01-14 14:04:19 UTC (rev 298)
@@ -2353,7 +2353,6 @@
gd->gapless_data = totaldatasize - finaleight;
/* total samples minus pre/postgap */
gd->samplecount = totalframes * mysamplesperframe - gd->pregap - gd->postgap;
- fclose(file);
return TRUE;
Modified: gtkpod/branches/etch-bpo/src/prefs.c
===================================================================
--- gtkpod/branches/etch-bpo/src/prefs.c 2008-01-14 11:56:40 UTC (rev 297)
+++ gtkpod/branches/etch-bpo/src/prefs.c 2008-01-14 14:04:19 UTC (rev 298)
@@ -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", "/media/ipod");
+ prefs_set_string("initial_mountpoint", "/mnt/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/");
More information about the Pkg-gtkpod-devel
mailing list