[oe-commits] org.oe.dev abiword 2.5: fix packaging

[koen commit]

abiword 2.5: fix packaging

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5
Files:
1
packages/abiword/abiword-2.5.inc
packages/abiword/abiword_2.5.1.bb
Diffs:

#
# mt diff -rac74c69b2e7fe59936877c616126c9a7998448aa -r373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5
#
# 
# 
# patch "packages/abiword/abiword-2.5.inc"
#  from [a2d60977f2ad75b56c1859748441a5644e35c555]
#    to [e523d1c593851bbd008dc514dd17073707fc961a]
# 
# patch "packages/abiword/abiword_2.5.1.bb"
#  from [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
#    to [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
# 
============================================================
--- packages/abiword/abiword-2.5.inc	a2d60977f2ad75b56c1859748441a5644e35c555
+++ packages/abiword/abiword-2.5.inc	e523d1c593851bbd008dc514dd17073707fc961a
@@ -13,21 +13,21 @@ FILES_${PN} += " \
 
 FILES_${PN} += " \
 		${datadir}/icons/* \
-		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \
-		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \
-		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \
-		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \
-#		${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \
-#		${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \
-		${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt "
+		${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}/templates/A4.awt \
+#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+		${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
+		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
 
 inherit autotools pkgconfig
 
@@ -54,8 +54,8 @@ PACKAGES += " abiword-clipart abiword-ic
 
 PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
 
+FILES_abiword-clipart 		+= "${datadir}/abiword-${SHRT_VER}/clipart"
+FILES_abiword-icons 		+= "${datadir}/abiword-${SHRT_VER}/icons"
+FILES_abiword-strings 		+= "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles 	+= "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates 	+= "${datadir}/abiword-${SHRT_VER}/templates"
-FILES_abiword-clipart 		+= "${datadir}/AbiSuite-${SHRT_VER}/clipart"
-FILES_abiword-icons 		+= "${datadir}/AbiSuite-${SHRT_VER}/icons"
-FILES_abiword-strings 		+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles 	+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates 	+= "${datadir}/AbiSuite-${SHRT_VER}/templates"
============================================================
--- packages/abiword/abiword_2.5.1.bb	c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
+++ packages/abiword/abiword_2.5.1.bb	a3d8ed34e897eaee21387d1b1b4a9899feba167e
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-1"
 require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"