abiword: add 2.4.1, move patch to files/ and remove 2.0.14, 2.2.7, 2.3.5, 2.3.99...

diff --git a/packages/abiword/abiword-2.3.5/.mtn2git_empty b/packages/abiword/abiword-2.3.5/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/abiword/abiword-2.3.5/cdump-hack.patch b/packages/abiword/abiword-2.3.5/cdump-hack.patch
deleted file mode 100644 (file)
index afe7528..0000000
--- a/packages/abiword/abiword-2.3.5/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig       2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am    2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
-               ap_wp_sidebar.cpp
- 
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
- 
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
-       $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp

diff --git a/packages/abiword/abiword-2.3.99/.mtn2git_empty b/packages/abiword/abiword-2.3.99/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/abiword/abiword-2.3.99/cdump-hack.patch b/packages/abiword/abiword-2.3.99/cdump-hack.patch
deleted file mode 100644 (file)
index afe7528..0000000
--- a/packages/abiword/abiword-2.3.99/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig       2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am    2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
-               ap_wp_sidebar.cpp
- 
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
- 
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
-       $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp

diff --git a/packages/abiword/abiword-2.4.0/.mtn2git_empty b/packages/abiword/abiword-2.4.0/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/abiword/abiword-2.4.0/cdump-hack.patch b/packages/abiword/abiword-2.4.0/cdump-hack.patch
deleted file mode 100644 (file)
index afe7528..0000000
--- a/packages/abiword/abiword-2.4.0/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig       2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am    2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
-               ap_wp_sidebar.cpp
- 
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
- 
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
-       $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp

diff --git a/packages/abiword/abiword_2.0.14.bb b/packages/abiword/abiword_2.0.14.bb
deleted file mode 100644 (file)
index e79da68..0000000
--- a/packages/abiword/abiword_2.0.14.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "AbiWord Word Processor"
-
-DEPENDS     = "cdump-native libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-
-BROKEN = "1"
-inherit autotools
-
-PR = "r0"
-
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-SRC_URI = "http://download.sourceforge.net/abiword/abiword-${PV}.tar.bz2"
-
-FILES_${PN} += "${datadir}/icons/* \
-${datadir}/AbiSuite-2.0/AbiWord/glade \
-${datadir}/AbiSuite-2.0/AbiWord/scripts \
-${datadir}/AbiSuite-2.0/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.0/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.0/templates/A4.awt \
-#${datadir}/AbiSuite-2.0/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.0/templates/normal.awt \
-${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.0/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.0/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.0/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.0/templates/Resume.awt \
-${datadir}/AbiSuite-2.0/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.0/templates/Memo.awt \
-${datadir}/AbiSuite-2.0/templates/Press-Release.awt"
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
-       cd ${S}
-       ./autogen.sh
-       ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-#      --enable-debug
-}
-
-do_install_append() {
-       install -d ${D}${datadir}/pixmaps/
-       mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-

diff --git a/packages/abiword/abiword_2.3.5.bb b/packages/abiword/abiword_2.3.5.bb
deleted file mode 100644 (file)
index 76b569d..0000000
--- a/packages/abiword/abiword_2.3.5.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r4"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-       file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
-        cd ${S}
-        ./autogen.sh
-        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-#       --enable-debug
-       cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
-        install -d ${D}${datadir}/pixmaps/
-        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-

diff --git a/packages/abiword/abiword_2.4.0.bb b/packages/abiword/abiword_2.4.0.bb
deleted file mode 100644 (file)
index 9a83ff3..0000000
--- a/packages/abiword/abiword_2.4.0.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r5"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-       file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.4/AbiWord/glade \
-${datadir}/AbiSuite-2.4/AbiWord/scripts \
-${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.4/templates/A4.awt \
-#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.4/templates/normal.awt \
-${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.4/templates/Resume.awt \
-${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.4/templates/Memo.awt \
-${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
-        cd ${S}
-        ./autogen.sh
-        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-#       --enable-debug
-       cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
-        install -d ${D}${datadir}/pixmaps/
-        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-

diff --git a/packages/abiword/abiword_2.3.99.bb b/packages/abiword/abiword_2.4.1.bb
similarity index 99%
rename from packages/abiword/abiword_2.3.99.bb
rename to packages/abiword/abiword_2.4.1.bb
index 9a83ff3..26a16df 100644 (file)
--- a/packages/abiword/abiword_2.3.99.bb
+++ b/packages/abiword/abiword_2.4.1.bb
@@ -6,7 +6,7 @@ LICENSE="GPLv2"
 DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
 RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r5"
+PR="r0"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
        file://cdump-hack.patch;patch=1"

diff --git a/packages/abiword/abiword-2.2.7/.mtn2git_empty b/packages/abiword/files/.mtn2git_empty
similarity index 100%
rename from packages/abiword/abiword-2.2.7/.mtn2git_empty
rename to packages/abiword/files/.mtn2git_empty

diff --git a/packages/abiword/abiword-2.2.7/cdump-hack.patch b/packages/abiword/files/cdump-hack.patch
similarity index 100%
rename from packages/abiword/abiword-2.2.7/cdump-hack.patch
rename to packages/abiword/files/cdump-hack.patch