merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'

     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'

89 files changed, 2515 insertions, 370 deletions

diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index ec11982ad7..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index d750bf539d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.6.0.bb b/packages/abiword/abiword-plugins_2.6.0.bb
new file mode 100644
index 0000000000..f6cdcc56b0
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.6.0.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
diff --git a/packages/abiword/abiword_2.6.0.bb b/packages/abiword/abiword_2.6.0.bb
new file mode 100644
index 0000000000..e2db4a09cb
--- /dev/null
+++ b/packages/abiword/abiword_2.6.0.bb
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/files/abiword-cxx-for-ld-fix.patch b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
new file mode 100644
index 0000000000..e49b1e92e5
--- /dev/null
+++ b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac	2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac	2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+ 
+ AM_INIT_AUTOMAKE
+ 
diff --git a/packages/alsa/alsa-state/tosa/asound.state b/packages/alsa/alsa-state/tosa/asound.state
index 12eaf2e036..c38265d792 100644
--- a/packages/alsa/alsa-state/tosa/asound.state
+++ b/packages/alsa/alsa-state/tosa/asound.state
@@ -37,13 +37,23 @@ state.Tosa {
 	}
 	control.5 {
 		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		iface MIXER
+		name 'PCM Playback Volume'
+		value.0 23
+		value.1 23
+	}
+	control.6 {
+		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
 		value true
 	}
-	control.6 {
+	control.7 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -51,7 +61,7 @@ state.Tosa {
 		name 'Speaker Playback Invert Switch'
 		value true
 	}
-	control.7 {
+	control.8 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -59,7 +69,7 @@ state.Tosa {
 		name 'Headphone Playback ZC Switch'
 		value true
 	}
-	control.8 {
+	control.9 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -67,7 +77,7 @@ state.Tosa {
 		name 'Mono Playback ZC Switch'
 		value false
 	}
-	control.9 {
+	control.10 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -76,7 +86,7 @@ state.Tosa {
 		name 'Mono Playback Volume'
 		value 0
 	}
-	control.10 {
+	control.11 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -85,16 +95,16 @@ state.Tosa {
 		name 'ALC Target Volume'
 		value 11
 	}
-	control.11 {
+	control.12 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Hold Time'
-		value 0
+		value 2
 	}
-	control.12 {
+	control.13 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -103,7 +113,7 @@ state.Tosa {
 		name 'ALC Decay Time'
 		value 3
 	}
-	control.13 {
+	control.14 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -112,7 +122,7 @@ state.Tosa {
 		name 'ALC Attack Time'
 		value 2
 	}
-	control.14 {
+	control.15 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -124,7 +134,7 @@ state.Tosa {
 		name 'ALC Function'
 		value None
 	}
-	control.15 {
+	control.16 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -133,7 +143,7 @@ state.Tosa {
 		name 'ALC Max Volume'
 		value 7
 	}
-	control.16 {
+	control.17 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -142,7 +152,7 @@ state.Tosa {
 		name 'ALC ZC Timeout'
 		value 0
 	}
-	control.17 {
+	control.18 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -150,7 +160,7 @@ state.Tosa {
 		name 'ALC ZC Switch'
 		value false
 	}
-	control.18 {
+	control.19 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -158,7 +168,7 @@ state.Tosa {
 		name 'ALC NG Switch'
 		value false
 	}
-	control.19 {
+	control.20 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -168,7 +178,7 @@ state.Tosa {
 		name 'ALC NG Type'
 		value 'Constant Gain'
 	}
-	control.20 {
+	control.21 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -177,16 +187,16 @@ state.Tosa {
 		name 'ALC NG Threshold'
 		value 31
 	}
-	control.21 {
+	control.22 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Mic Headphone  Volume'
-		value 3
+		value 7
 	}
-	control.22 {
+	control.23 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -195,7 +205,7 @@ state.Tosa {
 		name 'ALC Headphone Volume'
 		value 5
 	}
-	control.23 {
+	control.24 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -203,7 +213,7 @@ state.Tosa {
 		name 'Out3 Switch'
 		value false
 	}
-	control.24 {
+	control.25 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -211,7 +221,7 @@ state.Tosa {
 		name 'Out3 ZC Switch'
 		value true
 	}
-	control.25 {
+	control.26 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -220,7 +230,7 @@ state.Tosa {
 		name 'Out3 Volume'
 		value 0
 	}
-	control.26 {
+	control.27 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -229,7 +239,7 @@ state.Tosa {
 		name 'PCBeep Bypass Headphone Volume'
 		value 0
 	}
-	control.27 {
+	control.28 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -238,7 +248,7 @@ state.Tosa {
 		name 'PCBeep Bypass Speaker Volume'
 		value 0
 	}
-	control.28 {
+	control.29 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -247,16 +257,16 @@ state.Tosa {
 		name 'PCBeep Bypass Phone Volume'
 		value 0
 	}
-	control.29 {
+	control.30 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 7'
 		iface MIXER