summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
-rw-r--r--packages/abiword/abiword_2.6.3.bb3
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 382d562426..a3cb217a86 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,4 +1,5 @@
PREFERRED_VERSION_busybox = "1.9.2"
+PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
diff --git a/packages/abiword/abiword_2.6.3.bb b/packages/abiword/abiword_2.6.3.bb
new file mode 100644
index 0000000000..e2db4a09cb
--- /dev/null
+++ b/packages/abiword/abiword_2.6.3.bb
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"