[Pkg-gtkpod-devel] r265 - in gtkpod/trunk/debian: . patches

nion at alioth.debian.org nion at alioth.debian.org
Sun Nov 18 13:49:43 UTC 2007


Author: nion
Date: 2007-11-18 13:49:43 +0000 (Sun, 18 Nov 2007)
New Revision: 265

Added:
   gtkpod/trunk/debian/patches/
   gtkpod/trunk/debian/patches/00list
   gtkpod/trunk/debian/patches/01_mountpoint.dpatch
   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/rules
Log:
changes to upstream source code are now made with dpatch


Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2007-11-15 16:01:30 UTC (rev 264)
+++ gtkpod/trunk/debian/changelog	2007-11-18 13:49:43 UTC (rev 265)
@@ -1,7 +1,13 @@
-gtkpod (0.99.10-4) UNRELEASED; urgency=low
+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
 

Modified: gtkpod/trunk/debian/control
===================================================================
--- gtkpod/trunk/debian/control	2007-11-15 16:01:30 UTC (rev 264)
+++ gtkpod/trunk/debian/control	2007-11-18 13:49:43 UTC (rev 265)
@@ -3,7 +3,7 @@
 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
+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
 Homepage: http://www.gtkpod.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk

Added: gtkpod/trunk/debian/patches/00list
===================================================================
--- gtkpod/trunk/debian/patches/00list	                        (rev 0)
+++ gtkpod/trunk/debian/patches/00list	2007-11-18 13:49:43 UTC (rev 265)
@@ -0,0 +1,3 @@
+01_mountpoint
+02_missing_fclose
+03_itdb-set-local-to-imported

Added: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch	                        (rev 0)
+++ gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2007-11-18 13:49:43 UTC (rev 265)
@@ -0,0 +1,276 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_mountpoint.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~/README gtkpod-0.99.10/README
+--- gtkpod-0.99.10~/README	2007-06-27 21:29:36.000000000 +0200
++++ gtkpod-0.99.10/README	2007-11-18 14:02:44.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-abook.sh gtkpod-0.99.10/scripts/sync-abook.sh
+--- gtkpod-0.99.10~/scripts/sync-abook.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-abook.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-evocalendar.sh gtkpod-0.99.10/scripts/sync-evocalendar.sh
+--- gtkpod-0.99.10~/scripts/sync-evocalendar.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-evocalendar.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-evolution.sh gtkpod-0.99.10/scripts/sync-evolution.sh
+--- gtkpod-0.99.10~/scripts/sync-evolution.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-evolution.sh	2007-11-18 14:02:27.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
+ 
+diff -urNad gtkpod-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-0.99.10/scripts/sync-kaddressbook.sh
+--- gtkpod-0.99.10~/scripts/sync-kaddressbook.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-kaddressbook.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-korganizer.sh gtkpod-0.99.10/scripts/sync-korganizer.sh
+--- gtkpod-0.99.10~/scripts/sync-korganizer.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-korganizer.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-ldif.sh gtkpod-0.99.10/scripts/sync-ldif.sh
+--- gtkpod-0.99.10~/scripts/sync-ldif.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-ldif.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-0.99.10/scripts/sync-thunderbird-nano.sh
+--- gtkpod-0.99.10~/scripts/sync-thunderbird-nano.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-thunderbird-nano.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-thunderbird.sh gtkpod-0.99.10/scripts/sync-thunderbird.sh
+--- gtkpod-0.99.10~/scripts/sync-thunderbird.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-thunderbird.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/scripts/sync-webcalendar.sh gtkpod-0.99.10/scripts/sync-webcalendar.sh
+--- gtkpod-0.99.10~/scripts/sync-webcalendar.sh	2007-06-27 21:29:29.000000000 +0200
++++ gtkpod-0.99.10/scripts/sync-webcalendar.sh	2007-11-18 14:02:27.000000000 +0100
+@@ -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-0.99.10~/src/prefs.c gtkpod-0.99.10/src/prefs.c
+--- gtkpod-0.99.10~/src/prefs.c	2007-06-27 21:29:33.000000000 +0200
++++ gtkpod-0.99.10/src/prefs.c	2007-11-18 14:02:27.000000000 +0100
+@@ -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/");


Property changes on: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: gtkpod/trunk/debian/patches/02_missing_fclose.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/02_missing_fclose.dpatch	                        (rev 0)
+++ gtkpod/trunk/debian/patches/02_missing_fclose.dpatch	2007-11-18 13:49:43 UTC (rev 265)
@@ -0,0 +1,18 @@
+#! /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;
+ 


Property changes on: gtkpod/trunk/debian/patches/02_missing_fclose.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch	                        (rev 0)
+++ gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch	2007-11-18 13:49:43 UTC (rev 265)
@@ -0,0 +1,32 @@
+#! /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
+ 	{


Property changes on: gtkpod/trunk/debian/patches/03_itdb-set-local-to-imported.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: gtkpod/trunk/debian/rules
===================================================================
--- gtkpod/trunk/debian/rules	2007-11-15 16:01:30 UTC (rev 264)
+++ gtkpod/trunk/debian/rules	2007-11-18 13:49:43 UTC (rev 265)
@@ -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*




More information about the Pkg-gtkpod-devel mailing list