update to lyx 1.3.4

from new maintainer Zvezdan Petkovic <zvezdan at cs.wm.edu>
no feedback from old maintainer margarida@

print/lyx/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.31 2003/01/21 01:43:46 margarida Exp $
+# $OpenBSD: Makefile,v 1.32 2004/04/25 15:34:08 sturm Exp $
 
 COMMENT=	"graphical frontend for LaTeX (nearly WYSIWYG)"
 
-DISTNAME=	lyx-1.2.3
+DISTNAME=	lyx-1.3.4
 CATEGORIES=	print
 
 HOMEPAGE=	http://www.lyx.org/
@@ -12,10 +12,10 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.lip6.fr/pub/lyx/stable/ \
 		ftp://ftp.chg.ru/pub/TeX/lyx/stable/
 
-MAINTAINER=	Margarida Sequeira <margarida@openbsd.org>
+MAINTAINER=	Zvezdan Petkovic <zvezdan@cs.wm.edu>
 
-# quasi-GPL (linked to closed source library)
+# In XForms flavor: quasi-GPL (linked to closed source library)
-# no limitation of license; considered GPL
+# In Qt flavor: GPL (this should be preferred for CD distribution)
 # see http://www.lyx.org/about/license.php3 for additional info
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -27,16 +27,38 @@ MODULES=		gettext
 BUILD_DEPENDS+=	:teTeX_base-*:print/teTeX/base
 RUN_DEPENDS+=	:teTeX_base-*:print/teTeX/base \
 		:ispell-*:textproc/ispell
+USE_GMAKE=	Yes
+
+FLAVORS=	qt xforms
+FLAVOR?=	qt
+
+.if ${FLAVOR:L} == "qt"
+MODULES+=	qt3
+MODQT_MT=	Yes
+CONFIGURE_ARGS=	--with-frontend=qt ${MODQT_CONFIGURE_ARGS}
+CONFIGURE_ENV=	LIBS=-pthread
+# A hack until LyX developers apply the patch to qt.m4 to respect $MOC and $UIC
+CONFIGURE_ENV+=	ac_moc1=${MODQT_MOC} ac_uic=${MODQT_UIC}
+.elif ${FLAVOR:L} == "xforms"
 LIB_DEPENDS+=	forms.1::x11/xforms
+.else
+ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
+.endif
 
 CONFIGURE_STYLE=		gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/config
 
-CONFIGURE_ARGS=		--with-extra-lib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=--with-extra-lib=${LOCALBASE}/lib \
-CONFIGURE_ARGS+=	--with-extra-inc="${LOCALBASE}/include \
+		--with-extra-inc="${LOCALBASE}/include \
-			${LOCALBASE}/include/X11"
+		${LOCALBASE}/include/X11" \
+		--without-latex-config
 
-post-install:
+# Necessary because of compilation error.  See:
-	@strip ${PREFIX}/bin/lyx
+# http://www.boost.org/libs/graph/doc/trouble_shooting.html
+CXXFLAGS+=	-ftemplate-depth-30
+
+NO_REGRESS=	Yes
+
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

print/lyx/distinfo

@@ -1,3 +1,3 @@
-MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
+MD5 (lyx-1.3.4.tar.gz) = 49819dcdd8b1a8e311f125ed65899528
-RMD160 (lyx-1.2.3.tar.gz) = 3ca219692e22894fc91a22de6c53e570417a35d0
+RMD160 (lyx-1.3.4.tar.gz) = 67f0e1d3ff38d43a142df11587be393c64d324ea
-SHA1 (lyx-1.2.3.tar.gz) = 2accb806e97390e2715402e49f6277b2f75e8ee1
+SHA1 (lyx-1.3.4.tar.gz) = d44561a3f449ca2008282823ad18a79e2a815ac3

print/lyx/patches/patch-boost_boost_config_platform_bsd_hpp

@@ -0,0 +1,14 @@
+$OpenBSD: patch-boost_boost_config_platform_bsd_hpp,v 1.1 2004/04/25 15:34:08 sturm Exp $
+--- boost/boost/config/platform/bsd.hpp.orig	2002-05-21 19:39:55.000000000 -0400
++++ boost/boost/config/platform/bsd.hpp	2004-02-22 02:24:05.000000000 -0500
+@@ -44,7 +44,9 @@
+ //
+ // The BSD <ctype.h> has macros only, no functions:
+ //
+-#define BOOST_NO_CTYPE_FUNCTIONS
++#if !defined(__OpenBSD__)
++#  define BOOST_NO_CTYPE_FUNCTIONS
++#endif
+ 
+ //
+ // thread API's not auto detected:

print/lyx/patches/patch-config_qt_m4

@@ -0,0 +1,23 @@
+$OpenBSD: patch-config_qt_m4,v 1.1 2004/04/25 15:34:08 sturm Exp $
+--- config/qt.m4.orig	2002-12-19 18:41:18.000000000 -0500
++++ config/qt.m4	2004-02-22 16:29:24.000000000 -0500
+@@ -199,11 +199,15 @@ AC_DEFUN(QT_DO_IT_ALL,
+ 	AC_SUBST(QT_INCLUDES)
+ 	AC_SUBST(QT_LDFLAGS)
+  
+-	QT_FIND_MOC
+-	MOC=$ac_moc
++ 	if test -z "$MOC"; then
++		QT_FIND_MOC
++		MOC=$ac_moc
++	fi
+ 	AC_SUBST(MOC)
+-	QT_FIND_UIC
+-	UIC=$ac_uic
++ 	if test -z "$UIC"; then
++		QT_FIND_UIC
++		UIC=$ac_uic
++	fi
+ 	AC_SUBST(UIC)
+ 
+ 	QT_CHECK_COMPILE

print/lyx/patches/patch-configure

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.3 2004/04/25 15:34:08 sturm Exp $
+--- configure.orig	2004-04-24 18:16:13.000000000 +0200
++++ configure	2004-04-24 18:16:41.000000000 +0200
+@@ -11721,7 +11721,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_forms_fl_initialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_forms_fl_initialize" >&6
+ if test $ac_cv_lib_forms_fl_initialize = yes; then
+-  XFORMS_LIB="-lforms"
++  XFORMS_LIB="-lforms -lflimage -lz"
+ else
+   echo "$as_me:$LINENO: checking for fl_initialize in -lxforms" >&5
+ echo $ECHO_N "checking for fl_initialize in -lxforms... $ECHO_C" >&6

print/lyx/patches/patch-po_Makefile_in_in

@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Dec 23 05:11:10 2002
-+++ po/Makefile.in.in	Mon Dec 23 05:09:18 2002
-@@ -23,7 +23,7 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@

print/lyx/pkg/DESCR

@@ -7,9 +7,12 @@ industrial strength typesetting engine, in the background; LyX is
 far more than a front-end to LaTeX, however. No knowledge of LaTeX
 is necessary to use LyX, although it will give a user more power.
 
-
 LyX is stable and fully featured. It has been used for documents 
 as large as a thesis, or as small as a business letter. 
 Despite its simple GUI interface (available in many languages), 
 it suports tables, figures, and hyperlinked cross-references, and
 best-of-breed math editor.
+
+Flavors:
+	qt 	- build with a Qt GUI (open-source GPL library)
+	xforms 	- build with an XForms GUI (closed-source library)

print/lyx/pkg/PLIST

@@ -1,33 +1,26 @@
-@comment $OpenBSD: PLIST,v 1.9 2003/12/16 19:36:39 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.10 2004/04/25 15:34:08 sturm Exp $
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
 man/man1/lyx.1
 man/man1/reLyX.1
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-share/locale/cs/LC_MESSAGES/lyx.mo
 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/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/he/LC_MESSAGES/lyx.mo
-share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
+share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
+share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
 share/lyx/bind/cua.bind
 share/lyx/bind/cyrkeys.bind
@@ -74,9 +67,11 @@ share/lyx/doc/es_Intro.lyx
 share/lyx/doc/es_TOC.lyx
 share/lyx/doc/es_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
+share/lyx/doc/eu_Extended.lyx
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
+share/lyx/doc/eu_UserGuide.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
 share/lyx/doc/fr_FAQ.lyx
@@ -98,6 +93,9 @@ share/lyx/doc/mobius.eps
 share/lyx/doc/nl_Intro.lyx
 share/lyx/doc/nl_TOC.lyx
 share/lyx/doc/nl_Tutorial.lyx
+share/lyx/doc/no_Intro.lyx
+share/lyx/doc/no_TOC.lyx
+share/lyx/doc/pl_Extended.lyx
 share/lyx/doc/pl_Intro.lyx
 share/lyx/doc/pl_TOC.lyx
 share/lyx/doc/pl_Tutorial.lyx
@@ -153,13 +151,15 @@ share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
 share/lyx/examples/fr_CV.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
+share/lyx/examples/fr_Foils.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
-share/lyx/examples/fr_MultiColonnes.lyx
 share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
+share/lyx/examples/fr_multicol.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/g-brief2.lyx
 share/lyx/examples/he_example_raw.lyx
 share/lyx/examples/he_he_example_lyxified.lyx
 share/lyx/examples/he_he_example_raw.lyx
@@ -192,7 +192,7 @@ share/lyx/external_templates
 share/lyx/help/Bibtex.hlp
 share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
-share/lyx/images/banner.xpm
+share/lyx/images/banner.ppm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
@@ -209,9 +209,10 @@ share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
 share/lyx/images/depth-decrement.xpm
 share/lyx/images/depth-increment.xpm
-share/lyx/images/dialog-tabular-insert.xpm
+share/lyx/images/down.xpm
 share/lyx/images/ert-insert.xpm
 share/lyx/images/file-open.xpm
+share/lyx/images/find-replace.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
@@ -222,7 +223,6 @@ share/lyx/images/graphics-insert.xpm
 share/lyx/images/index-insert.xpm
 share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
-share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
 share/lyx/images/layout_Scrap.xpm
 share/lyx/images/layout_Section.xpm
@@ -231,6 +231,453 @@ share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
 share/lyx/images/math-mode.xpm
 share/lyx/images/math-panel.xpm
+share/lyx/images/math-subscript.xpm
+share/lyx/images/math-superscript.xpm
+share/lyx/images/math/Bbbk.xpm
+share/lyx/images/math/Finv.xpm
+share/lyx/images/math/Game.xpm
+share/lyx/images/math/Im.xpm
+share/lyx/images/math/Lleftarrow.xpm
+share/lyx/images/math/Lsh.xpm
+share/lyx/images/math/Re.xpm
+share/lyx/images/math/Rsh.xpm
+share/lyx/images/math/Vert.xpm
+share/lyx/images/math/Vvdash.xpm
+share/lyx/images/math/acute.xpm
+share/lyx/images/math/aleph.xpm
+share/lyx/images/math/alpha.xpm
+share/lyx/images/math/amalg.xpm
+share/lyx/images/math/angle.xpm
+share/lyx/images/math/approx.xpm
+share/lyx/images/math/approxeq.xpm
+share/lyx/images/math/asymp.xpm
+share/lyx/images/math/backepsilon.xpm
+share/lyx/images/math/backprime.xpm
+share/lyx/images/math/backsim.xpm
+share/lyx/images/math/backsimeq.xpm
+share/lyx/images/math/backslash.xpm
+share/lyx/images/math/bar.xpm
+share/lyx/images/math/bars.xpm
+share/lyx/images/math/barwedge.xpm
+share/lyx/images/math/because.xpm
+share/lyx/images/math/beta.xpm
+share/lyx/images/math/beth.xpm
+share/lyx/images/math/between.xpm
+share/lyx/images/math/bigcap.xpm
+share/lyx/images/math/bigcirc.xpm
+share/lyx/images/math/bigcup.xpm
+share/lyx/images/math/bigodot.xpm
+share/lyx/images/math/bigoplus.xpm
+share/lyx/images/math/bigotimes.xpm
+share/lyx/images/math/bigsqcup.xpm
+share/lyx/images/math/bigstar.xpm
+share/lyx/images/math/bigtriangledown.xpm
+share/lyx/images/math/bigtriangleup.xpm
+share/lyx/images/math/biguplus.xpm
+share/lyx/images/math/bigvee.xpm
+share/lyx/images/math/bigwedge.xpm
+share/lyx/images/math/blacklozenge.xpm
+share/lyx/images/math/blacksquare.xpm
+share/lyx/images/math/blacktriangle.xpm
+share/lyx/images/math/blacktriangledown.xpm
+share/lyx/images/math/blacktriangleleft.xpm
+share/lyx/images/math/blacktriangleright.xpm
+share/lyx/images/math/bot.xpm
+share/lyx/images/math/bowtie.xpm
+share/lyx/images/math/boxdot.xpm
+share/lyx/images/math/boxminus.xpm
+share/lyx/images/math/boxplus.xpm
+share/lyx/images/math/boxtimes.xpm
+share/lyx/images/math/breve.xpm
+share/lyx/images/math/bullet.xpm
+share/lyx/images/math/bumpeq.xpm
+share/lyx/images/math/bumpeq2.xpm
+share/lyx/images/math/cap.xpm
+share/lyx/images/math/cap2.xpm
+share/lyx/images/math/cdot.xpm
+share/lyx/images/math/cdots.xpm
+share/lyx/images/math/centerdot.xpm
+share/lyx/images/math/check.xpm
+share/lyx/images/math/chi.xpm
+share/lyx/images/math/circ.xpm
+share/lyx/images/math/circeq.xpm
+share/lyx/images/math/circlearrowleft.xpm
+share/lyx/images/math/circlearrowright.xpm
+share/lyx/images/math/circledS.xpm
+share/lyx/images/math/circledast.xpm
+share/lyx/images/math/circledcirc.xpm
+share/lyx/images/math/circleddash.xpm
+share/lyx/images/math/clubsuit.xpm
+share/lyx/images/math/complement.xpm
+share/lyx/images/math/cong.xpm
+share/lyx/images/math/coprod.xpm
+share/lyx/images/math/cup.xpm
+share/lyx/images/math/cup2.xpm
+share/lyx/images/math/curlyeqprec.xpm
+share/lyx/images/math/curlyeqsucc.xpm
+share/lyx/images/math/curlyvee.xpm
+share/lyx/images/math/curlywedge.xpm
+share/lyx/images/math/curvearrowleft.xpm
+share/lyx/images/math/curvearrowright.xpm
+share/lyx/images/math/dagger.xpm
+share/lyx/images/math/daleth.xpm
+share/lyx/images/math/dashleftarrow.xpm
+share/lyx/images/math/dashrightarrow.xpm
+share/lyx/images/math/dashv.xpm
+share/lyx/images/math/ddagger.xpm
+share/lyx/images/math/ddot.xpm
+share/lyx/images/math/ddots.xpm
+share/lyx/images/math/delta.xpm
+share/lyx/images/math/delta2.xpm
+share/lyx/images/math/diagdown.xpm
+share/lyx/images/math/diagup.xpm
+share/lyx/images/math/diamond.xpm
+share/lyx/images/math/diamondsuit.xpm
+share/lyx/images/math/digamma.xpm
+share/lyx/images/math/div.xpm
+share/lyx/images/math/divideontimes.xpm
+share/lyx/images/math/dot.xpm
+share/lyx/images/math/doteq.xpm
+share/lyx/images/math/doteqdot.xpm
+share/lyx/images/math/dotplus.xpm
+share/lyx/images/math/doublebarwedge.xpm
+share/lyx/images/math/downarrow.xpm
+share/lyx/images/math/downarrow2.xpm
+share/lyx/images/math/downdownarrows.xpm
+share/lyx/images/math/downharpoonleft.xpm
+share/lyx/images/math/downharpoonright.xpm
+share/lyx/images/math/ell.xpm
+share/lyx/images/math/empty.xpm
+share/lyx/images/math/emptyset.xpm
+share/lyx/images/math/epsilon.xpm
+share/lyx/images/math/eqcirc.xpm
+share/lyx/images/math/eqslantgtr.xpm
+share/lyx/images/math/eqslantless.xpm
+share/lyx/images/math/equiv.xpm
+share/lyx/images/math/eta.xpm
+share/lyx/images/math/eth.xpm
+share/lyx/images/math/exists.xpm
+share/lyx/images/math/fallingdotseq.xpm
+share/lyx/images/math/flat.xpm
+share/lyx/images/math/forall.xpm
+share/lyx/images/math/frac.xpm
+share/lyx/images/math/frown.xpm
+share/lyx/images/math/gamma.xpm
+share/lyx/images/math/gamma2.xpm
+share/lyx/images/math/geq.xpm
+share/lyx/images/math/geqq.xpm
+share/lyx/images/math/geqslant.xpm
+share/lyx/images/math/gg.xpm
+share/lyx/images/math/ggg.xpm
+share/lyx/images/math/gimel.xpm
+share/lyx/images/math/gnapprox.xpm
+share/lyx/images/math/gneq.xpm
+share/lyx/images/math/gneqq.xpm
+share/lyx/images/math/gnsim.xpm
+share/lyx/images/math/grave.xpm
+share/lyx/images/math/gtrapprox.xpm
+share/lyx/images/math/gtrdot.xpm
+share/lyx/images/math/gtreqless.xpm
+share/lyx/images/math/gtreqqless.xpm
+share/lyx/images/math/gtrless.xpm
+share/lyx/images/math/gtrsim.xpm
+share/lyx/images/math/gvertneqq.xpm
+share/lyx/images/math/hat.xpm
+share/lyx/images/math/hbar.xpm
+share/lyx/images/math/heartsuit.xpm
+share/lyx/images/math/hookleftarrow.xpm
+share/lyx/images/math/hookrightarrow.xpm
+share/lyx/images/math/hslash.xpm
+share/lyx/images/math/imath.xpm
+share/lyx/images/math/in.xpm
+share/lyx/images/math/infty.xpm
+share/lyx/images/math/int.xpm
+share/lyx/images/math/intercal.xpm
+share/lyx/images/math/iota.xpm
+share/lyx/images/math/jmath.xpm
+share/lyx/images/math/kappa.xpm
+share/lyx/images/math/lambda.xpm
+share/lyx/images/math/lambda2.xpm
+share/lyx/images/math/langle.xpm
+share/lyx/images/math/lbrace.xpm
+share/lyx/images/math/lbracket.xpm
+share/lyx/images/math/lceil.xpm
+share/lyx/images/math/ldots.xpm
+share/lyx/images/math/leftarrow.xpm
+share/lyx/images/math/leftarrow2.xpm
+share/lyx/images/math/leftarrowtail.xpm
+share/lyx/images/math/leftharpoondown.xpm
+share/lyx/images/math/leftharpoonup.xpm
+share/lyx/images/math/leftleftarrows.xpm
+share/lyx/images/math/leftrightarrow.xpm
+share/lyx/images/math/leftrightarrow2.xpm
+share/lyx/images/math/leftrightarrows.xpm
+share/lyx/images/math/leftrightharpoons.xpm
+share/lyx/images/math/leftrightsquigarrow.xpm
+share/lyx/images/math/leftthreetimes.xpm
+share/lyx/images/math/leq.xpm
+share/lyx/images/math/leqq.xpm
+share/lyx/images/math/leqslant.xpm
+share/lyx/images/math/lessapprox.xpm
+share/lyx/images/math/lessdot.xpm
+share/lyx/images/math/lesseqgtr.xpm
+share/lyx/images/math/lesseqqgtr.xpm
+share/lyx/images/math/lessgtr.xpm
+share/lyx/images/math/lesssim.xpm
+share/lyx/images/math/lfloor.xpm
+share/lyx/images/math/ll.xpm
+share/lyx/images/math/llcorner.xpm
+share/lyx/images/math/lll.xpm
+share/lyx/images/math/lnapprox.xpm
+share/lyx/images/math/lneq.xpm
+share/lyx/images/math/lneqq.xpm
+share/lyx/images/math/lnsim.xpm
+share/lyx/images/math/longleftarrow.xpm
+share/lyx/images/math/longleftarrow2.xpm
+share/lyx/images/math/longleftrightarrow.xpm
+share/lyx/images/math/longleftrightarrow2.xpm
+share/lyx/images/math/longmapsto.xpm
+share/lyx/images/math/longrightarrow.xpm
+share/lyx/images/math/longrightarrow2.xpm
+share/lyx/images/math/looparrowleft.xpm
+share/lyx/images/math/looparrowright.xpm
+share/lyx/images/math/lozenge.xpm
+share/lyx/images/math/lparen.xpm
+share/lyx/images/math/lrcorner.xpm
+share/lyx/images/math/ltimes.xpm
+share/lyx/images/math/lvertneqq.xpm
+share/lyx/images/math/mapsto.xpm
+share/lyx/images/math/mathbb_C.xpm
+share/lyx/images/math/mathbb_H.xpm
+share/lyx/images/math/mathbb_N.xpm
+share/lyx/images/math/mathbb_Q.xpm
+share/lyx/images/math/mathbb_R.xpm
+share/lyx/images/math/mathbb_Z.xpm
+share/lyx/images/math/mathcal_F.xpm
+share/lyx/images/math/mathcal_H.xpm
+share/lyx/images/math/mathcal_L.xpm
+share/lyx/images/math/mathcal_O.xpm
+share/lyx/images/math/mathcircumflex.xpm
+share/lyx/images/math/mathrm_T.xpm
+share/lyx/images/math/measuredangle.xpm
+share/lyx/images/math/mho.xpm
+share/lyx/images/math/mid.xpm
+share/lyx/images/math/models.xpm
+share/lyx/images/math/mp.xpm
+share/lyx/images/math/mu.xpm
+share/lyx/images/math/multimap.xpm
+share/lyx/images/math/nabla.xpm
+share/lyx/images/math/natural.xpm
+share/lyx/images/math/ncong.xpm
+share/lyx/images/math/nearrow.xpm
+share/lyx/images/math/neg.xpm
+share/lyx/images/math/neq.xpm
+share/lyx/images/math/nexists.xpm
+share/lyx/images/math/ngeq.xpm
+share/lyx/images/math/ngeqq.xpm
+share/lyx/images/math/ngeqslant.xpm
+share/lyx/images/math/ngtr.xpm
+share/lyx/images/math/ni.xpm
+share/lyx/images/math/nleftarrow.xpm
+share/lyx/images/math/nleftarrow2.xpm
+share/lyx/images/math/nleftrightarrow.xpm
+share/lyx/images/math/nleftrightarrow2.xpm
+share/lyx/images/math/nleq.xpm
+share/lyx/images/math/nleqq.xpm
+share/lyx/images/math/nleqslant.xpm
+share/lyx/images/math/nless.xpm
+share/lyx/images/math/nmid.xpm
+share/lyx/images/math/notin.xpm
+share/lyx/images/math/nparallel.xpm
+share/lyx/images/math/nprec.xpm
+share/lyx/images/math/npreceq.xpm
+share/lyx/images/math/nrightarrow.xpm
+share/lyx/images/math/nrightarrow2.xpm
+share/lyx/images/math/nshortmid.xpm
+share/lyx/images/math/nshortparallel.xpm
+share/lyx/images/math/nsim.xpm
+share/lyx/images/math/nsubseteq.xpm
+share/lyx/images/math/nsucc.xpm
+share/lyx/images/math/nsucceq.xpm
+share/lyx/images/math/nsupseteq.xpm
+share/lyx/images/math/nsupseteqq.xpm
+share/lyx/images/math/ntriangleleft.xpm
+share/lyx/images/math/ntrianglelefteq.xpm
+share/lyx/images/math/ntriangleright.xpm
+share/lyx/images/math/ntrianglerighteq.xpm
+share/lyx/images/math/nu.xpm
+share/lyx/images/math/nvdash.xpm
+share/lyx/images/math/nvdash2.xpm
+share/lyx/images/math/nvdash3.xpm
+share/lyx/images/math/nwarrow.xpm
+share/lyx/images/math/odot.xpm
+share/lyx/images/math/oint.xpm
+share/lyx/images/math/omega.xpm
+share/lyx/images/math/omega2.xpm
+share/lyx/images/math/ominus.xpm
+share/lyx/images/math/oplus.xpm
+share/lyx/images/math/oslash.xpm
+share/lyx/images/math/otimes.xpm
+share/lyx/images/math/overbrace.xpm
+share/lyx/images/math/overleftarrow.xpm
+share/lyx/images/math/overleftrightarrow.xpm
+share/lyx/images/math/overline.xpm
+share/lyx/images/math/overrightarrow.xpm
+share/lyx/images/math/parallel.xpm
+share/lyx/images/math/partial.xpm
+share/lyx/images/math/perp.xpm
+share/lyx/images/math/phi.xpm
+share/lyx/images/math/phi2.xpm
+share/lyx/images/math/pi.xpm
+share/lyx/images/math/pi2.xpm
+share/lyx/images/math/pitchfork.xpm
+share/lyx/images/math/pm.xpm
+share/lyx/images/math/prec.xpm
+share/lyx/images/math/precapprox.xpm
+share/lyx/images/math/preccurlyeq.xpm
+share/lyx/images/math/preceq.xpm
+share/lyx/images/math/precnapprox.xpm
+share/lyx/images/math/precnsim.xpm
+share/lyx/images/math/precsim.xpm
+share/lyx/images/math/prime.xpm
+share/lyx/images/math/prod.xpm
+share/lyx/images/math/propto.xpm
+share/lyx/images/math/psi.xpm
+share/lyx/images/math/psi2.xpm
+share/lyx/images/math/rangle.xpm
+share/lyx/images/math/rbrace.xpm
+share/lyx/images/math/rbracket.xpm
+share/lyx/images/math/rceil.xpm
+share/lyx/images/math/rfloor.xpm
+share/lyx/images/math/rho.xpm
+share/lyx/images/math/rightarrow.xpm
+share/lyx/images/math/rightarrow2.xpm
+share/lyx/images/math/rightarrowtail.xpm
+share/lyx/images/math/rightharpoondown.xpm
+share/lyx/images/math/rightharpoonup.xpm
+share/lyx/images/math/rightleftarrows.xpm
+share/lyx/images/math/rightleftharpoons.xpm
+share/lyx/images/math/rightrightarrows.xpm
+share/lyx/images/math/rightsquigarrow.xpm
+share/lyx/images/math/rightthreetimes.xpm
+share/lyx/images/math/risingdotseq.xpm
+share/lyx/images/math/rparen.xpm
+share/lyx/images/math/rtimes.xpm
+share/lyx/images/math/searrow.xpm
+share/lyx/images/math/setminus.xpm
+share/lyx/images/math/sharp.xpm
+share/lyx/images/math/shortmid.xpm
+share/lyx/images/math/shortparallel.xpm
+share/lyx/images/math/sigma.xpm
+share/lyx/images/math/sigma2.xpm
+share/lyx/images/math/sim.xpm
+share/lyx/images/math/simeq.xpm
+share/lyx/images/math/slash.xpm
+share/lyx/images/math/smallfrown.xpm
+share/lyx/images/math/smallsetminus.xpm
+share/lyx/images/math/smallsmile.xpm
+share/lyx/images/math/smile.xpm
+share/lyx/images/math/spadesuit.xpm
+share/lyx/images/math/sphericalangle.xpm
+share/lyx/images/math/sqcap.xpm
+share/lyx/images/math/sqcup.xpm
+share/lyx/images/math/sqrt.xpm
+share/lyx/images/math/sqsubset.xpm
+share/lyx/images/math/sqsubseteq.xpm
+share/lyx/images/math/sqsupset.xpm
+share/lyx/images/math/sqsupseteq.xpm
+share/lyx/images/math/square.xpm
+share/lyx/images/math/star.xpm
+share/lyx/images/math/subset.xpm
+share/lyx/images/math/subset2.xpm
+share/lyx/images/math/subseteq.xpm
+share/lyx/images/math/subseteqq.xpm
+share/lyx/images/math/subsetneq.xpm
+share/lyx/images/math/subsetneqq.xpm
+share/lyx/images/math/succ.xpm
+share/lyx/images/math/succapprox.xpm
+share/lyx/images/math/succcurlyeq.xpm
+share/lyx/images/math/succeq.xpm
+share/lyx/images/math/succnapprox.xpm
+share/lyx/images/math/succnsim.xpm
+share/lyx/images/math/succsim.xpm
+share/lyx/images/math/sum.xpm
+share/lyx/images/math/supset.xpm
+share/lyx/images/math/supset2.xpm
+share/lyx/images/math/supseteq.xpm
+share/lyx/images/math/supseteqq.xpm
+share/lyx/images/math/supsetneq.xpm
+share/lyx/images/math/supsetneqq.xpm
+share/lyx/images/math/surd.xpm
+share/lyx/images/math/swarrow.xpm
+share/lyx/images/math/tau.xpm
+share/lyx/images/math/textrm_0.xpm
+share/lyx/images/math/textrm_A.xpm
+share/lyx/images/math/therefore.xpm
+share/lyx/images/math/theta.xpm
+share/lyx/images/math/theta2.xpm
+share/lyx/images/math/thickapprox.xpm
+share/lyx/images/math/thicksim.xpm
+share/lyx/images/math/tilde.xpm
+share/lyx/images/math/times.xpm
+share/lyx/images/math/top.xpm
+share/lyx/images/math/triangle.xpm
+share/lyx/images/math/triangledown.xpm
+share/lyx/images/math/triangleleft.xpm
+share/lyx/images/math/trianglelefteq.xpm
+share/lyx/images/math/triangleq.xpm
+share/lyx/images/math/triangleright.xpm
+share/lyx/images/math/trianglerighteq.xpm
+share/lyx/images/math/twoheadleftarrow.xpm
+share/lyx/images/math/twoheadrightarrow.xpm
+share/lyx/images/math/ulcorner.xpm
+share/lyx/images/math/underbrace.xpm
+share/lyx/images/math/underleftarrow.xpm
+share/lyx/images/math/underleftrightarrow.xpm
+share/lyx/images/math/underline.xpm
+share/lyx/images/math/underrightarrow.xpm
+share/lyx/images/math/underscore.xpm
+share/lyx/images/math/uparrow.xpm
+share/lyx/images/math/uparrow2.xpm
+share/lyx/images/math/updownarrow.xpm
+share/lyx/images/math/updownarrow2.xpm
+share/lyx/images/math/upharpoonleft.xpm
+share/lyx/images/math/upharpoonright.xpm
+share/lyx/images/math/uplus.xpm
+share/lyx/images/math/upsilon.xpm
+share/lyx/images/math/upsilon2.xpm
+share/lyx/images/math/upuparrows.xpm
+share/lyx/images/math/urcorner.xpm
+share/lyx/images/math/varepsilon.xpm
+share/lyx/images/math/varkappa.xpm
+share/lyx/images/math/varnothing.xpm
+share/lyx/images/math/varphi.xpm
+share/lyx/images/math/varpi.xpm
+share/lyx/images/math/varpropto.xpm
+share/lyx/images/math/varsigma.xpm
+share/lyx/images/math/varsubsetneq.xpm
+share/lyx/images/math/varsubsetneqq.xpm
+share/lyx/images/math/varsupsetneq.xpm
+share/lyx/images/math/varsupsetneqq.xpm
+share/lyx/images/math/vartheta.xpm
+share/lyx/images/math/vartriangle.xpm
+share/lyx/images/math/vartriangleleft.xpm
+share/lyx/images/math/vartriangleright.xpm
+share/lyx/images/math/vdash.xpm
+share/lyx/images/math/vdash2.xpm
+share/lyx/images/math/vdash3.xpm
+share/lyx/images/math/vdots.xpm
+share/lyx/images/math/vec.xpm
+share/lyx/images/math/vee.xpm
+share/lyx/images/math/veebar.xpm
+share/lyx/images/math/wedge.xpm
+share/lyx/images/math/widehat.xpm
+share/lyx/images/math/widetilde.xpm
+share/lyx/images/math/wp.xpm
+share/lyx/images/math/wr.xpm
+share/lyx/images/math/xi.xpm
+share/lyx/images/math/xi2.xpm
+share/lyx/images/math/zeta.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -242,6 +689,7 @@ share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
+share/lyx/images/up.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
@@ -251,6 +699,7 @@ share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/cp1251.cdef
 share/lyx/kbd/czech-prg.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/espanol.kmap
 share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
@@ -279,6 +728,7 @@ share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
 share/lyx/kbd/null.kmap
 share/lyx/kbd/polish.kmap
+share/lyx/kbd/polski.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
 share/lyx/kbd/serbian.kmap
@@ -298,6 +748,8 @@ share/lyx/layouts/aa.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/aastex.layout
+share/lyx/layouts/agums.layout
+share/lyx/layouts/aguplus.inc
 share/lyx/layouts/amsart-plain.layout
 share/lyx/layouts/amsart-seq.layout
 share/lyx/layouts/amsart.layout
@@ -315,6 +767,7 @@ share/lyx/layouts/cl2emult.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
+share/lyx/layouts/db_stdcounters.inc
 share/lyx/layouts/db_stdlayouts.inc
 share/lyx/layouts/db_stdlists.inc
 share/lyx/layouts/db_stdsections.inc
@@ -328,6 +781,7 @@ share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
 share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
+share/lyx/layouts/elsart.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -336,10 +790,12 @@ share/lyx/layouts/extreport.layout
 share/lyx/layouts/foils.layout
 share/lyx/layouts/g-brief-de.layout
 share/lyx/layouts/g-brief-en.layout
+share/lyx/layouts/g-brief2.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
 share/lyx/layouts/ijmpd.layout
+share/lyx/layouts/jgrga.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -352,6 +808,10 @@ share/lyx/layouts/llncs.layout
 share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
+share/lyx/layouts/memoir.layout
+share/lyx/layouts/mwart.layout
+share/lyx/layouts/mwbk.layout
+share/lyx/layouts/mwrep.layout
 share/lyx/layouts/obsolete.inc
 share/lyx/layouts/paper.layout
 share/lyx/layouts/report.layout
@@ -361,6 +821,7 @@ share/lyx/layouts/scrartcl.layout
 share/lyx/layouts/scrbook.layout
 share/lyx/layouts/scrclass.inc
 share/lyx/layouts/scrlettr.layout
+share/lyx/layouts/scrlttr2.layout
 share/lyx/layouts/scrmacros.inc
 share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
@@ -368,6 +829,8 @@ share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
 share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
+share/lyx/layouts/stdcounters.inc
+share/lyx/layouts/stdfloats.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
 share/lyx/layouts/stdlists.inc
@@ -378,6 +841,22 @@ share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
 share/lyx/layouts/svprobth.layout
+share/lyx/lyx2lyx/error.py
+share/lyx/lyx2lyx/error.pyc
+share/lyx/lyx2lyx/lyx2lyx
+share/lyx/lyx2lyx/lyxconvert_210.py
+share/lyx/lyx2lyx/lyxconvert_215.py
+share/lyx/lyx2lyx/lyxconvert_215.pyc
+share/lyx/lyx2lyx/lyxconvert_216.py
+share/lyx/lyx2lyx/lyxconvert_216.pyc
+share/lyx/lyx2lyx/lyxconvert_217.py
+share/lyx/lyx2lyx/lyxconvert_217.pyc
+share/lyx/lyx2lyx/lyxconvert_218.py
+share/lyx/lyx2lyx/lyxconvert_218.pyc
+share/lyx/lyx2lyx/lyxconvert_220.py
+share/lyx/lyx2lyx/lyxconvert_220.pyc
+share/lyx/lyx2lyx/parser_tools.py
+share/lyx/lyx2lyx/parser_tools.pyc
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -397,10 +876,12 @@ share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
 share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/convertDefault.sh
 share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
 share/lyx/scripts/listerrors
+share/lyx/scripts/lyxpreview2bitmap.sh
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
@@ -410,11 +891,13 @@ share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/docbook_article.lyx
+share/lyx/templates/elsart.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
 share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
+share/lyx/templates/koma-letter2.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoc_article.lyx
@@ -429,7 +912,7 @@ share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
-share/lyx/ui/old-default.ui
+share/lyx/xfonts/PSres.upr
 share/lyx/xfonts/cmex10.pfb
 share/lyx/xfonts/cmmi10.pfb
 share/lyx/xfonts/cmr10.pfb
@@ -439,6 +922,7 @@ share/lyx/xfonts/fonts.dir
 share/lyx/xfonts/fonts.scale
 share/lyx/xfonts/msam10.pfb
 share/lyx/xfonts/msbm10.pfb
+share/lyx/xfonts/wasy10.pfb
 @dirrm share/lyx/xfonts
 @dirrm share/lyx/ui
 @dirrm share/lyx/tex
@@ -446,8 +930,10 @@ share/lyx/xfonts/msbm10.pfb
 @dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
+@dirrm share/lyx/lyx2lyx
 @dirrm share/lyx/layouts
 @dirrm share/lyx/kbd
+@dirrm share/lyx/images/math
 @dirrm share/lyx/images
 @dirrm share/lyx/help
 @dirrm share/lyx/examples
@@ -455,21 +941,11 @@ share/lyx/xfonts/msbm10.pfb
 @dirrm share/lyx/clipart
 @dirrm share/lyx/bind
 @dirrm share/lyx
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
 @dirrm share/locale/sk/LC_MESSAGES
 @dirrm share/locale/sk
 @dirrm share/locale/ro/LC_MESSAGES
 @dirrm share/locale/ro
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/he/LC_MESSAGES
-@dirrm share/locale/he
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
 @dirrm share/locale/eu/LC_MESSAGES
 @dirrm share/locale/eu
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale/bg/LC_MESSAGES
-@dirrm share/locale/bg