7 files changed, 67 insertions, 5 deletions
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 42fc6c7d6e..09f61d0534 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -13,10 +13,10 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,
 
 FILES_${PN} += " \
 		${datadir}/icons/* \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+		${datadir}/abiword-${SHRT_VER}/glade \
+		${datadir}/abiword-${SHRT_VER}/scripts \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
 #		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
diff --git a/packages/abiword/abiword-embedded_2.5.2.bb b/packages/abiword/abiword-embedded_2.5.2.bb
new file mode 100644
index 0000000000..47cf9e03c0
--- /dev/null
+++ b/packages/abiword/abiword-embedded_2.5.2.bb
@@ -0,0 +1,10 @@
+require abiword-2.5.inc
+
+EXTRA_OECONF += "--enable-embedded"
+
+S = "${WORKDIR}/abiword-${PV}"
+
+RCONFLICTS = "abiword"
+RPROVIDES += "abiword"
+
+
diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb
index 84de68c1a0..41652828bf 100644
--- a/packages/abiword/abiword-plugins_2.4.6.bb
+++ b/packages/abiword/abiword-plugins_2.4.6.bb
@@ -5,6 +5,8 @@ LICENSE = "GPLv2"
 DEPENDS = "libwpd librsvg goffice poppler"
 RDEPENDS = "abiword"
 
+PR = "r1"
+
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
            file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
 S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index 10b7ba2de7..ec11982ad7 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -5,6 +5,8 @@ LICENSE = "GPLv2"
 DEPENDS = "libwpd librsvg goffice poppler libglade"
 RDEPENDS = "abiword"
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
new file mode 100644
index 0000000000..6f739c7b22
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -0,0 +1,41 @@
+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"
+
+PR = "r1"
+
+DEFAULT_PREFERENCE = "1"
+
+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 \
+	   "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGINC_INCDIR}/../ \ 
+		 "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.5/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.5/plugins/.debug"
+
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 5fcc1dd1a2..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
new file mode 100644
index 0000000000..5fcc1dd1a2
--- /dev/null
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -0,0 +1,7 @@
+require abiword-2.5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r1"
+
+RCONFLICTS = "abiword-embedded"