[Pkg-gtkpod-devel] r294 - in gtkpod/trunk/debian: . patches
nion at alioth.debian.org
nion at alioth.debian.org
Sun Jan 13 17:14:56 UTC 2008
Author: nion
Date: 2008-01-13 17:14:56 +0000 (Sun, 13 Jan 2008)
New Revision: 294
Removed:
gtkpod/trunk/debian/patches/02_missing_fclose.dpatch
gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch
Modified:
gtkpod/trunk/debian/changelog
gtkpod/trunk/debian/control
gtkpod/trunk/debian/patches/00list
gtkpod/trunk/debian/patches/01_mountpoint.dpatch
Log:
initial preparations for 0.99.12-1
Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/changelog 2008-01-13 17:14:56 UTC (rev 294)
@@ -1,3 +1,16 @@
+gtkpod (0.99.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * Adjust build-dependency on libgpod, >= 0.6.0 is now needed.
+ * Bumped Standards version, no changes needed.
+ * Updating 01_mountpoint.dpatch cause it did no longer apply.
+ * Remove 03_itdb-set-local-to-imported.dpatch, included upstream.
+ * Remove 02_missing_fclose.dpatch, not needed anymore. Upstream source code
+ changed and the function does not have a local FILE stream that needs to be
+ closed anymore.
+
+ -- Nico Golde <nion at debian.org> Sun, 13 Jan 2008 17:24:33 +0100
+
gtkpod (0.99.10-5) unstable; urgency=low
* Add changing mountpoint as well in prefs.c
Modified: gtkpod/trunk/debian/control
===================================================================
--- gtkpod/trunk/debian/control 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/control 2008-01-13 17:14:56 UTC (rev 294)
@@ -3,8 +3,8 @@
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), libcurl4-gnutls-dev, libhal-dev, dpatch
-Standards-Version: 3.7.2
+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.6.0), libcurl4-gnutls-dev, libhal-dev, dpatch
+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
Modified: gtkpod/trunk/debian/patches/00list
===================================================================
--- gtkpod/trunk/debian/patches/00list 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/patches/00list 2008-01-13 17:14:56 UTC (rev 294)
@@ -1,3 +1 @@
01_mountpoint
-02_missing_fclose
-03_itdb-set-local-to-imported
Modified: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/patches/01_mountpoint.dpatch 2008-01-13 17:14:56 UTC (rev 294)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/README trunk/README
---- trunk~/README 2007-11-18 16:47:22.000000000 +0100
-+++ trunk/README 2007-11-20 14:20:36.000000000 +0100
-@@ -52,7 +52,7 @@
+--- trunk~/README 2008-01-13 17:22:28.000000000 +0100
++++ trunk/README 2008-01-13 17:37:38.000000000 +0100
+@@ -53,7 +53,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
@@ -17,7 +17,7 @@
these days.
2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will
-@@ -699,13 +699,13 @@
+@@ -737,13 +737,13 @@
(Obviously you need to change the filesystem type from 'vfat' to
'hfsplus' when you use an HFS formatted iPod.)
@@ -34,7 +34,7 @@
won't have to worry about doing mounting/unmouting yourself any more.
-@@ -750,19 +750,19 @@
+@@ -788,19 +788,19 @@
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
@@ -58,7 +58,7 @@
please note that it's just '/dev/sda')
-@@ -770,7 +770,7 @@
+@@ -808,7 +808,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.
@@ -67,7 +67,7 @@
5) Install the hotplug utilities
(http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')
-@@ -819,13 +819,13 @@
+@@ -857,13 +857,13 @@
7) Mount the iPod hard drive
@@ -83,7 +83,7 @@
10) Unload the module sbp2 (as most likely as root):
-@@ -874,19 +874,19 @@
+@@ -912,19 +912,19 @@
* -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
@@ -107,7 +107,7 @@
please note that it's just '/dev/sda')
-@@ -894,7 +894,7 @@
+@@ -932,7 +932,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.
@@ -116,7 +116,7 @@
NOTE: You can add ",umask=0" to the options to make the iPod
readable/writable for all users.
-@@ -934,13 +934,13 @@
+@@ -972,13 +972,13 @@
7) Mount the iPod hard drive
@@ -132,7 +132,7 @@
10) Unload the module sbp2 (as most likely as root):
-@@ -974,7 +974,7 @@
+@@ -1012,7 +1012,7 @@
- since the iPod's hdd was already spun up, the SCSI subsystem now
recognizes it and mounts it as /dev/sda
@@ -141,7 +141,7 @@
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 @@
+@@ -1068,10 +1068,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
@@ -155,8 +155,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-abook.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-abook.sh 2008-01-13 17:38:11.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -167,8 +167,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-evocalendar.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evocalendar.sh 2008-01-13 17:38:13.000000000 +0100
@@ -10,7 +10,7 @@
#
# with the following defaults:
@@ -179,20 +179,20 @@
#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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-evolution.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evolution.sh 2008-01-13 17:38:16.000000000 +0100
@@ -13,7 +13,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/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
+ # try to find the path to evolution-addressbook-export
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-kaddressbook.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-kaddressbook.sh 2008-01-13 17:38:18.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -203,8 +203,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-korganizer.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-korganizer.sh 2008-01-13 17:38:23.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -215,8 +215,8 @@
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-19 18:49:28.000000000 +0100
-+++ trunk/scripts/sync-ldif.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-ldif.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-ldif.sh 2008-01-13 17:38:25.000000000 +0100
@@ -15,7 +15,7 @@
# differently...This is still Chinese for me!! :)
@@ -227,8 +227,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-thunderbird-nano.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird-nano.sh 2008-01-13 17:38:32.000000000 +0100
@@ -25,7 +25,7 @@
# with the following defaults:
@@ -239,8 +239,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-thunderbird.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird.sh 2008-01-13 17:38:34.000000000 +0100
@@ -18,7 +18,7 @@
# with the following defaults:
@@ -251,8 +251,8 @@
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-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-webcalendar.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-webcalendar.sh 2008-01-13 17:38:38.000000000 +0100
@@ -9,7 +9,7 @@
# with the following defaults:
@@ -263,9 +263,9 @@
DATAFILE='https://somewhere.local/calendar.ics'
# calendar name
diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
---- trunk~/src/prefs.c 2007-11-18 16:45:09.000000000 +0100
-+++ trunk/src/prefs.c 2007-11-20 14:20:44.000000000 +0100
-@@ -178,7 +178,7 @@
+--- trunk~/src/prefs.c 2008-01-13 17:22:24.000000000 +0100
++++ trunk/src/prefs.c 2008-01-13 17:38:56.000000000 +0100
+@@ -179,7 +179,7 @@
prefs_set_int("delete_file", TRUE);
prefs_set_int("delete_local_file", TRUE);
prefs_set_int("delete_database", TRUE);
Deleted: gtkpod/trunk/debian/patches/02_missing_fclose.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/02_missing_fclose.dpatch 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/patches/02_missing_fclose.dpatch 2008-01-13 17:14:56 UTC (rev 294)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_missing_fclose.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gtkpod-0.99.10~/src/mp3file.c gtkpod-0.99.10/src/mp3file.c
---- gtkpod-0.99.10~/src/mp3file.c 2007-06-27 21:29:33.000000000 +0200
-+++ gtkpod-0.99.10/src/mp3file.c 2007-11-18 14:02:07.000000000 +0100
-@@ -2353,6 +2353,7 @@
- gd->gapless_data = totaldatasize - finaleight;
- /* total samples minus pre/postgap */
- gd->samplecount = totalframes * mysamplesperframe - gd->pregap - gd->postgap;
-+ fclose(file);
-
- return TRUE;
-
Deleted: gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch 2008-01-13 16:23:58 UTC (rev 293)
+++ gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch 2008-01-13 17:14:56 UTC (rev 294)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## itdb-set-local-to-imported.dpatch by John Dong <jdong at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set local iTunesDB's imported status to TRUE
-## DP: Stolen-from: Upstream SVN revno 1596
-## DP: Resolves a bug where a fresh Local repository refuses to accept
-## DP: new track additions, such as LP #145506
-
- at DPATCH@
-diff -urNad gtkpod-aac-0.99.10~/src/display_itdb.c gtkpod-aac-0.99.10/src/display_itdb.c
---- gtkpod-aac-0.99.10~/src/display_itdb.c 2007-06-27 15:29:33.000000000 -0400
-+++ gtkpod-aac-0.99.10/src/display_itdb.c 2007-11-16 23:59:54.000000000 -0500
-@@ -998,8 +998,16 @@
- itdb_playlist_set_mpl (pl);
- itdb_playlist_add (itdb, pl, -1);
-
-- eitdb->data_changed = FALSE;
-- eitdb->itdb_imported = FALSE;
-+ if ((type & GP_ITDB_TYPE_PODCASTS) || (type & GP_ITDB_TYPE_LOCAL))
-+ {
-+ eitdb->data_changed = TRUE;
-+ eitdb->itdb_imported = TRUE;
-+ }
-+ else
-+ {
-+ eitdb->data_changed = FALSE;
-+ eitdb->itdb_imported = FALSE;
-+ }
- }
- else
- {
More information about the Pkg-gtkpod-devel
mailing list