12 files changed, 487 insertions, 523 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 3a021d4aa323..c0d16ff7faaf 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/editors/abiword/Makefile,v 1.13 2009/11/10 13:56:18 kwm Exp $
 
 PORTNAME=	abiword
-PORTVERSION=	2.8.6
-PORTREVISION=	10
+PORTVERSION=	3.0.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord
@@ -12,53 +11,58 @@ DIST_SUBDIR=	AbiWord
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open-source, cross-platform WYSIWYG word processor
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libpopt.so:${PORTSDIR}/devel/popt \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libwv.so:${PORTSDIR}/textproc/wv \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libpsiconv.so:${PORTSDIR}/converters/psiconv \
-		libgoffice-0.8.so:${PORTSDIR}/devel/goffice
+		libgoffice-0.10.so:${PORTSDIR}/devel/goffice010
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		desktop-file-utils gettext gmake iconv libtool pathfix pkgconfig
-USE_GNOME=	libxml2 gtk20 librsvg2 libxslt
+USES=		desktop-file-utils gmake iconv libtool pathfix pkgconfig
+USE_GNOME=	libxml2 gtk30 librsvg2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \
-		enable_dynamic="yes" enable_static="no" \
-		--disable-collab-backend-telepathy \
-		--enable-collab-backend-sugar
+		--enable-shared="yes" --enable-static="no"
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-ABIVERSION=	2.8
-PLIST_SUB+=	ABIVERSION=${ABIVERSION}
+PLIST_SUB+=	ABIVERSION=3.0
 
-OPTIONS_DEFINE=	DEBUG SPELLCHECK CLIPART TEMPLATES MATHVIEW \
-		OTS WP AIKSAURUS GRAMMAR PSION
-OPTIONS_DEFAULT=SPELLCHECK CLIPART TEMPLATES COLLAB
+OPTIONS_DEFINE=	AIKSAURUS CLIPART DEBUG MATHVIEW NLS OTS PSION \
+		TEMPLATES MATHVIEW WP
+OPTIONS_DEFAULT=CLIPART COLSERVICE COLSUGAR COLTCP SPELLCHECK TEMPLATES
+OPTIONS_SUB=	yes
 
-OPTIONS_GROUP=	COLLAB
-OPTIONS_GROUP_COLLAB=	COLXMPP
+OPTIONS_GROUP=	DICT COLLAB
+OPTIONS_GROUP_DICT=	GRAMMAR SPELLCHECK
+OPTIONS_GROUP_COLLAB=	COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP
 
-SPELLCHECK_DESC=	Spell checking support
+AIKSAURUS_DESC=		Thesaurus plugin
 CLIPART_DESC=		Include clipart
-TEMPLATES_DESC=		Include additional templates
 COLLAB_DESC=		Collaboration backend
-COLXMPP_DESC=		Collaboration jammer/XMPP backend
+COLFAKE_DESC=		Fake collaboration for debugging purposes only
+COLSERVICE_DESC=	Collaborate with AbiCollab.net webservice
+COLSIP_DESC=		Collaborate with the SIP/SIMPLE backend
+COLSUGAR_DESC=		Collaborate with the Sugar/OLPC environment
+COLTCP_DESC=		Collaborate with direct TCP peer to peer connections
+COLTELEPATHY_DESC=	Collaborate with the Telepathy backend (experimental)
+COLXMPP_DESC=		Collaborate with the Jabber/XMPP backend
+DICT_DESC=		Spelling and grammar checking
+GRAMMAR_DESC=		Grammar checking plugin (requires SPELLCHECK option)
 MATHVIEW_DESC=		MathML render plugin
 OTS_DESC=		Text Summarizer plugin
-WP_DESC=		WordPerfect img/doc import/export plugin
-AIKSAURUS_DESC=		Thesaurus plugin
-GRAMMAR_DESC=		Grammar checking plugin
 PSION_DESC=		Psion 5(MX) files convertion plugin
+SPELLCHECK_DESC=	Spell checking support
+TEMPLATES_DESC=		Include additional templates
+WP_DESC=		WordPerfect img/doc import/export plugin
 
 # check configure for ALL_PLUGINS for complete list
 ABIWORD_PLUGINS=	garble loadbindings opml xslfo bmp iscii sdw babelfish \
@@ -66,117 +70,92 @@ ABIWORD_PLUGINS=	garble loadbindings opml xslfo bmp iscii sdw babelfish \
 			goffice wmf kword mif wml s5 freetranslation gdict mht \
 			applix t602 docbook google eml hancom presentation \
 			clarisworks pdb urldict openwriter mswrite gimp \
-			passepartout collab eml
+			passepartout eml
 
 # opendocument enabled by default, rsvg plugin isn't needed on unix.
 # Plugins we don't support:
 # gda
 
-.include <bsd.port.options.mk>
+AIKSAURUS_LIB_DEPENDS=		libAiksaurusGTK-1.2.so:${PORTSDIR}/textproc/aiksaurus-gtk
 
-.if ${PORT_OPTIONS:MMATHVIEW}
-LIB_DEPENDS+=	libmathview.so:${PORTSDIR}/x11-toolkits/gtkmathview
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} mathview
-PLIST_SUB+=	MATHVIEW=""
-.else
-PLIST_SUB+=	MATHVIEW="@comment "
-.endif
+CLIPART_CONFIGURE_ENABLE=	clipart
 
-.if ${PORT_OPTIONS:MOTS}
-LIB_DEPENDS+=	libots-1.so:${PORTSDIR}/textproc/ots
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} ots
-PLIST_SUB+=	OTS=""
-.else
-PLIST_SUB+=	OTS="@comment "
-.endif
+COLFAKE_CONFIGURE_ENABLE=	collab-backend-fake
 
-.if ${PORT_OPTIONS:MWP}
-USE_GNOME+=	libgsf
-LIB_DEPENDS+=	libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
-		libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} wpg wordperfect
-PLIST_SUB+=	WP=""
-.else
-PLIST_SUB+=	WP="@comment "
-.endif
+COLSERVICE_CONFIGURE_ENABLE=	collab-backend-service
+COLSERVICE_BUILD_DEPENDS=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+COLSERVICE_LIB_DEPENDS=		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+				libgnutls.so:${PORTSDIR}/security/gnutls
+COLSERVICE_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
 
-.if ${PORT_OPTIONS:MAIKSAURUS}
-LIB_DEPENDS+=	libAiksaurusGTK-1.2.so:${PORTSDIR}/textproc/aiksaurus-gtk
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} aiksaurus
-PLIST_SUB+=	AIKSAURUS=""
-.else
-PLIST_SUB+=	AIKSAURUS="@comment "
-.endif
+COLSIP_CONFIGURE_ENABLE=	collab-backend-sip
 
-.if ${PORT_OPTIONS:MGRAMMAR}
-LIB_DEPENDS+=	liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} grammar
-PLIST_SUB+=	GRAMMAR=""
-.else
-PLIST_SUB+=	GRAMMAR="@comment "
-.endif
+COLSUGAR_CONFIGURE_ENABLE=	collab-backend-sugar
+COLSUGAR_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-.if ${PORT_OPTIONS:MPSION}
-LIB_DEPENDS+=	libpsiconv.so:${PORTSDIR}/converters/psiconv
-ABIWORD_PLUGINS:=	${ABIWORD_PLUGINS} psion
-PLIST_SUB+=	PSION=""
-.else
-PLIST_SUB+=	PSION="@comment "
-.endif
+COLTCP_CONFIGURE_ENABLE=	collab-backend-tcp
+COLTCP_BUILD_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+COLTCP_RUN_DEPENDS=		${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
 
-#.if ! ${PORT_OPTIONS:MCOLLAB} && ${PORT_OPTIONS:MCOLXMPP}
-#BROKEN=		Please enable the COLLAB option, the COLXMPP option need it.
-#.endif
+COLTELEPATHY_CONFIGURE_ENABLE=	collab-backend-telepathy
+COLTELEPATHY_LIB_DEPENDS=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
 
-.if ${PORT_OPTIONS:MCOLXMPP}
-CONFIGURE_ARGS+=--enable-collab-backend-xmpp
-LIB_DEPENDS+=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
-.else
-CONFIGURE_ARGS+=--disable-collab-backend-xmpp
-.endif
+COLXMPP_CONFIGURE_ENABLE=	collab-backend-xmpp
+COLXMPP_LIB_DEPENDS=		libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+
+DEBUG_CONFIGURE_ENABLE=		debug symbols
+
+GRAMMAR_LIB_DEPENDS=		liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
+
+MATHVIEW_LIB_DEPENDS=		libmathview.so:${PORTSDIR}/x11-toolkits/gtkmathview
+
+NLS_USES=			gettext
+NLS_CONFIGURE_ENABLE=		nls
+
+OTS_LIB_DEPENDS=		libots-1.so:${PORTSDIR}/textproc/ots
+
+PSION_LIB_DEPENDS=		libpsiconv.so:${PORTSDIR}/converters/psiconv
+
+SPELLCHECK_LIB_DEPENDS=		libenchant.so:${PORTSDIR}/textproc/enchant
+SPELLCHECK_CONFIGURE_ENABLE=	spell
+
+TEMPLATES_CONFIGURE_ENABLE=	templates
+
+WP_USE=		gnome=libgsf
+WP_LIB_DEPENDS=	libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
+		libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug --enable-symbols
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MAIKSAURUS}
+ABIWORD_PLUGINS+=	aiksaurus
 .endif
 
-.if ${PORT_OPTIONS:MCOLLAB}
-CONFIGURE_ARGS+=--with-boost --enable-collab-backend-tcp \
-		--enable-collab-backend-service
-BUILD_DEPENDS+=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
-LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgnutls.so:${PORTSDIR}/security/gnutls
-RUN_DEPENDS+=	${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio
+.if ${PORT_OPTIONS:MCOL*}
 PLIST_SUB+=		COLLAB=""
+ABIWORD_PLUGINS+=	collab
 .else
-CONFIGURE_ARGS+=--without-boost --disable-collab-backend-tcp \
-		--disable-collab-backend-service
 PLIST_SUB+=		COLLAB="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSPELLCHECK}
-LIB_DEPENDS+=		libenchant.so:${PORTSDIR}/textproc/enchant
-CONFIGURE_ARGS+=	--enable-spell
-PLIST_SUB+=		DICT=""
-.else
-CONFIGURE_ARGS+=	--disable-spell
-PLIST_SUB+=		DICT="@comment "
+.if ${PORT_OPTIONS:MGRAMMAR}
+ABIWORD_PLUGINS+=	grammar
 .endif
 
-.if ${PORT_OPTIONS:MTEMPLATES}
-CONFIGURE_ARGS+=	--enable-templates
-PLIST_SUB+=		TEMPLATES=""
-.else
-CONFIGURE_ARGS+=	--disable-templates
-PLIST_SUB+=		TEMPLATES="@comment "
+.if ${PORT_OPTIONS:MMATHVIEW}
+ABIWORD_PLUGINS+=	mathview
 .endif
 
-.if ${PORT_OPTIONS:MCLIPART}
-CONFIGURE_ARGS+=	--enable-clipart
-PLIST_SUB+=		CLIPART=""
-.else
-CONFIGURE_ARGS+=	--disable-clipart
-PLIST_SUB+=		CLIPART="@comment "
+.if ${PORT_OPTIONS:MOTS}
+ABIWORD_PLUGINS+=	ots
+.endif
+
+.if ${PORT_OPTIONS:MPSION}
+ABIWORD_PLUGINS+=	psion
+.endif
+
+.if ${PORT_OPTIONS:MWP}
+ABIWORD_PLUGINS+=	wpg wordperfect
 .endif
 
 post-patch:
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index b3e3e4c5af7f..7c88f77c3c3f 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,2 +1,2 @@
-SHA256 (AbiWord/abiword-2.8.6.tar.gz) = d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
-SIZE (AbiWord/abiword-2.8.6.tar.gz) = 9218827
+SHA256 (AbiWord/abiword-3.0.1.tar.gz) = e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6
+SIZE (AbiWord/abiword-3.0.1.tar.gz) = 11144990
diff --git a/editors/abiword/files/patch-Makefile.in b/editors/abiword/files/patch-Makefile.in
deleted file mode 100644
index cb470743befa..000000000000
--- a/editors/abiword/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-10-28 18:39:23.000000000 +0100
-+++ Makefile.in	2009-10-28 18:39:42.000000000 +0100
-@@ -418,7 +418,7 @@ DIST_SUBDIRS = goffice-bits src plugins 
- @WITH_GOFFICE_BUILTIN_TRUE@SUBDIRS = goffice-bits src plugins user
- @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktopdir = $(datadir)/applications
- @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktop_DATA = abiword.desktop
--@TOOLKIT_GTK_TRUE@mimedir = @ABIWORD_DATADIR@/mime-info
-+@TOOLKIT_GTK_TRUE@mimedir = $(datadir)/mime-info
- @TOOLKIT_GTK_TRUE@mime_DATA = abiword.keys
- @TOOLKIT_GTK_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig
- @TOOLKIT_GTK_TRUE@pkgconfig_DATA = abiword-$(ABIWORD_SERIES).pc
diff --git a/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp b/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp
deleted file mode 100644
index 6a86bf685da8..000000000000
--- a/editors/abiword/files/patch-plugins_bmp_xp_ie_impGraphic_BMP.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2013-03-25 06:58:03.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp	2013-03-25 07:00:22.000000000 +0000
-@@ -191,7 +191,7 @@
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	//FREEP(m_pPNGInfo->palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +313,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +332,7 @@
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +372,7 @@
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
diff --git a/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h b/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h
new file mode 100644
index 000000000000..3ef132d0a6a4
--- /dev/null
+++ b/editors/abiword/files/patch-plugins_collab_backends_sipsimple_xp_SIPSimpleBuddy.h
@@ -0,0 +1,15 @@
+--- plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h.orig	2015-04-04 04:57:15 UTC
++++ plugins/collab/backends/sipsimple/xp/SIPSimpleBuddy.h
+@@ -52,10 +52,10 @@ public:
+ 
+ 	virtual const DocTreeItem* getDocTreeItems() const
+ 	{
+-		const vector<DocHandle*>& docHandles = getDocHandles();
++		const std::vector<DocHandle*>& docHandles = getDocHandles();
+ 		DocTreeItem* first = 0;
+ 		DocTreeItem* prev = 0;
+-		for (vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
++		for (std::vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
+ 		{
+ 			DocTreeItem* item = new DocTreeItem();
+ 			item->m_type = DOCTREEITEM_TYPE_DOCUMENT;
diff --git a/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp b/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp
deleted file mode 100644
index 29dadf15783f..000000000000
--- a/editors/abiword/files/patch-plugins_garble_xp_abiword-garble-png.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2013-03-25 06:55:41.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp	2013-03-25 06:56:20.000000000 +0000
-@@ -79,7 +79,7 @@
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
deleted file mode 100644
index 89b99694aacd..000000000000
--- a/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/af/util/xp/ut_png.cpp.orig	2010-04-14 23:50:11.000000000 +0200
-+++ src/af/util/xp/ut_png.cpp	2012-04-28 06:58:49.000000000 +0200
-@@ -71,7 +71,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
new file mode 100644
index 000000000000..de17f745645e
--- /dev/null
+++ b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
@@ -0,0 +1,26 @@
+--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-03-31 15:14:42 UTC
++++ src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
+     return m_value == b;
+ }
+ 
++bool PD_URI::operator<(const PD_URI& b) const
++{
++    return m_value < b.m_value;
++}
++
+ PD_URI
+ PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
+ {
+@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
+     return true;
+ }
+ 
+-bool operator<( PD_URI a, PD_URI b)
+-{
+-    return a.toString() < b.toString();
+-}
+-
+ bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
+ {
+     return a.first.toString() < b.toString();
diff --git a/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h
new file mode 100644
index 000000000000..b75b4a8c814d
--- /dev/null
+++ b/editors/abiword/files/patch-src_text_ptbl_xp_pd__DocumentRDF.h
@@ -0,0 +1,10 @@
+--- src/text/ptbl/xp/pd_DocumentRDF.h.orig	2015-03-31 15:15:00 UTC
++++ src/text/ptbl/xp/pd_DocumentRDF.h
+@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI
+     bool isValid() const;
+     bool operator==(const PD_URI& b) const;
+     bool operator==(const std::string& b) const;
++    bool operator<(const PD_URI& b) const;
+ 
+     virtual bool read( std::istream& ss );
+     virtual bool write( std::ostream& ss ) const;
diff --git a/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp b/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
deleted file mode 100644
index 3c3cf410290c..000000000000
--- a/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2010-04-14 23:50:13.000000000 +0200
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp	2012-04-28 07:25:54.000000000 +0200
-@@ -185,7 +185,7 @@
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
diff --git a/editors/abiword/files/patch-tls_tunnel.cpp b/editors/abiword/files/patch-tls_tunnel.cpp
deleted file mode 100644
index 9447b8dd855c..000000000000
--- a/editors/abiword/files/patch-tls_tunnel.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- plugins/collab/backends/service/xp/tls_tunnel.cpp-orig	2014-07-27 14:22:00.000000000 +0200
-+++ plugins/collab/backends/service/xp/tls_tunnel.cpp	2014-07-27 14:22:46.000000000 +0200
-@@ -124,10 +124,14 @@
- }
- 
- static struct gcry_thread_cbs gcry_threads_tunnel =
-+#if GCRYPT_VERSION_NUMBER < 0x010600
- { GCRY_THREAD_OPTION_USER, NULL,
-   gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
-   gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
-   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
-+#else
-+{ GCRY_THREAD_OPTION_USER };
-+#endif
- 
- bool Proxy::tls_tunnel_init() {
- 	if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index dd8d5b30cfd7..570103d9a2b2 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -52,304 +52,346 @@ lib/abiword-%%ABIVERSION%%/plugins/xslfo.so
 lib/libabiword-%%ABIVERSION%%.so
 libdata/pkgconfig/abiword-%%ABIVERSION%%.pc
 man/man1/abiword.1.gz
-share/abiword-%%ABIVERSION%%/Presentation.xml
-%%COLLAB%%share/abiword-%%ABIVERSION%%/certs/cacert.pem
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/book.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/chip.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/fun.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gear.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomea.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeb.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomec.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomecorner.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomed.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomedecor1.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomedecor2.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomee.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeflowers.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/gnomeline.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/idea.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/lamp.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/monitor.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/music1.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/pinceau.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/simca.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/surprise.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/together.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/toolbox.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/tree.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/tux_bordelais.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/weather.png
-%%CLIPART%%share/abiword-%%ABIVERSION%%/clipart/write.png
-share/abiword-%%ABIVERSION%%/system.profile-ro
-share/abiword-%%ABIVERSION%%/system.profile-ro-RO
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/A4.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Business-Letter.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Business-Report.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Employee-Directory.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Fax-Coversheet.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Friendly-Letter.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Memo.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Press-Release.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Resume.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/Two-Columns.awt
-%%TEMPLATES%%share/abiword-%%ABIVERSION%%/templates/US-Letter.awt
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ro
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ro_RO
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Annotation.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Break.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAccounts.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddAccount.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddBuddy.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationJoin.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationShare.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Field.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFootnotes.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.xml
-%%COLLAB%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.xml
-%%COLLAB%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Insert_DateTime.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Latex.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_MailMerge.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_MetaData.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_New.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Options.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Options_ColorSel.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_PageNumbers.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_PageSetup.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Replace.xml
-%%DICT%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Spell.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Styles.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist_modal.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Tab.xml
-share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_WordCount.xml
-%%OTS%%share/abiword-%%ABIVERSION%%/ui/ots.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_DocComparison.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Encoding.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_History.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Image.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Language.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_ListDocuments.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Password.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_PluginManager.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_WindowMore.xml
-share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Zoom.xml
-share/abiword-%%ABIVERSION%%/readme.abw
-share/abiword-%%ABIVERSION%%/readme.txt
-share/abiword-%%ABIVERSION%%/strings/am-ET.strings
-share/abiword-%%ABIVERSION%%/strings/ar.strings
-share/abiword-%%ABIVERSION%%/strings/ast-ES.strings
-share/abiword-%%ABIVERSION%%/strings/ayc-BO.strings
-share/abiword-%%ABIVERSION%%/strings/aym-BO.strings
-share/abiword-%%ABIVERSION%%/strings/be-BY.strings
-share/abiword-%%ABIVERSION%%/strings/bg-BG.strings
-share/abiword-%%ABIVERSION%%/strings/br-FR.strings
-share/abiword-%%ABIVERSION%%/strings/ca-ES.strings
-share/abiword-%%ABIVERSION%%/strings/cs-CZ.strings
-share/abiword-%%ABIVERSION%%/strings/cy-GB.strings
-share/abiword-%%ABIVERSION%%/strings/da-DK.strings
-share/abiword-%%ABIVERSION%%/strings/de-CH.strings
-share/abiword-%%ABIVERSION%%/strings/de-DE.strings
-share/abiword-%%ABIVERSION%%/strings/el-GR.strings
-share/abiword-%%ABIVERSION%%/strings/en-AU.strings
-share/abiword-%%ABIVERSION%%/strings/en-CA.strings
-share/abiword-%%ABIVERSION%%/strings/en-GB.strings
-share/abiword-%%ABIVERSION%%/strings/en-IE.strings
-share/abiword-%%ABIVERSION%%/strings/eo.strings
-share/abiword-%%ABIVERSION%%/strings/es-ES.strings
-share/abiword-%%ABIVERSION%%/strings/es-MX.strings
-share/abiword-%%ABIVERSION%%/strings/et.strings
-share/abiword-%%ABIVERSION%%/strings/eu-ES.strings
-share/abiword-%%ABIVERSION%%/strings/fi-FI.strings
-share/abiword-%%ABIVERSION%%/strings/fr-FR.strings
-share/abiword-%%ABIVERSION%%/strings/ga-IE.strings
-share/abiword-%%ABIVERSION%%/strings/gl.strings
-share/abiword-%%ABIVERSION%%/strings/he-IL.strings
-share/abiword-%%ABIVERSION%%/strings/hr-HR.strings
-share/abiword-%%ABIVERSION%%/strings/hu-HU.strings
-share/abiword-%%ABIVERSION%%/strings/id-ID.strings
-share/abiword-%%ABIVERSION%%/strings/it-IT.strings
-share/abiword-%%ABIVERSION%%/strings/ja-JP.strings
-share/abiword-%%ABIVERSION%%/strings/jbo.strings
-share/abiword-%%ABIVERSION%%/strings/ko.strings
-share/abiword-%%ABIVERSION%%/strings/ku.strings
-share/abiword-%%ABIVERSION%%/strings/lt-LT.strings
-share/abiword-%%ABIVERSION%%/strings/lv-LV.strings
-share/abiword-%%ABIVERSION%%/strings/mg-MG.strings
-share/abiword-%%ABIVERSION%%/strings/mh-MH.strings
-share/abiword-%%ABIVERSION%%/strings/mk-MK.strings
-share/abiword-%%ABIVERSION%%/strings/ms-MY.strings
-share/abiword-%%ABIVERSION%%/strings/nb-NO.strings
-share/abiword-%%ABIVERSION%%/strings/ne-NP.strings
-share/abiword-%%ABIVERSION%%/strings/nl-NL.strings
-share/abiword-%%ABIVERSION%%/strings/nn-NO.strings
-share/abiword-%%ABIVERSION%%/strings/pl-PL.strings
-share/abiword-%%ABIVERSION%%/strings/pt-BR.strings
-share/abiword-%%ABIVERSION%%/strings/pt-PT.strings
-share/abiword-%%ABIVERSION%%/strings/quh-BO.strings
-share/abiword-%%ABIVERSION%%/strings/qul-BO.strings
-share/abiword-%%ABIVERSION%%/strings/ro-RO.strings
-share/abiword-%%ABIVERSION%%/strings/ru-RU.strings
-share/abiword-%%ABIVERSION%%/strings/sc-IT.strings
-share/abiword-%%ABIVERSION%%/strings/sk-SK.strings
-share/abiword-%%ABIVERSION%%/strings/sl-SI.strings
-share/abiword-%%ABIVERSION%%/strings/sq-AL.strings
-share/abiword-%%ABIVERSION%%/strings/sr.strings
-share/abiword-%%ABIVERSION%%/strings/sv-SE.strings
-share/abiword-%%ABIVERSION%%/strings/ta-IN.strings
-share/abiword-%%ABIVERSION%%/strings/tr-TR.strings
-share/abiword-%%ABIVERSION%%/strings/uk-UA.strings
-share/abiword-%%ABIVERSION%%/strings/ur.strings
-share/abiword-%%ABIVERSION%%/strings/vi-VN.strings
-share/abiword-%%ABIVERSION%%/strings/wo-SN.strings
-share/abiword-%%ABIVERSION%%/strings/yi.strings
-share/abiword-%%ABIVERSION%%/strings/zh-CN.strings
-share/abiword-%%ABIVERSION%%/strings/zh-HK.strings
-share/abiword-%%ABIVERSION%%/strings/zh-TW.strings
-share/abiword-%%ABIVERSION%%/system.profile
-share/abiword-%%ABIVERSION%%/system.profile-CP1254
-share/abiword-%%ABIVERSION%%/system.profile-KOI8-R
-share/abiword-%%ABIVERSION%%/system.profile-KOI8-U
-share/abiword-%%ABIVERSION%%/system.profile-KOI8-UB
-share/abiword-%%ABIVERSION%%/system.profile-am-ET
-share/abiword-%%ABIVERSION%%/system.profile-ar
-share/abiword-%%ABIVERSION%%/system.profile-ar-EG
-share/abiword-%%ABIVERSION%%/system.profile-ar-SA
-share/abiword-%%ABIVERSION%%/system.profile-bg-BG
-share/abiword-%%ABIVERSION%%/system.profile-ca-ES
-share/abiword-%%ABIVERSION%%/system.profile-cs-CZ
-share/abiword-%%ABIVERSION%%/system.profile-da-DK
-share/abiword-%%ABIVERSION%%/system.profile-de
-share/abiword-%%ABIVERSION%%/system.profile-de-AT
-share/abiword-%%ABIVERSION%%/system.profile-de-CH
-share/abiword-%%ABIVERSION%%/system.profile-de-DE
-share/abiword-%%ABIVERSION%%/system.profile-div-MV
-share/abiword-%%ABIVERSION%%/system.profile-el-GR
-share/abiword-%%ABIVERSION%%/system.profile-en
-share/abiword-%%ABIVERSION%%/system.profile-en-AU
-share/abiword-%%ABIVERSION%%/system.profile-en-CA
-share/abiword-%%ABIVERSION%%/system.profile-en-GB
-share/abiword-%%ABIVERSION%%/system.profile-en-IE
-share/abiword-%%ABIVERSION%%/system.profile-en-NZ
-share/abiword-%%ABIVERSION%%/system.profile-en-US
-share/abiword-%%ABIVERSION%%/system.profile-en-ZA
-share/abiword-%%ABIVERSION%%/system.profile-es
-share/abiword-%%ABIVERSION%%/system.profile-es-ES
-share/abiword-%%ABIVERSION%%/system.profile-es-MX
-share/abiword-%%ABIVERSION%%/system.profile-eu
-share/abiword-%%ABIVERSION%%/system.profile-eu-ES
-share/abiword-%%ABIVERSION%%/system.profile-fa-IR
-share/abiword-%%ABIVERSION%%/system.profile-fi-FI
-share/abiword-%%ABIVERSION%%/system.profile-fr
-share/abiword-%%ABIVERSION%%/system.profile-fr-BE
-share/abiword-%%ABIVERSION%%/system.profile-fr-CA
-share/abiword-%%ABIVERSION%%/system.profile-fr-CH
-share/abiword-%%ABIVERSION%%/system.profile-fr-FR
-share/abiword-%%ABIVERSION%%/system.profile-gl-ES
-share/abiword-%%ABIVERSION%%/system.profile-he
-share/abiword-%%ABIVERSION%%/system.profile-he-IL
-share/abiword-%%ABIVERSION%%/system.profile-hu-HU
-share/abiword-%%ABIVERSION%%/system.profile-it-IT
-share/abiword-%%ABIVERSION%%/system.profile-ja-JP
-share/abiword-%%ABIVERSION%%/system.profile-lt-LT
-share/abiword-%%ABIVERSION%%/system.profile-nb-NO
-share/abiword-%%ABIVERSION%%/system.profile-nl-NL
-share/abiword-%%ABIVERSION%%/system.profile-nn-NO
-share/abiword-%%ABIVERSION%%/system.profile-pl-PL
-share/abiword-%%ABIVERSION%%/system.profile-ps
-share/abiword-%%ABIVERSION%%/system.profile-pt-BR
-share/abiword-%%ABIVERSION%%/system.profile-pt-PT
-share/abiword-%%ABIVERSION%%/system.profile-ru
-share/abiword-%%ABIVERSION%%/system.profile-ru-RU
-share/abiword-%%ABIVERSION%%/system.profile-sk-SK
-share/abiword-%%ABIVERSION%%/system.profile-sk-SK.CP1250
-share/abiword-%%ABIVERSION%%/system.profile-sl
-share/abiword-%%ABIVERSION%%/system.profile-sv
-share/abiword-%%ABIVERSION%%/system.profile-sv-SE
-share/abiword-%%ABIVERSION%%/system.profile-syr
-share/abiword-%%ABIVERSION%%/system.profile-tr
-share/abiword-%%ABIVERSION%%/system.profile-tr-TR
-share/abiword-%%ABIVERSION%%/system.profile-tr-TR.CP1254
-share/abiword-%%ABIVERSION%%/system.profile-uk-UA
-share/abiword-%%ABIVERSION%%/system.profile-ur-PK
-share/abiword-%%ABIVERSION%%/system.profile-yi
-share/abiword-%%ABIVERSION%%/system.profile-zh-CN
-share/abiword-%%ABIVERSION%%/system.profile-zh-TW
-share/abiword-%%ABIVERSION%%/templates/normal.awt
-share/abiword-%%ABIVERSION%%/templates/normal.awt-am_ET
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ar
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ar_EG
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ar_SA
-share/abiword-%%ABIVERSION%%/templates/normal.awt-bg_BG
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ca_ES
-share/abiword-%%ABIVERSION%%/templates/normal.awt-cs_CZ
-share/abiword-%%ABIVERSION%%/templates/normal.awt-da_DK
-share/abiword-%%ABIVERSION%%/templates/normal.awt-de
-share/abiword-%%ABIVERSION%%/templates/normal.awt-de_AT
-share/abiword-%%ABIVERSION%%/templates/normal.awt-de_CH
-share/abiword-%%ABIVERSION%%/templates/normal.awt-de_DE
-share/abiword-%%ABIVERSION%%/templates/normal.awt-div_MV
-share/abiword-%%ABIVERSION%%/templates/normal.awt-el_GR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_AU
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_CA
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_GB
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_IE
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_NZ
-share/abiword-%%ABIVERSION%%/templates/normal.awt-en_ZA
-share/abiword-%%ABIVERSION%%/templates/normal.awt-es
-share/abiword-%%ABIVERSION%%/templates/normal.awt-es_AR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-es_ES
-share/abiword-%%ABIVERSION%%/templates/normal.awt-es_IR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-es_MX
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fa_IR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fi_FI
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fr
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_BE
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_CA
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_CH
-share/abiword-%%ABIVERSION%%/templates/normal.awt-fr_FR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-gl_ES
-share/abiword-%%ABIVERSION%%/templates/normal.awt-he
-share/abiword-%%ABIVERSION%%/templates/normal.awt-he_IL
-share/abiword-%%ABIVERSION%%/templates/normal.awt-hu_HU
-share/abiword-%%ABIVERSION%%/templates/normal.awt-it_IT
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ja_JP
-share/abiword-%%ABIVERSION%%/templates/normal.awt-lt_LT
-share/abiword-%%ABIVERSION%%/templates/normal.awt-nb_NO
-share/abiword-%%ABIVERSION%%/templates/normal.awt-nl_NL
-share/abiword-%%ABIVERSION%%/templates/normal.awt-nn_NO
-share/abiword-%%ABIVERSION%%/templates/normal.awt-pl_PL
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ps
-share/abiword-%%ABIVERSION%%/templates/normal.awt-pt_BR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-pt_PT
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ru
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ru_RU
-share/abiword-%%ABIVERSION%%/templates/normal.awt-sk_SK
-share/abiword-%%ABIVERSION%%/templates/normal.awt-sl
-share/abiword-%%ABIVERSION%%/templates/normal.awt-sv
-share/abiword-%%ABIVERSION%%/templates/normal.awt-sv_SE
-share/abiword-%%ABIVERSION%%/templates/normal.awt-syr
-share/abiword-%%ABIVERSION%%/templates/normal.awt-tr
-share/abiword-%%ABIVERSION%%/templates/normal.awt-tr_TR
-share/abiword-%%ABIVERSION%%/templates/normal.awt-uk_UA
-share/abiword-%%ABIVERSION%%/templates/normal.awt-ur_PK
-share/abiword-%%ABIVERSION%%/templates/normal.awt-yi
-share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_CN
-share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_TW
-share/abiword-%%ABIVERSION%%/xsltml/README
-share/abiword-%%ABIVERSION%%/xsltml/cmarkup.xsl
-share/abiword-%%ABIVERSION%%/xsltml/entities.xsl
-share/abiword-%%ABIVERSION%%/xsltml/glayout.xsl
-share/abiword-%%ABIVERSION%%/xsltml/mmltex.xsl
-share/abiword-%%ABIVERSION%%/xsltml/scripts.xsl
-share/abiword-%%ABIVERSION%%/xsltml/tables.xsl
-share/abiword-%%ABIVERSION%%/xsltml/tokens.xsl
+%%DATADIR%%-%%ABIVERSION%%/Presentation.xml
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/certs/cacert.pem
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/book.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/chip.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/fun.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gear.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomea.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeb.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomec.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomecorner.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomed.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomedecor1.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomedecor2.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomee.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeflowers.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeline.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/idea.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/lamp.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/monitor.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/music1.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/pinceau.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/simca.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/surprise.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/together.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/toolbox.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/tree.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/tux_bordelais.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/weather.png
+%%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/write.png
+%%DATADIR%%-%%ABIVERSION%%/mime-info/abiword.keys
+%%DATADIR%%-%%ABIVERSION%%/omml_xslt/mml2omml.xsl
+%%DATADIR%%-%%ABIVERSION%%/omml_xslt/omml2mml.xsl
+%%DATADIR%%-%%ABIVERSION%%/readme.abw
+%%DATADIR%%-%%ABIVERSION%%/readme.txt
+%%DATADIR%%-%%ABIVERSION%%/strings/ach.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/af-ZA.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ak.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/am-ET.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ar.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ast-ES.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ayc-BO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/aym-BO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/be-BY.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/be@latin.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/bg-BG.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/bm.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/bn.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/br-FR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/bs.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ca-ES.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/cgg.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/cs-CZ.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/cy-GB.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/da-DK.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/de-CH.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/de-DE.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/el-GR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/en-AU.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/en-CA.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/en-GB.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/en-IE.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/eo.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/es-ES.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/es-MX.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/et.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/eu-ES.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/fa-AF.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ff.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/fi-FI.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/fil.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/fr-FR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ga-IE.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/gl.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/he-IL.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/hi.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/hr-HR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/hu-HU.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/id-ID.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/it-IT.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ja-JP.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/jbo.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/kk-KZ.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/km.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ko.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ku.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/lg.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/lt-LT.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/lv-LV.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/mg-MG.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/mk-MK.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/mnk-SN.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ms-MY.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/nb-NO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ne-NP.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/nl-NL.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/nn-NO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/pl-PL.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ps.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/pt-BR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/pt-PT.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/quh-BO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/qul-BO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/quz.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ro-RO.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ru-RU.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sc-IT.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sk-SK.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sl-SI.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/son.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sq-AL.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sr.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sr@latin.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sv-SE.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/sw.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/ta-IN.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/th.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/tr-TR.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/uk-UA.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/vi-VN.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/wo-SN.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/yi.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/zh-CN.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/zh-HK.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/zh-TW.strings
+%%DATADIR%%-%%ABIVERSION%%/strings/zu.strings
+%%DATADIR%%-%%ABIVERSION%%/system.profile
+%%DATADIR%%-%%ABIVERSION%%/system.profile-CP1254
+%%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-R
+%%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-U
+%%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-UB
+%%DATADIR%%-%%ABIVERSION%%/system.profile-am-ET
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ar
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ar-EG
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ar-SA
+%%DATADIR%%-%%ABIVERSION%%/system.profile-bg-BG
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ca-ES
+%%DATADIR%%-%%ABIVERSION%%/system.profile-cs-CZ
+%%DATADIR%%-%%ABIVERSION%%/system.profile-da-DK
+%%DATADIR%%-%%ABIVERSION%%/system.profile-de
+%%DATADIR%%-%%ABIVERSION%%/system.profile-de-AT
+%%DATADIR%%-%%ABIVERSION%%/system.profile-de-CH
+%%DATADIR%%-%%ABIVERSION%%/system.profile-de-DE
+%%DATADIR%%-%%ABIVERSION%%/system.profile-div-MV
+%%DATADIR%%-%%ABIVERSION%%/system.profile-el-GR
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-AU
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-CA
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-GB
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-IE
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-NZ
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-US
+%%DATADIR%%-%%ABIVERSION%%/system.profile-en-ZA
+%%DATADIR%%-%%ABIVERSION%%/system.profile-es
+%%DATADIR%%-%%ABIVERSION%%/system.profile-es-ES
+%%DATADIR%%-%%ABIVERSION%%/system.profile-es-MX
+%%DATADIR%%-%%ABIVERSION%%/system.profile-eu
+%%DATADIR%%-%%ABIVERSION%%/system.profile-eu-ES
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fa-IR
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fi-FI
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fr
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fr-BE
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fr-CA
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fr-CH
+%%DATADIR%%-%%ABIVERSION%%/system.profile-fr-FR
+%%DATADIR%%-%%ABIVERSION%%/system.profile-gl-ES
+%%DATADIR%%-%%ABIVERSION%%/system.profile-he
+%%DATADIR%%-%%ABIVERSION%%/system.profile-he-IL
+%%DATADIR%%-%%ABIVERSION%%/system.profile-hu-HU
+%%DATADIR%%-%%ABIVERSION%%/system.profile-it-IT
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ja-JP
+%%DATADIR%%-%%ABIVERSION%%/system.profile-kk-KZ
+%%DATADIR%%-%%ABIVERSION%%/system.profile-lt-LT
+%%DATADIR%%-%%ABIVERSION%%/system.profile-nb-NO
+%%DATADIR%%-%%ABIVERSION%%/system.profile-nl-NL
+%%DATADIR%%-%%ABIVERSION%%/system.profile-nn-NO
+%%DATADIR%%-%%ABIVERSION%%/system.profile-pl-PL
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ps
+%%DATADIR%%-%%ABIVERSION%%/system.profile-pt-BR
+%%DATADIR%%-%%ABIVERSION%%/system.profile-pt-PT
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ro
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ro-RO
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ru
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ru-RU
+%%DATADIR%%-%%ABIVERSION%%/system.profile-sk-SK
+%%DATADIR%%-%%ABIVERSION%%/system.profile-sk-SK.CP1250
+%%DATADIR%%-%%ABIVERSION%%/system.profile-sl
+%%DATADIR%%-%%ABIVERSION%%/system.profile-sv
+%%DATADIR%%-%%ABIVERSION%%/system.profile-sv-SE
+%%DATADIR%%-%%ABIVERSION%%/system.profile-syr
+%%DATADIR%%-%%ABIVERSION%%/system.profile-tr
+%%DATADIR%%-%%ABIVERSION%%/system.profile-tr-TR
+%%DATADIR%%-%%ABIVERSION%%/system.profile-tr-TR.CP1254
+%%DATADIR%%-%%ABIVERSION%%/system.profile-uk-UA
+%%DATADIR%%-%%ABIVERSION%%/system.profile-ur-PK
+%%DATADIR%%-%%ABIVERSION%%/system.profile-yi
+%%DATADIR%%-%%ABIVERSION%%/system.profile-zh-CN
+%%DATADIR%%-%%ABIVERSION%%/system.profile-zh-TW
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/A4.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Business-Letter.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Business-Report.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Employee-Directory.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Fax-Coversheet.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Friendly-Letter.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Memo.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Press-Release.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Resume.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Two-Columns.awt
+%%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/US-Letter.awt
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-am_ET
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar_EG
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar_SA
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-bg_BG
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ca_ES
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-cs_CZ
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-da_DK
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_AT
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_CH
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_DE
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-div_MV
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-el_GR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_AU
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_CA
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_GB
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_IE
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_NZ
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_ZA
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_AR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_ES
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_IR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_MX
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fa_IR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fi_FI
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_BE
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_CA
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_CH
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_FR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-gl_ES
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-he
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-he_IL
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-hu_HU
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-it_IT
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ja_JP
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-kk_KZ
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-km_KH
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-lt_LT
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nb_NO
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nl_NL
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nn_NO
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pl_PL
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ps
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pt_BR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pt_PT
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ro
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ro_RO
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ru
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ru_RU
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sk_SK
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sl
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sv
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sv_SE
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-syr
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-tr
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-tr_TR
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-uk_UA
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ur_PK
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-yi
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-zh_CN
+%%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-zh_TW
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Annotation.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Border_Shading.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Break.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAccounts.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddAccount.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddBuddy.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationEditAccount.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationJoin.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationShare.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Field.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFootnotes.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.ui
+%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Insert_DateTime.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Latex.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_MailMerge.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_MetaData.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_New.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Options.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Options_ColorSel.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_PageNumbers.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_PageSetup.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_RDFEditor.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_RDFQuery.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Replace.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_SemanticStylesheets.ui
+%%SPELLCHECK%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Spell.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Styles.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Tab.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_WordCount.ui
+%%OTS%%%%DATADIR%%-%%ABIVERSION%%/ui/ots.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFContact.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFEvent.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFInsertReference.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFLocation.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_DocComparison.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Encoding.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_History.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Image.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Language.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_ListDocuments.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Password.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_PluginManager.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_WindowMore.ui
+%%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Zoom.ui
+%%DATADIR%%-%%ABIVERSION%%/xsltml/README
+%%DATADIR%%-%%ABIVERSION%%/xsltml/cmarkup.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/entities.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/glayout.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/mmltex.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/scripts.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/tables.xsl
+%%DATADIR%%-%%ABIVERSION%%/xsltml/tokens.xsl
 share/applications/abiword.desktop
-share/icons/abiword_48.png
-share/mime-info/abiword.keys
+%%COLTELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
+share/icons/hicolor/16x16/apps/abiword.png
+share/icons/hicolor/22x22/apps/abiword.png
+share/icons/hicolor/256x256/apps/abiword.png
+share/icons/hicolor/32x32/apps/abiword.png
+share/icons/hicolor/48x48/apps/abiword.png
+share/icons/hicolor/512x512/apps/abiword.png
+share/icons/hicolor/scalable/apps/abiword.svg
+%%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client