4 files changed, 359 insertions, 258 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 580d9ca54143..be7c8ecef5cc 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.4.4
 CATEGORIES=	print chinese japanese korean
 MASTER_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/cjk-lyx/qt/ \
@@ -15,8 +14,7 @@ MASTER_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/ \
 PKGNAMEPREFIX=	cjk-
 DISTNAME=	CJK-LyX-qt-${PORTVERSION}
 DISTFILES=	${DISTNAME}-1.src${EXTRACT_SUFX} \
-		lyx-platex-${PORTVERSION}.tar.gz:JPN \
-		lyx-1.4_2.mo:JPN
+		lyx-platex-${PORTVERSION}.tar.gz:JPN
 DIST_SUBDIR=	CJK-LyX
 EXTRACT_ONLY=	${DISTNAME}-1.src${EXTRACT_SUFX} \
 		lyx-platex-${PORTVERSION}.tar.gz
@@ -31,9 +29,6 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost \
 		qt-mt:${PORTSDIR}/x11-toolkits/qt33
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 
-BROKEN=		Does not build
-
-CONFLICTS=	lyx-*
 OPTIONS=	ASPELL	"Utilize ASPELL library"	on \
 		ISPELL	"Depend on ISPELL as well"	off
 .if defined(LANG) && ${LANG:C/_.*//} == "ja"
@@ -53,16 +48,22 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[c
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--without-included-boost \
 		--with-extra-inc="${LOCALBASE}/include" \
-		--with-frontend=qt
+		--with-frontend=qt \
+		--program-prefix="${PKGNAMEPREFIX}"
 CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
 CFLAGS=		${PTHREAD_CFLAGS}
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 tex2lyx.1 lyxclient.1
+MAN1=		${PKGNAMEPREFIX}lyx.1 ${PKGNAMEPREFIX}tex2lyx.1 ${PKGNAMEPREFIX}lyxclient.1
+
+DATADIR=	${TARGETDIR}/share/${PKGNAMEPREFIX}${PORTNAME}
 
 # Make uic stay off the lawn
 MAKE_ENV=	TMPDIR=/tmp
 
+post-extract:
+	${MV} ${WRKSRC}/po/lyx.pot ${WRKSRC}/po/${PKGNAMEPREFIX}lyx.pot
+
 post-patch:
 	# Removing mention of the bundled boost
 	${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' ${WRKSRC}/configure
@@ -78,19 +79,15 @@ post-configure:
 	# Removing explicit linking with -lc
 	${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile
 
-post-build:
+post-install:
 	@${ECHO_MSG}
-	@${ECHO_MSG} "Fixing up the Japanese message file..."
+	@${ECHO_MSG} "Type \"${PKGNAMEPREFIX}lyx\" to execute the program."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "User setting folder will be created under ~/.${PKGNAMEPREFIX}lyx when ${PKGNAMEPREFIX}lyx is run for the first time."
 	@${ECHO_MSG}
-	@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/lyx-1.4_1.mo ${WRKSRC}/po/ja.gmo
-
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
-PLIST_SUB+=	PSRES=
-.else
-PLIST_SUB+=	PSRES='@comment '
-.endif
+PLIST_SUB=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 756bb8478702..777bb29c4274 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1,12 +1,9 @@
-MD5 (CJK-LyX/CJK-LyX-qt-1.4.2-1.src.tar.gz) = d07121e30817b4bdda0df7f0d0aa2126
-SHA256 (CJK-LyX/CJK-LyX-qt-1.4.2-1.src.tar.gz) = 4d3781557c859884254e54a4e5a3f721a34ee582d09df7e8d70a4f12bf045851
-SIZE (CJK-LyX/CJK-LyX-qt-1.4.2-1.src.tar.gz) = 9536446
-MD5 (CJK-LyX/lyx-platex-1.4.2.tar.gz) = 82ef16a03e809763411151919bca531b
-SHA256 (CJK-LyX/lyx-platex-1.4.2.tar.gz) = a5e201ec42a47cb396466b2dfe2e806232e4ffd91d43b557606b44681a42ba03
-SIZE (CJK-LyX/lyx-platex-1.4.2.tar.gz) = 2644
-MD5 (CJK-LyX/lyx-1.4_2.mo) = 4e2e0acd575770f59f3a371781972b82
-SHA256 (CJK-LyX/lyx-1.4_2.mo) = 1eeebd0789b19dc1870ad7ae2dca175884bf4c2ee75291c8806c3c0a14a60303
-SIZE (CJK-LyX/lyx-1.4_2.mo) = 201831
-MD5 (CJK-LyX/patch-platex-1.4.2.diff) = c51bf7f168963eaf07e9c677a6a68073
-SHA256 (CJK-LyX/patch-platex-1.4.2.diff) = 6f4b7729f9a1aac8c6f9f72aa27c9c785ca37fbc618638e470d6a6244542be81
-SIZE (CJK-LyX/patch-platex-1.4.2.diff) = 2294
+MD5 (CJK-LyX/CJK-LyX-qt-1.4.4-1.src.tar.gz) = 5fb02093f9f8c5f77fc124549d8820ae
+SHA256 (CJK-LyX/CJK-LyX-qt-1.4.4-1.src.tar.gz) = c24801f74c24f46c3e45d7e75c1bd3eda934938c2c5455160ddc69898135a3e0
+SIZE (CJK-LyX/CJK-LyX-qt-1.4.4-1.src.tar.gz) = 10702692
+MD5 (CJK-LyX/lyx-platex-1.4.4.tar.gz) = dc4e3f75dddac56a54f7dc52ec03ad69
+SHA256 (CJK-LyX/lyx-platex-1.4.4.tar.gz) = 423bbc0eba0750f96bc4b756cbde37a4c34be8fd5db273643b45835be942595b
+SIZE (CJK-LyX/lyx-platex-1.4.4.tar.gz) = 2604
+MD5 (CJK-LyX/patch-platex-1.4.4.diff) = 18852ce35deda7801d574c7c86f8d363
+SHA256 (CJK-LyX/patch-platex-1.4.4.diff) = 8ba8d7f38add0ff892cfe1b275c36f81928b4a9794336abb6b80a8a19a2f050c
+SIZE (CJK-LyX/patch-platex-1.4.4.diff) = 2316
diff --git a/print/cjk-lyx/files/patch-configure b/print/cjk-lyx/files/patch-configure
new file mode 100644
index 000000000000..4d4f05f0999d
--- /dev/null
+++ b/print/cjk-lyx/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.bak	Tue Feb 27 11:44:16 2007
++++ configure	Tue Feb 27 11:44:16 2007
+@@ -1759,7 +1759,7 @@
+ #define USE_POSIX_PACKAGING 1
+ _ACEOF
+ 
+-	   PACKAGE=lyx${version_suffix}
++	   PACKAGE=cjk-lyx${version_suffix}
+ 	   program_suffix=$version_suffix
+ 	   pkgdatadir='${datadir}/${PACKAGE}'
+ 	   default_prefix=$ac_default_prefix ;;
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index e50de2992ef9..ec12fbb4fa1d 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -1,142 +1,29 @@
-bin/lyx
-bin/lyxclient
-bin/tex2lyx
-share/locale/da/LC_MESSAGES/lyx.mo
-share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/es/LC_MESSAGES/lyx.mo
-share/locale/eu/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/it/LC_MESSAGES/lyx.mo
-share/locale/ja/LC_MESSAGES/lyx.mo
-share/locale/nb/LC_MESSAGES/lyx.mo
-share/locale/nl/LC_MESSAGES/lyx.mo
-share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
-share/locale/nn/LC_MESSAGES/lyx.mo
-share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/ro/LC_MESSAGES/lyx.mo
-share/locale/sk/LC_MESSAGES/lyx.mo
-share/locale/sl/LC_MESSAGES/lyx.mo
-%%PORTDOCS%%%%DATADIR%%/doc/cs_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/Customization.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/da_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_Customization.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_Extended.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_FAQ.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/DocStyle.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/es_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/es_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_Customization.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_Extended.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_FAQ.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/Extended.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/FAQ.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_Customization.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_Extended.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_FAQ.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/he_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/he_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/hu_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/it_Customization.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/it_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/it_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/it_UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%PORTDOCS%%%%DATADIR%%/doc/nl_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/nl_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/nb_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pl_Extended.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ru_FAQ.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pl_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pl_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pt_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pt_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/Reference.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ro_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ru_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ru_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sk_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sk_UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sl_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sl_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sv_Intro.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sv_Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/Tutorial.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/UserGuide.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/escher-lsd.eps
-%%PORTDOCS%%%%DATADIR%%/doc/mobius.eps
-%%PORTDOCS%%%%DATADIR%%/doc/platypus.eps
-%%PORTDOCS%%%%DATADIR%%/doc/TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/cs_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/da_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/de_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/es_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/eu_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/fr_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/he_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/hu_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/it_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/nb_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/nl_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pl_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/pt_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ro_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/ru_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sk_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sl_TOC.lyx
-%%PORTDOCS%%%%DATADIR%%/doc/sv_TOC.lyx
-%%DATADIR%%/lyx2lyx/lyx2lyx
-%%DATADIR%%/lyx2lyx/parser_tools.py
-%%DATADIR%%/lyx2lyx/LyX.py
-%%DATADIR%%/lyx2lyx/lyx_0_12.py
-%%DATADIR%%/lyx2lyx/lyx_1_0_0.py
-%%DATADIR%%/lyx2lyx/lyx_1_0_1.py
-%%DATADIR%%/lyx2lyx/lyx_1_1_4.py
-%%DATADIR%%/lyx2lyx/lyx_1_1_5.py
-%%DATADIR%%/lyx2lyx/lyx_1_1_6.py
-%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
-%%DATADIR%%/lyx2lyx/lyx_1_2.py
-%%DATADIR%%/lyx2lyx/lyx_1_3.py
-%%DATADIR%%/lyx2lyx/lyx_1_4.py
-%%DATADIR%%/lyx2lyx/profiling.py
-%%DATADIR%%/lyx2lyx/parser_tools.pyc
-%%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/lyx_0_12.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
-%%DATADIR%%/lyx2lyx/LyX.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_2.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_3.pyc
-%%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/profiling.pyc
-%%DATADIR%%/lyx2lyx/parser_tools.pyo
-%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
-%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
-%%DATADIR%%/lyx2lyx/profiling.pyo
+bin/%%PKGNAMEPREFIX%%lyx
+bin/%%PKGNAMEPREFIX%%lyxclient
+bin/%%PKGNAMEPREFIX%%tex2lyx
+share/locale/cs/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/da/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/de/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/es/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/eu/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/fi/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/fr/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/gl/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/hu/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/it/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/ja/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/ko/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/nb/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/nl/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/nn/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/pl/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/ro/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/ru/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/sk/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/sl/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+share/locale/tr/LC_MESSAGES/%%PKGNAMEPREFIX%%lyx.mo
+%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
 %%DATADIR%%/bind/cua.bind
 %%DATADIR%%/bind/cyrkeys.bind
@@ -153,8 +40,116 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/bind/sciword.bind
 %%DATADIR%%/bind/sv_menus.bind
 %%DATADIR%%/bind/xemacs.bind
-%%DATADIR%%/bind/aqua.bind
+%%DATADIR%%/chkconfig.ltx
+%%DATADIR%%/clipart/BoxInsetDefault.png
+%%DATADIR%%/clipart/ComentNotaImagen.png
+%%DATADIR%%/clipart/CommentNoteImage.png
+%%DATADIR%%/clipart/CuadroMinipag.png
+%%DATADIR%%/clipart/GreyedOutNoteImage.png
+%%DATADIR%%/clipart/GrisNotaImagen.png
+%%DATADIR%%/clipart/LyXNoteImage.png
+%%DATADIR%%/clipart/NotaLyXImagen.png
+%%DATADIR%%/clipart/endnotes.pdf
+%%DATADIR%%/clipart/etiqueta.png
+%%DATADIR%%/clipart/float.png
+%%DATADIR%%/clipart/flotante.png
+%%DATADIR%%/clipart/footnote.png
+%%DATADIR%%/clipart/label.png
+%%DATADIR%%/clipart/notapie.png
 %%DATADIR%%/clipart/platypus.eps
+%%DATADIR%%/clipart/reference2.png
+%%DATADIR%%/clipart/referencia2.png
+%%DATADIR%%/clipart/with_fntright.pdf
+%%DATADIR%%/clipart/without_fntright.pdf
+%%DATADIR%%/configure.py
+%%DATADIR%%/configure.pyc
+%%DATADIR%%/configure.pyo
+%%DATADIR%%/doc/Customization.lyx
+%%DATADIR%%/doc/DocStyle.lyx
+%%DATADIR%%/doc/EmbeddedObjects.lyx
+%%DATADIR%%/doc/Extended.lyx
+%%DATADIR%%/doc/FAQ.lyx
+%%DATADIR%%/doc/Intro.lyx
+%%DATADIR%%/doc/LaTeXConfig.lyx.in
+%%DATADIR%%/doc/Reference.lyx
+%%DATADIR%%/doc/TOC.lyx
+%%DATADIR%%/doc/Tutorial.lyx
+%%DATADIR%%/doc/UserGuide.lyx
+%%DATADIR%%/doc/cs_TOC.lyx
+%%DATADIR%%/doc/cs_Tutorial.lyx
+%%DATADIR%%/doc/da_Intro.lyx
+%%DATADIR%%/doc/da_TOC.lyx
+%%DATADIR%%/doc/de_Customization.lyx
+%%DATADIR%%/doc/de_Extended.lyx
+%%DATADIR%%/doc/de_FAQ.lyx
+%%DATADIR%%/doc/de_Intro.lyx
+%%DATADIR%%/doc/de_TOC.lyx
+%%DATADIR%%/doc/de_Tutorial.lyx
+%%DATADIR%%/doc/de_UserGuide.lyx
+%%DATADIR%%/doc/es_EmbeddedObjects.lyx
+%%DATADIR%%/doc/es_Intro.lyx
+%%DATADIR%%/doc/es_TOC.lyx
+%%DATADIR%%/doc/es_Tutorial.lyx
+%%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Customization.lyx
+%%DATADIR%%/doc/eu_Extended.lyx
+%%DATADIR%%/doc/eu_FAQ.lyx
+%%DATADIR%%/doc/eu_Intro.lyx
+%%DATADIR%%/doc/eu_TOC.lyx
+%%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
+%%DATADIR%%/doc/fr_Customization.lyx
+%%DATADIR%%/doc/fr_Extended.lyx
+%%DATADIR%%/doc/fr_FAQ.lyx
+%%DATADIR%%/doc/fr_Intro.lyx
+%%DATADIR%%/doc/fr_TOC.lyx
+%%DATADIR%%/doc/fr_Tutorial.lyx
+%%DATADIR%%/doc/fr_UserGuide.lyx
+%%DATADIR%%/doc/gl_Intro.lyx
+%%DATADIR%%/doc/gl_TOC.lyx
+%%DATADIR%%/doc/gl_Tutorial.lyx
+%%DATADIR%%/doc/he_Intro.lyx
+%%DATADIR%%/doc/he_TOC.lyx
+%%DATADIR%%/doc/he_Tutorial.lyx
+%%DATADIR%%/doc/hu_Intro.lyx
+%%DATADIR%%/doc/hu_TOC.lyx
+%%DATADIR%%/doc/hu_Tutorial.lyx
+%%DATADIR%%/doc/it_Customization.lyx
+%%DATADIR%%/doc/it_Intro.lyx
+%%DATADIR%%/doc/it_TOC.lyx
+%%DATADIR%%/doc/it_Tutorial.lyx
+%%DATADIR%%/doc/it_UserGuide.lyx
+%%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
+%%DATADIR%%/doc/nl_Intro.lyx
+%%DATADIR%%/doc/nl_TOC.lyx
+%%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/pl_Extended.lyx
+%%DATADIR%%/doc/pl_Intro.lyx
+%%DATADIR%%/doc/pl_TOC.lyx
+%%DATADIR%%/doc/pl_Tutorial.lyx
+%%DATADIR%%/doc/platypus.eps
+%%DATADIR%%/doc/pt_Intro.lyx
+%%DATADIR%%/doc/pt_TOC.lyx
+%%DATADIR%%/doc/pt_Tutorial.lyx
+%%DATADIR%%/doc/ro_Intro.lyx
+%%DATADIR%%/doc/ro_TOC.lyx
+%%DATADIR%%/doc/ru_FAQ.lyx
+%%DATADIR%%/doc/ru_Intro.lyx
+%%DATADIR%%/doc/ru_TOC.lyx
+%%DATADIR%%/doc/ru_Tutorial.lyx
+%%DATADIR%%/doc/sk_TOC.lyx
+%%DATADIR%%/doc/sk_Tutorial.lyx
+%%DATADIR%%/doc/sk_UserGuide.lyx
+%%DATADIR%%/doc/sl_Intro.lyx
+%%DATADIR%%/doc/sl_TOC.lyx
+%%DATADIR%%/doc/sl_Tutorial.lyx
+%%DATADIR%%/doc/sv_Intro.lyx
+%%DATADIR%%/doc/sv_TOC.lyx
+%%DATADIR%%/doc/sv_Tutorial.lyx
+%%DATADIR%%/encodings
+%%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
 %%DATADIR%%/examples/Minipage.lyx
@@ -163,22 +158,36 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/aas_sample.lyx
 %%DATADIR%%/examples/amsart-test.lyx
 %%DATADIR%%/examples/amsbook-test.lyx
+%%DATADIR%%/examples/beamer-g4-mask.jpg
+%%DATADIR%%/examples/beamer-g4.jpg
+%%DATADIR%%/examples/beamer-icsi-logo.pdf
+%%DATADIR%%/examples/beamer-knight1-mask.png
+%%DATADIR%%/examples/beamer-knight1.png
+%%DATADIR%%/examples/beamer-knight2-mask.png
+%%DATADIR%%/examples/beamer-knight2.png
+%%DATADIR%%/examples/beamer-knight3-mask.png
+%%DATADIR%%/examples/beamer-knight3.png
+%%DATADIR%%/examples/beamer-knight4-mask.png
+%%DATADIR%%/examples/beamer-knight4.png
+%%DATADIR%%/examples/beamerlyxexample1.lyx
 %%DATADIR%%/examples/ca_splash.lyx
 %%DATADIR%%/examples/chess-article.lyx
 %%DATADIR%%/examples/chessgame.lyx
+%%DATADIR%%/examples/cs_splash.lyx
 %%DATADIR%%/examples/currency.lyx
+%%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
 %%DATADIR%%/examples/de_ItemizeBullets.lyx
 %%DATADIR%%/examples/de_Lebenslauf.lyx
 %%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/de_TableExamples.lyx
-%%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_Waehrungen.lyx
+%%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
 %%DATADIR%%/examples/de_decimal.lyx
-%%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/de_mathed.lyx
 %%DATADIR%%/examples/de_multicol.lyx
+%%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
 %%DATADIR%%/examples/es_ejemplo_con_lyx.lyx
@@ -190,8 +199,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/example_lyxified.lyx
 %%DATADIR%%/examples/example_raw.lyx
 %%DATADIR%%/examples/fr_AlignementDecimal.lyx
-%%DATADIR%%/examples/g-brief2.lyx
-%%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/fr_CV.lyx
 %%DATADIR%%/examples/fr_ExemplesTableaux.lyx
 %%DATADIR%%/examples/fr_Foils.lyx
@@ -202,6 +209,10 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
+%%DATADIR%%/examples/gl_exemplo_bruto.lyx
+%%DATADIR%%/examples/gl_exemplo_lyxificado.lyx
+%%DATADIR%%/examples/gl_splash.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -211,7 +222,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/iecc12.fen
 %%DATADIR%%/examples/it_ItemizeBullets.lyx
 %%DATADIR%%/examples/it_splash.lyx
-%%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/landslide.lyx
 %%DATADIR%%/examples/linuxdoc_manpage.lyx
 %%DATADIR%%/examples/listerrors.lyx
@@ -225,13 +235,14 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/noweb2lyx.lyx
 %%DATADIR%%/examples/pl_splash.lyx
 %%DATADIR%%/examples/pt_splash.lyx
+%%DATADIR%%/examples/ro_splash.lyx
 %%DATADIR%%/examples/ru_splash.lyx
 %%DATADIR%%/examples/script_form.lyx
 %%DATADIR%%/examples/sl_primer_lyxan.lyx
 %%DATADIR%%/examples/sl_primer_surov.lyx
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
-%%DATADIR%%/examples/ro_splash.lyx
+%%DATADIR%%/external_templates
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
 %%DATADIR%%/images/bookmark-goto.xpm
@@ -264,8 +275,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/dialog-show_findreplace.xpm
 %%DATADIR%%/images/dialog-show_mathpanel.xpm
 %%DATADIR%%/images/dialog-show_print.xpm
-%%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/dialog-show_spellchecker.xpm
+%%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
 %%DATADIR%%/images/float-insert_figure.xpm
@@ -280,6 +291,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/label-insert.xpm
 %%DATADIR%%/images/layout-document.xpm
 %%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout.xpm
 %%DATADIR%%/images/layout_Description.xpm
 %%DATADIR%%/images/layout_Enumerate.xpm
 %%DATADIR%%/images/layout_Itemize.xpm
@@ -295,41 +307,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math-mode.xpm
 %%DATADIR%%/images/math-subscript.xpm
 %%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/note-insert.xpm
-%%DATADIR%%/images/paste.xpm
-%%DATADIR%%/images/psnfss1.xpm
-%%DATADIR%%/images/psnfss2.xpm
-%%DATADIR%%/images/psnfss3.xpm
-%%DATADIR%%/images/psnfss4.xpm
-%%DATADIR%%/images/redo.xpm
-%%DATADIR%%/images/standard.xpm
-%%DATADIR%%/images/tabular-insert.xpm
-%%DATADIR%%/images/tabular-feature_align-center.xpm
-%%DATADIR%%/images/tabular-feature_align-left.xpm
-%%DATADIR%%/images/tabular-feature_align-right.xpm
-%%DATADIR%%/images/tabular-feature_append-column.xpm
-%%DATADIR%%/images/tabular-feature_append-row.xpm
-%%DATADIR%%/images/tabular-feature_delete-column.xpm
-%%DATADIR%%/images/tabular-feature_delete-row.xpm
-%%DATADIR%%/images/tabular-feature_multicolumn.xpm
-%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
-%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
-%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
-%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
-%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
-%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
-%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
-%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
-%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
-%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
-%%DATADIR%%/images/tabular-feature_valign-middle.xpm
-%%DATADIR%%/images/tabular-feature_valign-top.xpm
-%%DATADIR%%/images/thesaurus-entry.xpm
-%%DATADIR%%/images/toc-view.xpm
-%%DATADIR%%/images/undo.xpm
-%%DATADIR%%/images/unknown.xpm
-%%DATADIR%%/images/up.xpm
-%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -399,7 +376,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/chi.xpm
 %%DATADIR%%/images/math/circ.xpm
 %%DATADIR%%/images/math/circeq.xpm
-%%DATADIR%%/images/math/cup.xpm
 %%DATADIR%%/images/math/circlearrowleft.xpm
 %%DATADIR%%/images/math/circlearrowright.xpm
 %%DATADIR%%/images/math/circledS.xpm
@@ -410,6 +386,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/complement.xpm
 %%DATADIR%%/images/math/cong.xpm
 %%DATADIR%%/images/math/coprod.xpm
+%%DATADIR%%/images/math/cup.xpm
 %%DATADIR%%/images/math/cup2.xpm
 %%DATADIR%%/images/math/curlyeqprec.xpm
 %%DATADIR%%/images/math/curlyeqsucc.xpm
@@ -425,6 +402,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/ddagger.xpm
 %%DATADIR%%/images/math/ddot.xpm
 %%DATADIR%%/images/math/ddots.xpm
+%%DATADIR%%/images/math/delim.xpm
 %%DATADIR%%/images/math/delta.xpm
 %%DATADIR%%/images/math/delta2.xpm
 %%DATADIR%%/images/math/diagdown.xpm
@@ -443,20 +421,22 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/downarrow2.xpm
 %%DATADIR%%/images/math/downdownarrows.xpm
 %%DATADIR%%/images/math/downharpoonleft.xpm
-%%DATADIR%%/images/math/ell.xpm
 %%DATADIR%%/images/math/downharpoonright.xpm
+%%DATADIR%%/images/math/ell.xpm
 %%DATADIR%%/images/math/empty.xpm
 %%DATADIR%%/images/math/emptyset.xpm
 %%DATADIR%%/images/math/epsilon.xpm
 %%DATADIR%%/images/math/eqcirc.xpm
 %%DATADIR%%/images/math/eqslantgtr.xpm
 %%DATADIR%%/images/math/eqslantless.xpm
+%%DATADIR%%/images/math/equation.xpm
 %%DATADIR%%/images/math/equiv.xpm
 %%DATADIR%%/images/math/eta.xpm
 %%DATADIR%%/images/math/eth.xpm
 %%DATADIR%%/images/math/exists.xpm
 %%DATADIR%%/images/math/fallingdotseq.xpm
 %%DATADIR%%/images/math/flat.xpm
+%%DATADIR%%/images/math/font.xpm
 %%DATADIR%%/images/math/forall.xpm
 %%DATADIR%%/images/math/frac.xpm
 %%DATADIR%%/images/math/frown.xpm
@@ -468,7 +448,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/gg.xpm
 %%DATADIR%%/images/math/ggg.xpm
 %%DATADIR%%/images/math/gimel.xpm
-%%DATADIR%%/images/math/hat.xpm
 %%DATADIR%%/images/math/gnapprox.xpm
 %%DATADIR%%/images/math/gneq.xpm
 %%DATADIR%%/images/math/gneqq.xpm
@@ -481,18 +460,20 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/gtrless.xpm
 %%DATADIR%%/images/math/gtrsim.xpm
 %%DATADIR%%/images/math/gvertneqq.xpm
+%%DATADIR%%/images/math/hat.xpm
 %%DATADIR%%/images/math/hbar.xpm
 %%DATADIR%%/images/math/heartsuit.xpm
 %%DATADIR%%/images/math/hookleftarrow.xpm
 %%DATADIR%%/images/math/hookrightarrow.xpm
+%%DATADIR%%/images/math/hphantom.xpm
 %%DATADIR%%/images/math/hslash.xpm
 %%DATADIR%%/images/math/imath.xpm
 %%DATADIR%%/images/math/in.xpm
 %%DATADIR%%/images/math/infty.xpm
 %%DATADIR%%/images/math/int.xpm
 %%DATADIR%%/images/math/intercal.xpm
+%%DATADIR%%/images/math/intop.xpm
 %%DATADIR%%/images/math/iota.xpm
-%%DATADIR%%/images/math/leq.xpm
 %%DATADIR%%/images/math/jmath.xpm
 %%DATADIR%%/images/math/kappa.xpm
 %%DATADIR%%/images/math/lambda.xpm
@@ -517,6 +498,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/leftrightharpoons.xpm
 %%DATADIR%%/images/math/leftrightsquigarrow.xpm
 %%DATADIR%%/images/math/leftthreetimes.xpm
+%%DATADIR%%/images/math/leq.xpm
 %%DATADIR%%/images/math/leqq.xpm
 %%DATADIR%%/images/math/leqslant.xpm
 %%DATADIR%%/images/math/lessapprox.xpm
@@ -562,6 +544,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/mathcal_O.xpm
 %%DATADIR%%/images/math/mathcircumflex.xpm
 %%DATADIR%%/images/math/mathrm_T.xpm
+%%DATADIR%%/images/math/matrix.xpm
 %%DATADIR%%/images/math/measuredangle.xpm
 %%DATADIR%%/images/math/mho.xpm
 %%DATADIR%%/images/math/mid.xpm
@@ -615,6 +598,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/nwarrow.xpm
 %%DATADIR%%/images/math/odot.xpm
 %%DATADIR%%/images/math/oint.xpm
+%%DATADIR%%/images/math/ointop.xpm
 %%DATADIR%%/images/math/omega.xpm
 %%DATADIR%%/images/math/omega2.xpm
 %%DATADIR%%/images/math/ominus.xpm
@@ -626,9 +610,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/overleftrightarrow.xpm
 %%DATADIR%%/images/math/overline.xpm
 %%DATADIR%%/images/math/overrightarrow.xpm
+%%DATADIR%%/images/math/overset.xpm
 %%DATADIR%%/images/math/parallel.xpm
 %%DATADIR%%/images/math/partial.xpm
 %%DATADIR%%/images/math/perp.xpm
+%%DATADIR%%/images/math/phantom.xpm
 %%DATADIR%%/images/math/phi.xpm
 %%DATADIR%%/images/math/phi2.xpm
 %%DATADIR%%/images/math/pi.xpm
@@ -648,11 +634,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/psi.xpm
 %%DATADIR%%/images/math/psi2.xpm
 %%DATADIR%%/images/math/rangle.xpm
-%%DATADIR%%/images/math/rho.xpm
 %%DATADIR%%/images/math/rbrace.xpm
 %%DATADIR%%/images/math/rbracket.xpm
 %%DATADIR%%/images/math/rceil.xpm
 %%DATADIR%%/images/math/rfloor.xpm
+%%DATADIR%%/images/math/rho.xpm
 %%DATADIR%%/images/math/rightarrow.xpm
 %%DATADIR%%/images/math/rightarrow2.xpm
 %%DATADIR%%/images/math/rightarrowtail.xpm
@@ -681,10 +667,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/smallsetminus.xpm
 %%DATADIR%%/images/math/smallsmile.xpm
 %%DATADIR%%/images/math/smile.xpm
+%%DATADIR%%/images/math/space.xpm
 %%DATADIR%%/images/math/spadesuit.xpm
 %%DATADIR%%/images/math/sphericalangle.xpm
 %%DATADIR%%/images/math/sqcap.xpm
 %%DATADIR%%/images/math/sqcup.xpm
+%%DATADIR%%/images/math/sqrt-square.xpm
 %%DATADIR%%/images/math/sqrt.xpm
 %%DATADIR%%/images/math/sqsubset.xpm
 %%DATADIR%%/images/math/sqsubseteq.xpm
@@ -692,6 +680,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/sqsupseteq.xpm
 %%DATADIR%%/images/math/square.xpm
 %%DATADIR%%/images/math/star.xpm
+%%DATADIR%%/images/math/style.xbm
+%%DATADIR%%/images/math/style.xpm
+%%DATADIR%%/images/math/sub.xpm
 %%DATADIR%%/images/math/subset.xpm
 %%DATADIR%%/images/math/subset2.xpm
 %%DATADIR%%/images/math/subseteq.xpm
@@ -706,6 +697,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/succnsim.xpm
 %%DATADIR%%/images/math/succsim.xpm
 %%DATADIR%%/images/math/sum.xpm
+%%DATADIR%%/images/math/super.xpm
 %%DATADIR%%/images/math/supset.xpm
 %%DATADIR%%/images/math/supset2.xpm
 %%DATADIR%%/images/math/supseteq.xpm
@@ -715,8 +707,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -735,13 +727,14 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/twoheadleftarrow.xpm
 %%DATADIR%%/images/math/twoheadrightarrow.xpm
 %%DATADIR%%/images/math/ulcorner.xpm
-%%DATADIR%%/images/math/uparrow.xpm
 %%DATADIR%%/images/math/underbrace.xpm
 %%DATADIR%%/images/math/underleftarrow.xpm
 %%DATADIR%%/images/math/underleftrightarrow.xpm
 %%DATADIR%%/images/math/underline.xpm
 %%DATADIR%%/images/math/underrightarrow.xpm
 %%DATADIR%%/images/math/underscore.xpm
+%%DATADIR%%/images/math/underset.xpm
+%%DATADIR%%/images/math/uparrow.xpm
 %%DATADIR%%/images/math/uparrow2.xpm
 %%DATADIR%%/images/math/updownarrow.xpm
 %%DATADIR%%/images/math/updownarrow2.xpm
@@ -756,7 +749,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/varkappa.xpm
 %%DATADIR%%/images/math/varnothing.xpm
 %%DATADIR%%/images/math/varphi.xpm
-%%DATADIR%%/images/math/vec.xpm
 %%DATADIR%%/images/math/varpi.xpm
 %%DATADIR%%/images/math/varpropto.xpm
 %%DATADIR%%/images/math/varsigma.xpm
@@ -772,8 +764,10 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/vdash2.xpm
 %%DATADIR%%/images/math/vdash3.xpm
 %%DATADIR%%/images/math/vdots.xpm
+%%DATADIR%%/images/math/vec.xpm
 %%DATADIR%%/images/math/vee.xpm
 %%DATADIR%%/images/math/veebar.xpm
+%%DATADIR%%/images/math/vphantom.xpm
 %%DATADIR%%/images/math/wedge.xpm
 %%DATADIR%%/images/math/widehat.xpm
 %%DATADIR%%/images/math/widetilde.xpm
@@ -782,8 +776,41 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math/overset.xpm
-%%DATADIR%%/images/math/underset.xpm
+%%DATADIR%%/images/note-insert.xpm
+%%DATADIR%%/images/paste.xpm
+%%DATADIR%%/images/psnfss1.xpm
+%%DATADIR%%/images/psnfss2.xpm
+%%DATADIR%%/images/psnfss3.xpm
+%%DATADIR%%/images/psnfss4.xpm
+%%DATADIR%%/images/redo.xpm
+%%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
+%%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
+%%DATADIR%%/images/undo.xpm
+%%DATADIR%%/images/unknown.xpm
+%%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -793,6 +820,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -805,7 +833,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/iso8859-1.cdef
 %%DATADIR%%/kbd/iso8859-15.cdef
 %%DATADIR%%/kbd/iso8859-2.cdef
-%%DATADIR%%/kbd/sf.kmap
 %%DATADIR%%/kbd/iso8859-3.cdef
 %%DATADIR%%/kbd/iso8859-4.cdef
 %%DATADIR%%/kbd/iso8859-7.cdef
@@ -827,6 +854,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/romanian.kmap
 %%DATADIR%%/kbd/serbian.kmap
 %%DATADIR%%/kbd/serbocroatian.kmap
+%%DATADIR%%/kbd/sf.kmap
 %%DATADIR%%/kbd/sg.kmap
 %%DATADIR%%/kbd/slovak.kmap
 %%DATADIR%%/kbd/slovene.kmap
@@ -835,12 +863,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/transilvanian.kmap
 %%DATADIR%%/kbd/turkish-f.kmap
 %%DATADIR%%/kbd/turkish.kmap
-%%DATADIR%%/kbd/espanol.kmap
+%%DATADIR%%/languages
 %%DATADIR%%/layouts/IEEEtran.layout
 %%DATADIR%%/layouts/aa.layout
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -851,15 +886,17 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/amsmaths-seq.inc
 %%DATADIR%%/layouts/amsmaths.inc
 %%DATADIR%%/layouts/apa.layout
+%%DATADIR%%/layouts/arab-article.layout
 %%DATADIR%%/layouts/article.layout
+%%DATADIR%%/layouts/beamer.layout
 %%DATADIR%%/layouts/book.layout
 %%DATADIR%%/layouts/broadway.layout
 %%DATADIR%%/layouts/chess.layout
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
-%%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcharstyles.inc
+%%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
@@ -883,9 +920,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
+%%DATADIR%%/layouts/ijmpc.layout
 %%DATADIR%%/layouts/ijmpd.layout
 %%DATADIR%%/layouts/jarticle.layout
 %%DATADIR%%/layouts/jbook.layout
@@ -905,9 +944,13 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/ltugboat.layout
 %%DATADIR%%/layouts/lyxmacros.inc
 %%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/prosper.layout
 %%DATADIR%%/layouts/report.layout
@@ -933,54 +976,109 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/stdstarsections.inc
 %%DATADIR%%/layouts/stdstruct.inc
 %%DATADIR%%/layouts/stdtitle.inc
+%%DATADIR%%/layouts/svglobal.layout
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/layouts/agums.layout
-%%DATADIR%%/layouts/memoir.layout
-%%DATADIR%%/layouts/numarticle.inc
-%%DATADIR%%/layouts/numreport.inc
-%%DATADIR%%/layouts/numrevtex.inc
-%%DATADIR%%/layouts/agu-dtd.layout
-%%DATADIR%%/layouts/agu_stdclass.inc
-%%DATADIR%%/layouts/agu_stdcounters.inc
-%%DATADIR%%/layouts/agu_stdlists.inc
-%%DATADIR%%/layouts/agu_stdsections.inc
-%%DATADIR%%/layouts/agu_stdtitle.inc
-%%DATADIR%%/layouts/g-brief2.layout
-%%DATADIR%%/layouts/svglobal.layout
-%%DATADIR%%/layouts/ijmpc.layout
+%%DATADIR%%/lyx2lyx/LyX.py
+%%DATADIR%%/lyx2lyx/LyX.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyx_0_12.py
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.py
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.py
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.py
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.py
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.py
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_2.py
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_3.py
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
+%%DATADIR%%/lyx2lyx/lyx_1_4.py
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
+%%DATADIR%%/lyx2lyx/parser_tools.py
+%%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
+%%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.example
-%%DATADIR%%/CREDITS
-%%DATADIR%%/chkconfig.ltx
-%%DATADIR%%/external_templates
-%%DATADIR%%/encodings
-%%DATADIR%%/languages
-%%DATADIR%%/symbols
-%%DATADIR%%/syntax.default
-%%DATADIR%%/scripts/convertDefault.sh
+%%DATADIR%%/scripts/TeXFiles.py
+%%DATADIR%%/scripts/TeXFiles.pyc
+%%DATADIR%%/scripts/TeXFiles.pyo
+%%DATADIR%%/scripts/clean_dvi.py
+%%DATADIR%%/scripts/clean_dvi.pyc
+%%DATADIR%%/scripts/clean_dvi.pyo
+%%DATADIR%%/scripts/convertDefault.py
+%%DATADIR%%/scripts/convertDefault.pyc
+%%DATADIR%%/scripts/convertDefault.pyo
+%%DATADIR%%/scripts/date.py
+%%DATADIR%%/scripts/date.pyc
+%%DATADIR%%/scripts/date.pyo
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pdftex.sh
-%%DATADIR%%/scripts/fig2pstex.sh
-%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/fen2ascii.pyc
+%%DATADIR%%/scripts/fen2ascii.pyo
+%%DATADIR%%/scripts/fig2pdftex.py
+%%DATADIR%%/scripts/fig2pdftex.pyc
+%%DATADIR%%/scripts/fig2pdftex.pyo
+%%DATADIR%%/scripts/fig2pstex.py
+%%DATADIR%%/scripts/fig2pstex.pyc
+%%DATADIR%%/scripts/fig2pstex.pyo
+%%DATADIR%%/scripts/fig_copy.py
+%%DATADIR%%/scripts/fig_copy.pyc
+%%DATADIR%%/scripts/fig_copy.pyo
 %%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/layout2layout.pyc
+%%DATADIR%%/scripts/layout2layout.pyo
 %%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.pyc
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.pyo
 %%DATADIR%%/scripts/listerrors
 %%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview2bitmap.pyc
+%%DATADIR%%/scripts/lyxpreview2bitmap.pyo
 %%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/lyxpreview_tools.pyc
+%%DATADIR%%/scripts/lyxpreview_tools.pyo
 %%DATADIR%%/scripts/tex_copy.py
-%%DATADIR%%/scripts/TeXFiles.py
-%%DATADIR%%/scripts/clean_dvi.py
+%%DATADIR%%/scripts/tex_copy.pyc
+%%DATADIR%%/scripts/tex_copy.pyo
+%%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
 %%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
+%%DATADIR%%/templates/beamer-conference-ornate-20min.lyx
+%%DATADIR%%/templates/de_beamer-conference-ornate-20min.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
+%%DATADIR%%/templates/fr_beamer-conference-ornate-20min.lyx
 %%DATADIR%%/templates/g-brief-de.lyx
 %%DATADIR%%/templates/g-brief-en.lyx
 %%DATADIR%%/templates/hollywood.lyx
+%%DATADIR%%/templates/ijmpc.lyx
+%%DATADIR%%/templates/ijmpd.lyx
 %%DATADIR%%/templates/kluwer.lyx
 %%DATADIR%%/templates/koma-letter2.lyx
 %%DATADIR%%/templates/latex8.lyx
@@ -989,9 +1087,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/templates/revtex.lyx
 %%DATADIR%%/templates/revtex4.lyx
 %%DATADIR%%/templates/slides.lyx
-%%DATADIR%%/templates/ijmpd.lyx
-%%DATADIR%%/templates/agu_article.lyx
-%%DATADIR%%/templates/ijmpc.lyx
 %%DATADIR%%/tex/broadway.cls
 %%DATADIR%%/tex/cv.cls
 %%DATADIR%%/tex/hollywood.cls
@@ -999,10 +1094,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/ui/classic.ui
+%%DATADIR%%/ui/default-alltoolbars.ui
+%%DATADIR%%/ui/default-autotoolbars.ui
 %%DATADIR%%/ui/default.ui
-%%DATADIR%%/ui/stdmenus.ui
-%%DATADIR%%/ui/stdtoolbars.ui
-%%DATADIR%%/configure.py
+%%DATADIR%%/ui/stdmenus.inc
+%%DATADIR%%/ui/stdtoolbars.inc
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates