abiword: ship glade files, should fix #3062

diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 42fc6c7..09f61d0 100644 (file)
--- 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_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 5fcc1dd..9741ad6 100644 (file)
--- 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
index 66d8fae..5fcc1dd 100644 (file)
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"