~ubuntu-branches/ubuntu/hardy/gtkpod-aac/hardy : revision 11

1

#! /bin/sh /usr/share/dpatch/dpatch-run

2

## 01_mountpoint.dpatch by Nico Golde <nion@debian.org>

3

##

4

## All lines beginning with `## DP:' are a description of the patch.

5

## DP: No description.

6

7

@DPATCH@

8

diff -urNad gtkpod-aac-0.99.10~/README gtkpod-aac-0.99.10/README

9

--- gtkpod-aac-0.99.10~/README 2007-11-20 01:41:04.000000000 -0500

10

+++ gtkpod-aac-0.99.10/README 2007-11-20 02:15:23.000000000 -0500

11

@@ -52,7 +52,7 @@

12

1) If your iPod is not mounted automatically when connecting it to

13

your computer follow steps 1-7 in the "Connecting your iPod to a

14

Linux box" (basically you need to get the iPod partition mounted to

15

- /mnt/ipod). In most cases this should not be necessary any more

16

+ /media/ipod). In most cases this should not be necessary any more

17

these days.

18

19

2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will

20

@@ -699,13 +699,13 @@

21

(Obviously you need to change the filesystem type from 'vfat' to

22

'hfsplus' when you use an HFS formatted iPod.)

23

24

- Then simply add a link from /mnt/ipod:

25

+ Then simply add a link from /media/ipod:

26

27

- ln -s /var/autofs/removable/ipod /mnt/ipod

28

+ ln -s /var/autofs/removable/ipod /media/ipod

29

30

31

Now your system is configured to mount the iPod every time you access

32

-/mnt/ipod and to unmount it again after two seconds of inactivity. You

33

+/media/ipod and to unmount it again after two seconds of inactivity. You

34

won't have to worry about doing mounting/unmouting yourself any more.

35

36

37

@@ -750,19 +750,19 @@

38

* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)

39

40

41

-3) Create /mnt/ipod:

42

+3) Create /media/ipod:

43

44

- mkdir /mnt/ipod

45

+ mkdir /media/ipod

46

47

4) Add a line to /etc/fstab. You should edit uid to match your user

48

id. Also, /dev/sda2 may not be appropriate, if you have other scsi

49

devices.

50

51

-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,errors=remount 0 0

52

+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,errors=remount 0 0

53

54

(For HFS this line should read

55

56

-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0

57

+/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0

58

59

please note that it's just '/dev/sda')

60

61

@@ -770,7 +770,7 @@

62

NOTE: Some users have had problems with newer versions of mount(newer than

63

mount-2.11h) The following fstab entry might work better for you.

64

65

-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0

66

+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0

67

68

5) Install the hotplug utilities

69

(http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')

70

@@ -819,13 +819,13 @@

71

72

7) Mount the iPod hard drive

73

74

- mount /mnt/ipod

75

+ mount /media/ipod

76

77

8) do whatever you need to do (e.g. start gtkpod, see below)

78

79

9) Unmount the iPod:

80

81

- umount /mnt/ipod

82

+ umount /media/ipod

83

84

10) Unload the module sbp2 (as most likely as root):

85

86

@@ -874,19 +874,19 @@

87

* -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)

88

* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)

89

90

-3) Create /mnt/ipod:

91

+3) Create /media/ipod:

92

93

- mkdir /mnt/ipod

94

+ mkdir /media/ipod

95

96

4) Add a line to /etc/fstab. You should edit uid to match your user

97

id. Also, /dev/sda2 may not be appropriate, if you have other scsi

98

devices.

99

100

-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime 0 0

101

+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime 0 0

102

103

(For HFS this line should read

104

105

-/dev/sda /mnt/ipod hfsplus rw,user,noauto,exec 0 0

106

+/dev/sda /media/ipod hfsplus rw,user,noauto,exec 0 0

107

108

please note that it's just '/dev/sda')

109

110

@@ -894,7 +894,7 @@

111

NOTE: Some users have had problems with newer versions of mount(newer than

112

mount-2.11h) The following fstab entry might work better for you.

113

114

-/dev/sda2 /mnt/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0

115

+/dev/sda2 /media/ipod vfat rw,user,noauto,noatime,shortname=winnt 0 0

116

117

NOTE: You can add ",umask=0" to the options to make the iPod

118

readable/writable for all users.

119

@@ -934,13 +934,13 @@

120

121

7) Mount the iPod hard drive

122

123

- mount /mnt/ipod

124

+ mount /media/ipod

125

126

8) do whatever you need to do (e.g. start gtkpod, see below)

127

128

9) Unmount the iPod:

129

130

- umount /mnt/ipod

131

+ umount /media/ipod

132

133

10) Unload the module sbp2 (as most likely as root):

134

135

@@ -974,7 +974,7 @@

136

- since the iPod's hdd was already spun up, the SCSI subsystem now

137

recognizes it and mounts it as /dev/sda

138

139

-- You can then mount /dev/sda2 to /mnt/ipod as normal."

140

+- You can then mount /dev/sda2 to /media/ipod as normal."

141

142

On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had

143

any problem whatsoever getting the iPod to work. With IEEE it was

144

@@ -1030,10 +1030,10 @@

145

/**********/

146

Add a line similar to the below to your /etc/fstab, this will enable users

147

to mount the ipod with read/write capabilities. Example line assumes your

148

-ipod mount point is /mnt/ipod and your ipod is detected as /dev/sda

149

+ipod mount point is /media/ipod and your ipod is detected as /dev/sda

150

151

------------------------------- Begin Here ---------------------------------

152

-/dev/sda2 /mnt/ipod vfat rw,user,noauto 0 0

153

+/dev/sda2 /media/ipod vfat rw,user,noauto 0 0

154

------------------------------- End Here -----------------------------------

155

156

157

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-abook.sh gtkpod-aac-0.99.10/scripts/sync-abook.sh

158

--- gtkpod-aac-0.99.10~/scripts/sync-abook.sh 2007-11-20 01:41:04.000000000 -0500

159

+++ gtkpod-aac-0.99.10/scripts/sync-abook.sh 2007-11-20 02:15:23.000000000 -0500

160

@@ -9,7 +9,7 @@

161

#

162

# with the following defaults:

163

164

-IPOD_MOUNT='/mnt/ipod' # mount point of ipod

165

+IPOD_MOUNT='/media/ipod' # mount point of ipod

166

DATAFILE='~/.abook/addressbook' # the abook db

167

ENCODING_FROM=UTF-8 # encoding used by abook

168

ENCODING=ISO-8859-15 # encoding used by ipod

169

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh

170

--- gtkpod-aac-0.99.10~/scripts/sync-evocalendar.sh 2007-11-20 01:41:04.000000000 -0500

171

+++ gtkpod-aac-0.99.10/scripts/sync-evocalendar.sh 2007-11-20 02:15:23.000000000 -0500

172

@@ -10,7 +10,7 @@

173

#

174

# with the following defaults:

175

176

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

177

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

178

179

#the path to a script that will be passed the ical information from STDIN and filter, if needed

180

#FILTER_SCRIPT=

181

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-evolution.sh gtkpod-aac-0.99.10/scripts/sync-evolution.sh

182

--- gtkpod-aac-0.99.10~/scripts/sync-evolution.sh 2007-11-20 01:41:04.000000000 -0500

183

+++ gtkpod-aac-0.99.10/scripts/sync-evolution.sh 2007-11-20 02:15:23.000000000 -0500

184

@@ -13,7 +13,7 @@

185

#

186

# with the following defaults:

187

188

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

189

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

190

EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin' # additional path

191

ENCODING=ISO-8859-15 # encoding used by ipod

192

193

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh

194

--- gtkpod-aac-0.99.10~/scripts/sync-kaddressbook.sh 2007-11-20 01:41:04.000000000 -0500

195

+++ gtkpod-aac-0.99.10/scripts/sync-kaddressbook.sh 2007-11-20 02:15:23.000000000 -0500

196

@@ -9,7 +9,7 @@

197

#

198

# with the following defaults:

199

200

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

201

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

202

DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file

203

ENCODING=ISO-8859-15 # encoding used by ipod

204

205

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh gtkpod-aac-0.99.10/scripts/sync-korganizer.sh

206

--- gtkpod-aac-0.99.10~/scripts/sync-korganizer.sh 2007-11-20 01:41:04.000000000 -0500

207

+++ gtkpod-aac-0.99.10/scripts/sync-korganizer.sh 2007-11-20 02:15:23.000000000 -0500

208

@@ -9,7 +9,7 @@

209

#

210

# with the following defaults:

211

212

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

213

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

214

DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file

215

ENCODING=ISO-8859-15 # encoding used by ipod

216

217

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-ldif.sh gtkpod-aac-0.99.10/scripts/sync-ldif.sh

218

--- gtkpod-aac-0.99.10~/scripts/sync-ldif.sh 2007-11-20 01:41:04.000000000 -0500

219

+++ gtkpod-aac-0.99.10/scripts/sync-ldif.sh 2007-11-20 02:15:23.000000000 -0500

220

@@ -15,7 +15,7 @@

221

# differently...This is still Chinese for me!! :)

222

223

export LDIFAMILYNAME=contactIPOD # Filenames will look like $LDIFAMILYNAMEXX.vcf, X=[0-9]

224

-export IPOD_MOUNT=/mnt/ipod # Mount point of the ipod

225

+export IPOD_MOUNT=/media/ipod # Mount point of the ipod

226

declare LDIFILE=addressbook.ldif # default filename 'addressbook.ldif'

227

declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv --list'

228

declare DELETE="NO" # To delete old .vcf files by default? 'NO'!!

229

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh

230

--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird-nano.sh 2007-11-20 01:41:04.000000000 -0500

231

+++ gtkpod-aac-0.99.10/scripts/sync-thunderbird-nano.sh 2007-11-20 02:15:23.000000000 -0500

232

@@ -25,7 +25,7 @@

233

234

# with the following defaults:

235

236

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

237

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

238

ENCODING=ISO-8859-15 # encoding used by ipod

239

NAME=thunderbird # default file export name

240

FILE_FLAG='' # flag used to determine end of file

241

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh

242

--- gtkpod-aac-0.99.10~/scripts/sync-thunderbird.sh 2007-11-20 01:41:04.000000000 -0500

243

+++ gtkpod-aac-0.99.10/scripts/sync-thunderbird.sh 2007-11-20 02:15:23.000000000 -0500

244

@@ -18,7 +18,7 @@

245

246

# with the following defaults:

247

248

-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod

249

+IPOD_MOUNT=/media/ipod # mountpoint of ipod

250

ENCODING=ISO-8859-15 # encoding used by ipod

251

NAME=thunderbird # default file export name

252

253

diff -urNad gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh

254

--- gtkpod-aac-0.99.10~/scripts/sync-webcalendar.sh 2007-11-20 01:41:04.000000000 -0500

255

+++ gtkpod-aac-0.99.10/scripts/sync-webcalendar.sh 2007-11-20 02:15:23.000000000 -0500

256

@@ -9,7 +9,7 @@

257

# with the following defaults:

258

259

# mount point of ipod

260

-IPOD_MOUNT='/mnt/ipod'

261

+IPOD_MOUNT='/media/ipod'

262

# uri for webcalendar (example)

263

DATAFILE='https://somewhere.local/calendar.ics'

264

# calendar name

265

diff -urNad gtkpod-aac-0.99.10~/src/prefs.c gtkpod-aac-0.99.10/src/prefs.c

266

--- gtkpod-aac-0.99.10~/src/prefs.c 2007-11-20 02:14:59.000000000 -0500

267

+++ gtkpod-aac-0.99.10/src/prefs.c 2007-11-20 02:15:42.000000000 -0500

268

@@ -178,7 +178,7 @@

269

prefs_set_int("delete_file", TRUE);

270

prefs_set_int("delete_local_file", TRUE);

271

prefs_set_int("delete_database", TRUE);

272

- prefs_set_string("initial_mountpoint", "/mnt/ipod");

273

+ prefs_set_string("initial_mountpoint", "/media/ipod");

274

prefs_set_string ("path_play_now", "xmms %s");

275

prefs_set_string ("path_play_enqueue", "xmms -e %s");

276

prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");