solving merge conflict

author: John Lee <john_lee@openmoko.org> 2008-03-07 12:39:27 +0000
committer: John Lee <john_lee@openmoko.org> 2008-03-07 12:39:27 +0000
commit: e906546390539db91733531aa8007a59fcc3b60f (patch)
tree: 2d89a492846a2c0b4310abad9d943eee71d0e494 /packages
parent: 5a42b280d244be8ddc18eb07826a7cf4c3c605c1 (diff)
20 files changed, 0 insertions, 1378 deletions
diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
deleted file mode 100644
index 722ce88425..0000000000
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ /dev/null
@@ -1,885 +0,0 @@
-state.neo1973gta02 {
-	control.1 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 255'
-		iface MIXER
-		name 'PCM Volume'
-		value.0 235
-		value.1 235
-	}
-	control.2 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 255'
-		iface MIXER
-		name 'ADC Capture Volume'
-		value.0 195
-		value.1 195
-	}
-	control.3 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 0
-		value.1 0
-	}
-	control.4 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Speaker Playback Volume'
-		value.0 127
-		value.1 127
-	}
-	control.5 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Mono Playback Volume'
-		value 121
-	}
-	control.6 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Bypass Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.7 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Sidetone Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.8 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Voice Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.9 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.10 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.11 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Bypass Playback Volume'
-		value 2
-	}
-	control.12 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Sidetone Playback Volume'
-		value 2
-	}
-	control.13 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Voice Playback Volume'
-		value 2
-	}
-	control.14 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Playback ZC Switch'
-		value false
-	}
-	control.15 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Linear Control'
-		comment.item.1 'Adaptive Boost'
-		iface MIXER
-		name 'Bass Boost'
-		value 'Linear Control'
-	}
-	control.16 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '130Hz @ 48kHz'
-		comment.item.1 '200Hz @ 48kHz'
-		comment.item.2 '100Hz @ 16kHz'
-		comment.item.3 '400Hz @ 48kHz'
-		comment.item.4 '100Hz @ 8kHz'
-		comment.item.5 '200Hz @ 8kHz'
-		iface MIXER
-		name 'Bass Filter'
-		value '130Hz @ 48kHz'
-	}
-	control.17 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'Bass Volume'
-		value 0
-	}
-	control.18 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'Treble Volume'
-		value 0
-	}
-	control.19 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '8kHz'
-		comment.item.1 '4kHz'
-		iface MIXER
-		name 'Treble Cut-off'
-		value '8kHz'
-	}
-	control.20 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Sidetone Capture Volume'
-		value.0 2
-		value.1 2
-	}
-	control.21 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Voice Sidetone Capture Volume'
-		value 2
-	}
-	control.22 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 63'
-		iface MIXER
-		name 'Capture Volume'
-		value.0 23
-		value.1 23
-	}
-	control.23 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.24 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Capture Switch'
-		value.0 true
-		value.1 true
-	}
-	control.25 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '3.4Hz @ 48kHz'
-		comment.item.1 '82Hz @ 16k'
-		comment.item.2 '82Hz @ 8kHz'
-		comment.item.3 '170Hz @ 8kHz'
-		iface MIXER
-		name 'Capture Filter Select'
-		value '3.4Hz @ 48kHz'
-	}
-	control.26 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 HiFi
-		comment.item.1 Voice
-		iface MIXER
-		name 'Capture Filter Cut-off'
-		value HiFi
-	}
-	control.27 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Capture Filter Switch'
-		value false
-	}
-	control.28 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'ALC Capture Target Volume'
-		value 3
-	}
-	control.29 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'ALC Capture Max Volume'
-		value 7
-	}
-	control.30 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Off
-		comment.item.1 Right
-		comment.item.2 Left
-		comment.item.3 Stereo
-		iface MIXER
-		name 'ALC Capture Function'
-		value Left
-	}
-	control.31 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Capture ZC Switch'
-		value false
-	}
-	control.32 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Hold Time'
-		value 15
-	}
-	control.33 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Decay Time'
-		value 12
-	}
-	control.34 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Attack Time'
-		value 2
-	}
-	control.35 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 31'
-		iface MIXER
-		name 'ALC Capture NG Threshold'
-		value 0
-	}
-	control.36 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Constant PGA Gain'
-		comment.item.1 'Mute ADC Output'
-		iface MIXER
-		name 'ALC Capture NG Type'
-		value 'Constant PGA Gain'
-	}
-	control.37 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Capture NG Switch'
-		value false
-	}
-	control.38 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Capture
-		comment.item.1 Playback
-		iface MIXER
-		name '3D Function'
-		value Capture
-	}
-	control.39 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '2.2kHz'
-		comment.item.1 '1.5kHz'
-		iface MIXER
-		name '3D Upper Cut-off'
-		value '2.2kHz'
-	}
-	control.40 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '200Hz'
-		comment.item.1 '500Hz'
-		iface MIXER
-		name '3D Lower Cut-off'
-		value '200Hz'
-	}
-	control.41 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name '3D Volume'
-		value 0
-	}
-	control.42 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name '3D Switch'
-		value false
-	}
-	control.43 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Capture 6dB Attenuate'
-		value false
-	}
-	control.44 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Playback 6dB Attenuate'
-		value false
-	}
-	control.45 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 None
-		comment.item.1 '32kHz'
-		comment.item.2 '44.1kHz'
-		comment.item.3 '48kHz'
-		iface MIXER
-		name De-emphasis
-		value None
-	}
-	control.46 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Stereo
-		comment.item.1 Left
-		comment.item.2 Right
-		comment.item.3 Mono
-		iface MIXER
-		name 'Playback Mono Mix'
-		value Stereo
-	}
-	control.47 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Non Inverted'
-		comment.item.1 Inverted
-		iface MIXER
-		name 'Playback Phase'
-		value 'Non Inverted'
-	}
-	control.48 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 3'
-		iface MIXER
-		name 'Mic2 Capture Volume'
-		value 0
-	}
-	control.49 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 3'
-		iface MIXER
-		name 'Mic1 Capture Volume'
-		value 0
-	}
-	control.50 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'DAI 0'
-		comment.item.1 'DAI 1'
-		comment.item.2 'DAI 2'
-		comment.item.3 'DAI 3'
-		iface MIXER
-		name 'DAI Mode'
-		value 'DAI 0'
-	}
-	control.51 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Stereo
-		comment.item.1 'Left ADC'
-		comment.item.2 'Right ADC'
-		comment.item.3 'Channel Swap'
-		iface MIXER
-		name 'ADC Data Select'
-		value Stereo
-	}
-	control.52 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Non Inverted'
-		comment.item.1 Inverted
-		iface MIXER
-		name 'ROUT2 Phase'
-		value Inverted
-	}
-	control.53 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Mic 1'
-		comment.item.1 'Mic 2'
-		comment.item.2 'Mic 3'
-		iface MIXER
-		name 'Mic Selection Mux'
-		value 'Mic 1'
-	}
-	control.54 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'RXP - RXN'
-		comment.item.1 'RXP + RXN'
-		comment.item.2 RXP
-		comment.item.3 RXN
-		iface MIXER
-		name 'Rx Mixer'
-		value 'RXP - RXN'
-	}
-	control.55 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Line 1 + 2'
-		comment.item.1 'Line 1 - 2'
-		comment.item.2 'Line 1'
-		comment.item.3 'Line 2'
-		iface MIXER
-		name 'Line Mixer'
-		value 'Line 1 + 2'
-	}
-	control.56 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Line Mix'
-		comment.item.1 'Rx Mix'
-		iface MIXER
-		name 'Line Mono Mux'
-		value 'Line Mix'
-	}
-	control.57 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Line 2'
-		comment.item.1 'Rx Mix'
-		iface MIXER
-		name 'Line Right Mux'
-		value 'Rx Mix'
-	}
-	control.58 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Line 1'
-		comment.item.1 'Rx Mix'
-		iface MIXER
-		name 'Line Left Mux'
-		value 'Rx Mix'
-	}
-	control.59 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Mixer Line Capture Switch'
-		value false
-	}
-	control.60 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Mixer Mic2 Capture Switch'
-		value true
-	}
-	control.61 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Mixer Mic1 Capture Switch'
-		value false
-	}
-	control.62 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Mixer Rx Capture Switch'
-		value false
-	}
-	control.63 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Left PGA'
-		comment.item.1 'Mic 1'
-		comment.item.2 'Mic 2'
-		comment.item.3 'Right PGA'
-		iface MIXER
-		name 'Mic Sidetone Mux'
-		value 'Left PGA'
-	}
-	control.64 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 PGA
-		comment.item.1 'Line or RXP-RXN'
-		comment.item.2 Sidetone
-		iface MIXER
-		name 'Capture Right Mux'
-		value PGA
-	}
-	control.65 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 PGA
-		comment.item.1 'Line or RXP-RXN'
-		comment.item.2 Line
-		iface MIXER
-		name 'Capture Left Mux'
-		value PGA
-	}
-	control.66 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Stereo
-		comment.item.1 'Analogue Mix Left'
-		comment.item.2 'Analogue Mix Right'
-		comment.item.3 'Digital Mono Mix'
-		iface MIXER
-		name 'Capture Right Mixer'
-		value Stereo
-	}
-	control.67 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Stereo
-		comment.item.1 'Analogue Mix Left'
-		comment.item.2 'Analogue Mix Right'
-		comment.item.3 'Digital Mono Mix'
-		iface MIXER
-		name 'Capture Left Mixer'
-		value Stereo
-	}
-	control.68 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Playback Mixer Voice Capture Sw'
-		value false
-	}
-	control.69 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Playback Mixer Left Capture Swi'
-		value false
-	}
-	control.70 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Playback Mixer Right Capture Sw'
-		value false
-	}
-	control.71 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 VREF
-		comment.item.1 'Capture ST'
-		comment.item.2 LOUT2
-		iface MIXER
-		name 'Out4 Mux'
-		value VREF
-	}
-	control.72 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 VREF
-		comment.item.1 ROUT2
-		comment.item.2 'Left + Right'
-		iface MIXER
-		name 'Out3 Mux'
-		value VREF
-	}
-	control.73 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Inverted Mono 1'
-		comment.item.1 Left
-		comment.item.2 Right
-		comment.item.3 'Left + Right'
-		iface MIXER
-		name 'Mono 2 Mux'
-		value 'Inverted Mono 1'
-	}
-	control.74 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Mixer Left Playback Switch'
-		value false
-	}
-	control.75 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Mixer Right Playback Switc'
-		value false
-	}
-	control.76 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Mixer Voice Playback Switc'
-		value false
-	}
-	control.77 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Mixer Sidetone Playback Sw'
-		value true
-	}
-	control.78 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Mixer Bypass Playback Swit'
-		value false
-	}
-	control.79 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Right Mixer Voice Playback Swit'
-		value false
-	}
-	control.80 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Right Mixer Sidetone Playback S'
-		value false
-	}
-	control.81 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Right Mixer Right Playback Swit'
-		value true
-	}
-	control.82 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Right Mixer Bypass Playback Swi'
-		value true
-	}
-	control.83 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Left Mixer Voice Playback Switc'
-		value false
-	}
-	control.84 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Left Mixer Sidetone Playback Sw'
-		value false
-	}
-	control.85 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Left Mixer Left Playback Switch'
-		value true
-	}
-	control.86 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Left Mixer Bypass Playback Swit'
-		value true
-	}
-	control.87 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM Stereo Out Switch'
-		value false
-	}
-	control.88 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM GSM Line Out Switch'
-		value true
-	}
-	control.89 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM GSM Line In Switch'
-		value false
-	}
-	control.90 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM Headset Mic Switch'
-		value false
-	}
-	control.91 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM Handset Mic Switch'
-		value true
-	}
-	control.92 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'DAPM Handset Spk Switch'
-		value true
-	}
-	control.93 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Amp State Switch'
-		value false
-	}
-	control.94 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Amp Spk Switch'
-		value false
-	}
-}
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
deleted file mode 100644
index 197cea06b6..0000000000
--- a/packages/gnash/gnash.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
-LICENSE = "GPL-2"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
-
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
-
-
-EXTRA_OECONF = "--enable-gui=gtk \
-                --enable-renderer=cairo \
-		--enable-media=none \
-                --disable-klash \
-		--enable-z \
-		--enable-jpeg \
-		--disable-glext \
-		--enable-Xft \
-		--enable-expat \
-		--enable-mad \
-		--enable-cairo \
-		--disable-plugin \
-		--disable-cygnal \
-		--with-boost-incl=${STAGING_INCDIR} \
-		--with-boost-lib=${STAGING_LIBDIR} \
-		--with-libxml-incl=${STAGING_INCDIR}/libxml2 \
-		--with-libxml-lib=${STAGING_LIBDIR} \
-		--with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-#		--with-glib-lib=${STAGING_LIBDIR} \
-		--with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
-		--with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-#		--with-pango-lib=${STAGING_LIBDIR} \
-		--with-sdl-incl=${STAGING_INCDIR}/SDL \
-		--with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
-		--with-Xft-incl=${STAGING_INCDIR}/X11 \
-		--with-expat-incl=${STAGING_INCDIR} \
-		--with-mad-incl=${STAGING_INCDIR} \
-		--with-cairo-incl=${STAGING_INCDIR}/cairo \
-		--with-curl-incl=${STAGING_INCDIR} \
-		--with-curl-lib=${STAGING_LIBDIR} \
-		" 
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl  -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
-        for i in `find . -name Makefile` ; do
-		sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
-	done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-        oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                   'ZLIB_INCLUDE=${STAGING_INCDIR}' \
-                   'ZLIB_LIBS=${STAGING_LIBDIR}' \
-		   'PNG_INCLUDE=${STAGING_INCDIR}' \	
-		   'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
-
-PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
-
-FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
-FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
-FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
-FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
-FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
-FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
-FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
-
-do_stage() {
-        autotools_stage_all
-}
-
diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb
deleted file mode 100644
index da4b281e94..0000000000
--- a/packages/gnash/gnash_0.8.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-require gnash.inc
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
deleted file mode 100644
index 878cb1dba9..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
---- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
-@@ -35,6 +35,7 @@
- modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
- modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
- modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
-+modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
- Version svn-$Version
- ";
- 
-@@ -176,6 +177,25 @@
-       15812 => 3 ,
-       7906  => 2,
-       3953 => 1
-+    },
-+    openstreetmap_tah => {
-+      256*576000 =>  1,
-+      128*576000 =>  2,
-+       64*576000 =>  3,
-+       32*576000 =>  4,
-+       16*576000 =>  5,
-+        8*576000 =>  6,
-+        4*576000 =>  7,
-+        2*576000 =>  8,
-+          576000 =>  9,
-+          288000 => 10,
-+          144000 => 11,
-+           72000 => 12,
-+           36000 => 13,
-+           18000 => 14,
-+           9000  => 15,
-+            4500 => 16,
-+            2250 => 17
-     }
- };
- 
-@@ -331,7 +351,6 @@
-     exit();
- }
- 
--
- # Verify that we have the options that we need 
- pod2usage(1) if (&error_check);
- 
-@@ -417,6 +436,13 @@
-     print "+-----------------------------------------------------------+\n";
-     print "| Landsat Maps are Copyright, .....   |\n";
-     print "| They are free for non commercial use.                     |\n";
-+}elsif ( $mapserver eq 'openstreetmap_tah' ){
-+    print "+-----------------------------------------------------------+\n";
-+    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
-+    print "| project.                                                  |\n";
-+    print "| They are free for use under the terms of the              |\n";
-+    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
-+    print "| license. See http://www.openstreetmap.org for details.    |\n";
- } elsif ( ! $force) {
-     print "You are violating the map servers copyright!\n";
-     print "Are you sure you want to continue? [y|n] ";
-@@ -700,6 +726,11 @@
-     {
- 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
-     } 
-+    elsif ( $mapserver eq 'openstreetmap_tah') 
-+    {	
-+	$filename=~s/\.gif/.png/;
-+	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
-+    } 
-     else 
-     {
- 	print "Unknown map sever :", $mapserver, "\n"; 
-@@ -935,6 +966,37 @@
-     return ($url,$mapscale);
- }
- 
-+#############################################################################
-+sub openstreetmap_tah_url($$$){
-+    my $lati = shift;
-+    my $long = shift;
-+    my $scale = shift;
-+
-+    my $mapscale = $scale;
-+    my $zoom = undef;
-+    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
-+	next unless $s == $scale;
-+	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
-+	$mapscale = $s;
-+	last;
-+    }
-+
-+    unless ( $zoom ) {
-+	print "Error calculating Zoomlevel for Scale: $scale\n";
-+	return (undef,undef);
-+    }
-+
-+    if ($debug) {
-+	print "\n";
-+	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
-+	print "lat: $lati\n";
-+	print "lon: $long\n";
-+    }
-+
-+    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
-+#   print "$url\n";
-+    return ($url,$mapscale);
-+}
- 
- #############################################################################
- sub eniro_url($$$){
-@@ -2284,7 +2346,7 @@
- =item B<--mapserver <MAPSERVER>>
- 
- Mapserver to download from. Default: 'expedia'.
--Currently can use: landsat or expedia.
-+Currently usable: landsat, expedia or openstreetmap_tah.
- 
- geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
- but they are !!!NOT!!!! in the right scale.
-@@ -2294,6 +2356,9 @@
- 
- landsat covers the whole world with satelite Photos
- 
-+openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see 
-+		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
-+
- gov_au is for Australia
- 
- incrementp for japanese Maps
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
deleted file mode 100644
index c51c80931c..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/map_handler.c
-===================================================================
---- aa/src/map_handler.c	(Revision 1699)
-+++ aa/src/map_handler.c	(Revision 1700)
-@@ -660,9 +660,12 @@
-   if (maploaded)
-     gdk_pixbuf_unref (image);
- 
-+#ifdef MAPNIK
-   if ( !strcmp (filename,"mapnik") ) {
- 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
--  } else {
-+  } else 
-+#endif
-+  {
- 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
- 	  if (limage == NULL)
- 	    {
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
deleted file mode 100644
index c8c0fe9c6a..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
---- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
-@@ -14,14 +14,14 @@
- 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
- 	-DLIBDIR=\"${libdir}\" \
- 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
--	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
--	-I/usr/include/ \
--	-I/usr/local/include \
--	-I/opt/boost_1_35/include/boost-1_35 \
--	-I/usr/local/include/freetype2 \
--	-I/usr/include/freetype2 \
-+	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
-+#	-I/usr/include/ \
-+#	-I/usr/local/include \
-+#	-I/opt/boost_1_35/include/boost-1_35 \
-+#	-I/usr/local/include/freetype2 \
-+#	-I/usr/include/freetype2 \
- 	-I. \
--	-L/usr/local/lib
-+#	-L/usr/local/lib
- 
- #	-I/usr/include/dbus-1.0/ 
- 
-diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
---- gpsdrive-2.10pre4.orig/configure	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/configure	2008-01-06 14:49:11.000000000 +0100
-@@ -35950,10 +35950,13 @@
- #  Yep, its ebil, but I does not know better...
- #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
- # default on debian should be: /usr/share/perl5/
--PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
-+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
- #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
--PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
- 
-+# hard code path for OpenEmbedded environment as I don't know a way
-+# to detect it automatically
-+PERL_PACKAGE_DIR="/usr/share/perl5"
- 
- ac_perl_modules="File::Basename "
- # Make sure we have perl
-@@ -37840,11 +37843,11 @@
- #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')
- #fi
- 
--if test -f /usr/include/mysql/mysql.h; then
-- CFLAGS="$CFLAGS -I/usr/include/mysql"
--else
-- CFLAGS="$CFLAGS -Imysql"
--fi
-+#if test -f /usr/include/mysql/mysql.h; then
-+# CFLAGS="$CFLAGS -I/usr/include/mysql"
-+#else
-+# CFLAGS="$CFLAGS -Imysql"
-+#fi
- 
- CFLAGS="$CFLAGS $OPT_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
-diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac
---- gpsdrive-2.10pre4.orig/configure.ac	2007-12-28 18:49:44.000000000 +0100
-+++ gpsdrive-2.10pre4/configure.ac	2008-01-06 14:48:50.000000000 +0100
-@@ -662,9 +662,12 @@
- #  Yep, its ebil, but I does not know better...
- #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
- # default on debian should be: /usr/share/perl5/
--PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
-+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
- #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
--PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
-+# hard code path for OpenEmbedded environment as I don't know a way
-+# to detect it automatically
-+PERL_PACKAGE_DIR="/usr/share/perl5"
- AC_SUBST(PERL_PACKAGE_DIR)
- 
- AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))
-@@ -719,11 +722,11 @@
- #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') 
- #fi
- 
--if test -f /usr/include/mysql/mysql.h; then
-- CFLAGS="$CFLAGS -I/usr/include/mysql"
--else
-- CFLAGS="$CFLAGS -Imysql"
--fi
-+#if test -f /usr/include/mysql/mysql.h; then
-+# CFLAGS="$CFLAGS -I/usr/include/mysql"
-+#else
-+# CFLAGS="$CFLAGS -Imysql"
-+#fi
- 
- CFLAGS="$CFLAGS $OPT_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
deleted file mode 100644
index 96e8155861..0000000000
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GPSDrive
-Comment=GPS map software
-Exec=gpsdrive -M pda -1
-Icon=gpsicon
-Terminal=false
-Type=Application
-Categories=Graphics;Network;Geography;Application;Other
-StartupNotify=true
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
deleted file mode 100644
index 071a5691e3..0000000000
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "GPS navigation/map display software"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
-PR = "r1"
-
-SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
-           file://gpsdrive_2.10pre4.desktop \
-           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
-           file://gpsdrive-ifdef-mapnik.patch;patch=1 \
-           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
-	mkdir -p ${D}${datadir}/pixmaps
-	cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps
-        # remove stuff we don't want to package
-        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one
-        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux
-        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo
-}
-
-PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"
-
-FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"
-FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"
-FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"
-FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
-FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
-FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
-FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "1"
diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/multitap-pad/.mtn2git_empty
+++ /dev/null
diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/multitap-pad/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad
deleted file mode 100644
index d2b12ea7cc..0000000000
--- a/packages/multitap-pad/files/80multitappad
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-CMD=""
-
-if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
-    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
-        CMD="multitap-pad -d -o landscape"
-    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
-        CMD="multitap-pad -d -o portrait"
-    fi
-else
-    CMD="multitap-pad -d"
-fi
-
-
-# Delay to make sure the window manager is active
-
-if [ "$CMD" ]; then
-    (sleep 2 && $CMD) &
-fi
diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb
deleted file mode 100644
index 7543a44d72..0000000000
--- a/packages/multitap-pad/multitap-pad_svn.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Multi-tap input method for GTK"
-LICENSE = "GPL"
-DEPENDS = "libfakekey gtk+ matchbox-panel-2"
-RCONFLICTS = matchbox-keyboard-inputmethod
-SECTION = "x11"
-PV = "0.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
-	file://80multitappad"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${PN}"
-
-FILES_${PN} = "${bindir}/* \
-               ${libdir} \
-	       ${sysconfdir} \
-	       ${datadir}"
-
-FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
-                     ${libdir}/matchbox-panel/.debug"
-
-FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
-                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
-		     ${libdir}/matchbox-panel/*.a \
-		     ${libdir}/matchbox-panel/*.la"
-
-do_install_append () {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d/
-	install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
-}
-
-pkg_postinst_multitap-pad () {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm_multitap-pad () {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
deleted file mode 100644
index 8e8af7a086..0000000000
--- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
-DEPENDS = "libnotify"
-RDEPENDS = "openmoko-dialer2"
-PV = "0.0.0+svn${SVNREV}"
-PR = "r0"
-
-inherit openmoko-panel-plugin
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
deleted file mode 100644
index c6f34f4131..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
-@@ -38,7 +38,7 @@
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
- #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
deleted file mode 100644
index 72c516f5d6..0000000000
--- a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
-@@ -37,8 +37,8 @@
-         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
--#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb
deleted file mode 100644
index 68fdcbbbe5..0000000000
--- a/packages/perl/libwww-perl-native_5.808.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-
-inherit native
-
-require libwww-perl_${PV}.bb
diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb
deleted file mode 100644
index 2bea48a2d0..0000000000
--- a/packages/perl/libwww-perl_5.808.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"
-SECTION = "libs"
-LICENSE = "Artistic"
-DEPENDS = "liburi-perl-native"
-RDEPENDS = "liburi-perl"
-PR = "r1"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"
-
-S = "${WORKDIR}/libwww-perl-${PV}"
-
-inherit cpan
author	John Lee <john_lee@openmoko.org>	2008-03-07 12:39:27 +0000
committer	John Lee <john_lee@openmoko.org>	2008-03-07 12:39:27 +0000
commit	e906546390539db91733531aa8007a59fcc3b60f (patch)
tree	2d89a492846a2c0b4310abad9d943eee71d0e494 /packages
parent	5a42b280d244be8ddc18eb07826a7cf4c3c605c1 (diff)