Attached is the long overdue patch.
Please use patch -E to remove three source patches from the previous
version since they have been adopted by LyX developers. The only
remaining source patch is shortened.
I tested both -qt and -xforms flavors. They work fine.
Several issues while building the port:
1. This is caused by gettext module. Do I need to do anything about it?
$ make lib-depends-check
/usr/ports/packages/i386/all/lyx-1.4.1-qt.tgz:
Extra: intl.3
Extra: iconv.4
2. Configuration consistently picked up aspell on my machine (used by
kdelibs), and this port has traditionally depended on ispell.
LyX can support both. The problem with that is that aspell must be
added to WANTLIB and that dependency is not really necessary.
My way out of this was addition to CONFIGURE_ARGS
...
--without-aspell \
--without-pspell \
...
Without this a package builder must have aspell when building lyx
because of WANTLIB containing aspell. With this I'm preventing lyx
from using aspell even when it is available on the machine.
I really do not think that a spell checker warrants another flavor.
Any suggestions for a better way of doing this?
3. Nikolay Sturm has at one point committed a change to this port to
speed up the build. I added this option at the end of
CONFIGURE_ARGS. It doesn't seem to have any ill effects and
according to ./configure --help it speeds up a one-time build.
--disable-dependency-tracking
Any comments on this?
4. No xfonts are distributed with LyX any more.
Qt doesn't see them anyway because it uses fontconfig instead of
old style X font path.
For people who want to see all the math symbols in LyX instead of a
TeX keyword, they suggest a download of contrib/latex-xft-fonts.
These are apparently TrueType versions of TeX Computer Modern fonts.
There are no guarantees from LyX developers about the quality or
security of contrib/ part of FTP site.
Besides, in that same directory are BaKoMa fonts that are recommended
to users of LyX Windows port. LyX wiki also recommends BaKoMa as a
better quality over latex-xft-fonts tarball.
http://wiki.lyx.org/FAQ/Qt
Finally, one can buy a quality Lucida fonts from TeX User Group and
use them instead.
Whatever fonts are chosen, they should be put in
/usr/local/share/fonts/somename as any other fonts and fc-cache
should be rerun. Also, an individual user can always put them in
$HOME/.fonts.
I do not see this as a LyX specific issue and I did not do anything
about it. It's well documented on LyX wiki and I believe it's an
individual user choice whether they want (need) math fonts and then
which ones they would choose.
Am I correct in thinking this way?
Should we put a message about the font availability to the port?
Best regards,
Zvezdan Petkovic
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/lyx/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile 10 Feb 2006 21:17:01 -0000 1.36
+++ Makefile 16 Jun 2006 06:49:43 -0000
@@ -2,18 +2,18 @@
COMMENT= "graphical frontend for LaTeX (nearly WYSIWYG)"
-DISTNAME= lyx-1.3.4
-PKGNAME= ${DISTNAME}p1
+DISTNAME= lyx-1.4.1
CATEGORIES= print
HOMEPAGE= http://www.lyx.org/
+EXTRACT_SUFX?= .tar.bz2
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
ftp://ftp.lip6.fr/pub/lyx/stable/ \
ftp://ftp.chg.ru/pub/TeX/lyx/stable/
-MAINTAINER= Zvezdan Petkovic <[EMAIL PROTECTED]>
+MAINTAINER= Zvezdan Petkovic <[EMAIL PROTECTED]>
# In XForms flavor: quasi-GPL (linked to closed source library)
# In Qt flavor: GPL (this should be preferred for CD distribution)
@@ -23,11 +23,15 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MODULES= devel/gettext
+MODULES= devel/gettext lang/python
+
+LYX_DEPENDS= ::print/teTeX/base \
+ ::graphics/ImageMagick \
+ ::textproc/ispell
+BUILD_DEPENDS+= ${LYX_DEPENDS}
+RUN_DEPENDS+= ${LYX_DEPENDS}
+WANTLIB= ICE SM X11 c m stdc++ z
-BUILD_DEPENDS+= :teTeX_base-*:print/teTeX/base
-RUN_DEPENDS+= :teTeX_base-*:print/teTeX/base \
- :ispell-*:textproc/ispell
USE_GMAKE= Yes
FLAVORS= qt xforms
@@ -36,13 +40,13 @@
.if ${FLAVOR:L} == "qt"
MODULES+= qt3
MODQT_MT= Yes
+WANTLIB+= pthread
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}
-WANTLIB= ICE stdc++ c X11 m SM pthread
+CONFIGURE_ENV+= LIBS=-pthread QTDIR=${MODQT_QTDIR}
.elif ${FLAVOR:L} == "xforms"
LIB_DEPENDS+= forms.1::x11/xforms
+WANTLIB+= Xpm flimage jpeg
+CONFIGURE_ARGS= --with-frontend=xforms
.else
ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
.endif
@@ -53,7 +57,10 @@
CONFIGURE_ARGS+=--with-extra-lib=${LOCALBASE}/lib \
--with-extra-inc="${LOCALBASE}/include \
${LOCALBASE}/include/X11" \
- --without-latex-config
+ --without-aspell \
+ --without-pspell \
+ --disable-dependency-tracking
+CONFIGURE_ENV+= PYTHON=${MODPY_BIN}
# Necessary because of compilation error. See:
# http://www.boost.org/libs/graph/doc/trouble_shooting.html
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/lyx/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Jan 2005 17:21:57 -0000 1.5
+++ distinfo 16 Jun 2006 06:49:43 -0000
@@ -1,4 +1,4 @@
-MD5 (lyx-1.3.4.tar.gz) = 49819dcdd8b1a8e311f125ed65899528
-RMD160 (lyx-1.3.4.tar.gz) = 67f0e1d3ff38d43a142df11587be393c64d324ea
-SHA1 (lyx-1.3.4.tar.gz) = d44561a3f449ca2008282823ad18a79e2a815ac3
-SIZE (lyx-1.3.4.tar.gz) = 7333077
+MD5 (lyx-1.4.1.tar.bz2) = 368696695a05e428773626e3b0f8ae74
+RMD160 (lyx-1.4.1.tar.bz2) = 8569859a1badb3f5f1869b61210bd743bd274c5c
+SHA1 (lyx-1.4.1.tar.bz2) = 7c036311891692d90dcc3d70bcf9c3cdd0c2fcdf
+SIZE (lyx-1.4.1.tar.bz2) = 6637018
Index: patches/patch-boost_boost_config_platform_bsd_hpp
===================================================================
RCS file: patches/patch-boost_boost_config_platform_bsd_hpp
diff -N patches/patch-boost_boost_config_platform_bsd_hpp
--- patches/patch-boost_boost_config_platform_bsd_hpp 25 Apr 2004 15:34:08
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$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:
Index: patches/patch-config_qt_m4
===================================================================
RCS file: patches/patch-config_qt_m4
diff -N patches/patch-config_qt_m4
--- patches/patch-config_qt_m4 25 Apr 2004 15:34:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$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
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/print/lyx/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 28 Apr 2004 19:57:47 -0000 1.4
+++ patches/patch-configure 16 Jun 2006 06:49:43 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2004/04/28 19:57:47 sturm Exp $
---- configure.orig 2004-02-18 18:35:31.000000000 +0100
-+++ configure 2004-04-28 20:51:48.000000000 +0200
-@@ -11721,7 +11721,7 @@ fi
+$OpenBSD$
+--- configure.orig Tue Apr 11 05:18:17 2006
++++ configure Wed Jun 14 12:39:05 2006
+@@ -23605,7 +23605,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
@@ -10,12 +10,3 @@
else
echo "$as_me:$LINENO: checking for fl_initialize in -lxforms" >&5
echo $ECHO_N "checking for fl_initialize in -lxforms... $ECHO_C" >&6
-@@ -12639,7 +12639,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- SAVE_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
-
-- for libname in -lqt3 -lqt2 -lqt -lqt-mt;
-+ for libname in -lqt-mt ;
- do
-
- SAVE_LIBS="$LIBS"
Index: patches/patch-src_frontends_qt2_Makefile_in
===================================================================
RCS file: patches/patch-src_frontends_qt2_Makefile_in
diff -N patches/patch-src_frontends_qt2_Makefile_in
--- patches/patch-src_frontends_qt2_Makefile_in 9 Jan 2005 07:49:06 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_frontends_qt2_Makefile_in,v 1.1 2005/01/09 07:49:06 sturm
Exp $
---- src/frontends/qt2/Makefile.in.orig Sat Jan 8 11:33:43 2005
-+++ src/frontends/qt2/Makefile.in Sat Jan 8 11:35:33 2005
-@@ -723,6 +723,12 @@ distclean-depend:
- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- CXXDEPMODE = @CXXDEPMODE@
-
-+Dialogs.lo: Dialogs.C
[EMAIL PROTECTED]@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ depfile='$(DEPDIR)/$*.Plo'
tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(LTCXXCOMPILE) -O0 -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/lyx/pkg/PLIST,v
retrieving revision 1.12
diff -u -r1.12 PLIST
--- pkg/PLIST 10 Feb 2006 21:17:01 -0000 1.12
+++ pkg/PLIST 16 Jun 2006 06:49:43 -0000
@@ -1,26 +1,27 @@
@comment $OpenBSD: PLIST,v 1.12 2006/02/10 21:17:01 espie Exp $
bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/lyxclient
+bin/tex2lyx
@man man/man1/lyx.1
[EMAIL PROTECTED] man/man1/reLyX.1
[EMAIL PROTECTED] man/man1/lyxclient.1
[EMAIL PROTECTED] man/man1/tex2lyx.1
share/locale/da/LC_MESSAGES/lyx.mo
share/locale/de/LC_MESSAGES/lyx.mo
share/locale/es/LC_MESSAGES/lyx.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/lyx.mo
share/locale/fi/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/nb/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/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/tr/LC_MESSAGES/lyx.mo
share/lyx/
share/lyx/CREDITS
share/lyx/bind/
@@ -34,6 +35,7 @@
share/lyx/bind/greekkeys.bind
share/lyx/bind/hollywood.bind
share/lyx/bind/latinkeys.bind
+share/lyx/bind/mac.bind
share/lyx/bind/math.bind
share/lyx/bind/menus.bind
share/lyx/bind/pt_menus.bind
@@ -44,7 +46,6 @@
share/lyx/clipart/
share/lyx/clipart/platypus.eps
share/lyx/configure
-share/lyx/configure.cmd
share/lyx/doc/
share/lyx/doc/Customization.lyx
share/lyx/doc/DocStyle.lyx
@@ -53,7 +54,6 @@
share/lyx/doc/Intro.lyx
share/lyx/doc/LaTeXConfig.lyx
share/lyx/doc/LaTeXConfig.lyx.in
-share/lyx/doc/LyXConfig.lyx.in
share/lyx/doc/Reference.lyx
share/lyx/doc/TOC.lyx
share/lyx/doc/Tutorial.lyx
@@ -73,7 +73,9 @@
share/lyx/doc/es_TOC.lyx
share/lyx/doc/es_Tutorial.lyx
share/lyx/doc/escher-lsd.eps
+share/lyx/doc/eu_Customization.lyx
share/lyx/doc/eu_Extended.lyx
+share/lyx/doc/eu_FAQ.lyx
share/lyx/doc/eu_Intro.lyx
share/lyx/doc/eu_TOC.lyx
share/lyx/doc/eu_Tutorial.lyx
@@ -96,11 +98,11 @@
share/lyx/doc/it_Tutorial.lyx
share/lyx/doc/it_UserGuide.lyx
share/lyx/doc/mobius.eps
+share/lyx/doc/nb_Intro.lyx
+share/lyx/doc/nb_TOC.lyx
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
@@ -111,7 +113,6 @@
share/lyx/doc/pt_Tutorial.lyx
share/lyx/doc/ro_Intro.lyx
share/lyx/doc/ro_TOC.lyx
-share/lyx/doc/ro_splash.lyx
share/lyx/doc/ru_FAQ.lyx
share/lyx/doc/ru_Intro.lyx
share/lyx/doc/ru_TOC.lyx
@@ -142,8 +143,16 @@
share/lyx/examples/currency.lyx
share/lyx/examples/cv.lyx
share/lyx/examples/da_splash.lyx
+share/lyx/examples/de_ItemizeBullets.lyx
+share/lyx/examples/de_Lebenslauf.lyx
+share/lyx/examples/de_Minipage.lyx
+share/lyx/examples/de_TableExamples.lyx
+share/lyx/examples/de_Waehrungen.lyx
share/lyx/examples/de_beispiel_gelyxt.lyx
share/lyx/examples/de_beispiel_roh.lyx
+share/lyx/examples/de_decimal.lyx
+share/lyx/examples/de_mathed.lyx
+share/lyx/examples/de_multicol.lyx
share/lyx/examples/de_splash.lyx
share/lyx/examples/decimal.lyx
share/lyx/examples/docbook_article.lyx
@@ -189,6 +198,7 @@
share/lyx/examples/noweb2lyx.lyx
share/lyx/examples/pl_splash.lyx
share/lyx/examples/pt_splash.lyx
+share/lyx/examples/ro_splash.lyx
share/lyx/examples/ru_splash.lyx
share/lyx/examples/script_form.lyx
share/lyx/examples/sl_primer_lyxan.lyx
@@ -196,42 +206,59 @@
share/lyx/examples/sl_splash.lyx
share/lyx/examples/splash.lyx
share/lyx/external_templates
-share/lyx/help/
-share/lyx/help/Bibtex.hlp
-share/lyx/help/Texinfo.hlp
share/lyx/images/
share/lyx/images/amssymb.xpm
share/lyx/images/banner.ppm
+share/lyx/images/bookmark-goto.xpm
+share/lyx/images/bookmark-save.xpm
+share/lyx/images/break-line.xpm
share/lyx/images/buffer-close.xpm
-share/lyx/images/buffer-export_ascii.xpm
+share/lyx/images/buffer-export_dvi.xpm
share/lyx/images/buffer-export_latex.xpm
+share/lyx/images/buffer-export_ps.xpm
+share/lyx/images/buffer-export_text.xpm
share/lyx/images/buffer-new.xpm
-share/lyx/images/buffer-print.xpm
+share/lyx/images/buffer-reload.xpm
share/lyx/images/buffer-update_dvi.xpm
share/lyx/images/buffer-update_ps.xpm
share/lyx/images/buffer-view_dvi.xpm
share/lyx/images/buffer-view_ps.xpm
+share/lyx/images/buffer-write-as.xpm
share/lyx/images/buffer-write.xpm
share/lyx/images/build-program.xpm
-share/lyx/images/citation-insert.xpm
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-preferences.xpm
+share/lyx/images/dialog-show-new-inset_citation.xpm
+share/lyx/images/dialog-show-new-inset_graphics.xpm
+share/lyx/images/dialog-show-new-inset_include.xpm
+share/lyx/images/dialog-show-new-inset_ref.xpm
+share/lyx/images/dialog-show_character.xpm
+share/lyx/images/dialog-show_findreplace.xpm
+share/lyx/images/dialog-show_mathpanel.xpm
+share/lyx/images/dialog-show_print.xpm
+share/lyx/images/dialog-show_spellchecker.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/float-insert_figure.xpm
+share/lyx/images/float-insert_table.xpm
share/lyx/images/font-bold.xpm
share/lyx/images/font-emph.xpm
-share/lyx/images/font-free.xpm
+share/lyx/images/font-free-apply.xpm
share/lyx/images/font-noun.xpm
share/lyx/images/font-sans.xpm
share/lyx/images/footnote-insert.xpm
-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-document.xpm
+share/lyx/images/layout-paragraph.xpm
+share/lyx/images/layout_Description.xpm
+share/lyx/images/layout_Enumerate.xpm
+share/lyx/images/layout_Itemize.xpm
+share/lyx/images/layout_List.xpm
share/lyx/images/layout_LyX-Code.xpm
share/lyx/images/layout_Scrap.xpm
share/lyx/images/layout_Section.xpm
@@ -239,8 +266,9 @@
share/lyx/images/lyx.xpm
share/lyx/images/marginalnote-insert.xpm
share/lyx/images/math/
+share/lyx/images/math-display.xpm
+share/lyx/images/math-matrix.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
@@ -304,6 +332,7 @@
share/lyx/images/math/bumpeq2.xpm
share/lyx/images/math/cap.xpm
share/lyx/images/math/cap2.xpm
+share/lyx/images/math/cases.xpm
share/lyx/images/math/cdot.xpm
share/lyx/images/math/cdots.xpm
share/lyx/images/math/centerdot.xpm
@@ -410,8 +439,11 @@
share/lyx/images/math/lambda2.xpm
share/lyx/images/math/langle.xpm
share/lyx/images/math/lbrace.xpm
+share/lyx/images/math/lbrace_rbrace.xpm
share/lyx/images/math/lbracket.xpm
+share/lyx/images/math/lbracket_rbracket.xpm
share/lyx/images/math/lceil.xpm
+share/lyx/images/math/lceil_rceil.xpm
share/lyx/images/math/ldots.xpm
share/lyx/images/math/leftarrow.xpm
share/lyx/images/math/leftarrow2.xpm
@@ -435,6 +467,7 @@
share/lyx/images/math/lessgtr.xpm
share/lyx/images/math/lesssim.xpm
share/lyx/images/math/lfloor.xpm
+share/lyx/images/math/lfloor_rfloor.xpm
share/lyx/images/math/ll.xpm
share/lyx/images/math/llcorner.xpm
share/lyx/images/math/lll.xpm
@@ -453,6 +486,7 @@
share/lyx/images/math/looparrowright.xpm
share/lyx/images/math/lozenge.xpm
share/lyx/images/math/lparen.xpm
+share/lyx/images/math/lparen_rparen.xpm
share/lyx/images/math/lrcorner.xpm
share/lyx/images/math/ltimes.xpm
share/lyx/images/math/lvertneqq.xpm
@@ -571,6 +605,7 @@
share/lyx/images/math/rightsquigarrow.xpm
share/lyx/images/math/rightthreetimes.xpm
share/lyx/images/math/risingdotseq.xpm
+share/lyx/images/math/root.xpm
share/lyx/images/math/rparen.xpm
share/lyx/images/math/rtimes.xpm
share/lyx/images/math/searrow.xpm
@@ -621,8 +656,8 @@
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/textrm_AA.xpm
+share/lyx/images/math/textrm_Oe.xpm
share/lyx/images/math/therefore.xpm
share/lyx/images/math/theta.xpm
share/lyx/images/math/theta2.xpm
@@ -688,7 +723,7 @@
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/note-insert.xpm
share/lyx/images/paste.xpm
share/lyx/images/psnfss1.xpm
share/lyx/images/psnfss2.xpm
@@ -696,10 +731,33 @@
share/lyx/images/psnfss4.xpm
share/lyx/images/redo.xpm
share/lyx/images/standard.xpm
+share/lyx/images/tabular-feature_align-center.xpm
+share/lyx/images/tabular-feature_align-left.xpm
+share/lyx/images/tabular-feature_align-right.xpm
+share/lyx/images/tabular-feature_append-column.xpm
+share/lyx/images/tabular-feature_append-row.xpm
+share/lyx/images/tabular-feature_delete-column.xpm
+share/lyx/images/tabular-feature_delete-row.xpm
+share/lyx/images/tabular-feature_multicolumn.xpm
+share/lyx/images/tabular-feature_set-all-lines.xpm
+share/lyx/images/tabular-feature_set-longtabular.xpm
+share/lyx/images/tabular-feature_set-rotate-cell.xpm
+share/lyx/images/tabular-feature_set-rotate-tabular.xpm
+share/lyx/images/tabular-feature_toggle-line-bottom.xpm
+share/lyx/images/tabular-feature_toggle-line-left.xpm
+share/lyx/images/tabular-feature_toggle-line-right.xpm
+share/lyx/images/tabular-feature_toggle-line-top.xpm
+share/lyx/images/tabular-feature_unset-all-lines.xpm
+share/lyx/images/tabular-feature_valign-bottom.xpm
+share/lyx/images/tabular-feature_valign-middle.xpm
+share/lyx/images/tabular-feature_valign-top.xpm
share/lyx/images/tabular-insert.xpm
+share/lyx/images/thesaurus-entry.xpm
+share/lyx/images/toc-view.xpm
share/lyx/images/undo.xpm
share/lyx/images/unknown.xpm
share/lyx/images/up.xpm
+share/lyx/images/url-insert.xpm
share/lyx/kbd/
share/lyx/kbd/american-2.kmap
share/lyx/kbd/american.kmap
@@ -760,6 +818,12 @@
share/lyx/layouts/aapaper.inc
share/lyx/layouts/aapaper.layout
share/lyx/layouts/aastex.layout
+share/lyx/layouts/agu-dtd.layout
+share/lyx/layouts/agu_stdclass.inc
+share/lyx/layouts/agu_stdcounters.inc
+share/lyx/layouts/agu_stdlists.inc
+share/lyx/layouts/agu_stdsections.inc
+share/lyx/layouts/agu_stdtitle.inc
share/lyx/layouts/agums.layout
share/lyx/layouts/aguplus.inc
share/lyx/layouts/amsart-plain.layout
@@ -778,6 +842,7 @@
share/lyx/layouts/cl2emult.layout
share/lyx/layouts/cv.layout
share/lyx/layouts/db_lyxmacros.inc
+share/lyx/layouts/db_stdcharstyles.inc
share/lyx/layouts/db_stdclass.inc
share/lyx/layouts/db_stdcounters.inc
share/lyx/layouts/db_stdlayouts.inc
@@ -824,7 +889,9 @@
share/lyx/layouts/mwart.layout
share/lyx/layouts/mwbk.layout
share/lyx/layouts/mwrep.layout
-share/lyx/layouts/obsolete.inc
+share/lyx/layouts/numarticle.inc
+share/lyx/layouts/numreport.inc
+share/lyx/layouts/numrevtex.inc
share/lyx/layouts/paper.layout
share/lyx/layouts/report.layout
share/lyx/layouts/revtex.layout
@@ -834,7 +901,6 @@
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
share/lyx/layouts/siamltex.layout
@@ -850,62 +916,75 @@
share/lyx/layouts/stdstarsections.inc
share/lyx/layouts/stdstruct.inc
share/lyx/layouts/stdtitle.inc
+share/lyx/layouts/svglobal.layout
share/lyx/layouts/svjog.layout
share/lyx/layouts/svjour.inc
share/lyx/layouts/svprobth.layout
share/lyx/lyx2lyx/
-share/lyx/lyx2lyx/error.py
-share/lyx/lyx2lyx/error.pyc
+share/lyx/lyx2lyx/LyX.py
+share/lyx/lyx2lyx/LyX.pyc
+share/lyx/lyx2lyx/LyX.pyo
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/lyx_0_12.py
+share/lyx/lyx2lyx/lyx_0_12.pyc
+share/lyx/lyx2lyx/lyx_0_12.pyo
+share/lyx/lyx2lyx/lyx_1_0_0.py
+share/lyx/lyx2lyx/lyx_1_0_0.pyc
+share/lyx/lyx2lyx/lyx_1_0_0.pyo
+share/lyx/lyx2lyx/lyx_1_0_1.py
+share/lyx/lyx2lyx/lyx_1_0_1.pyc
+share/lyx/lyx2lyx/lyx_1_0_1.pyo
+share/lyx/lyx2lyx/lyx_1_1_4.py
+share/lyx/lyx2lyx/lyx_1_1_4.pyc
+share/lyx/lyx2lyx/lyx_1_1_4.pyo
+share/lyx/lyx2lyx/lyx_1_1_5.py
+share/lyx/lyx2lyx/lyx_1_1_5.pyc
+share/lyx/lyx2lyx/lyx_1_1_5.pyo
+share/lyx/lyx2lyx/lyx_1_1_6.py
+share/lyx/lyx2lyx/lyx_1_1_6.pyc
+share/lyx/lyx2lyx/lyx_1_1_6.pyo
+share/lyx/lyx2lyx/lyx_1_1_6fix3.py
+share/lyx/lyx2lyx/lyx_1_1_6fix3.pyc
+share/lyx/lyx2lyx/lyx_1_1_6fix3.pyo
+share/lyx/lyx2lyx/lyx_1_2.py
+share/lyx/lyx2lyx/lyx_1_2.pyc
+share/lyx/lyx2lyx/lyx_1_2.pyo
+share/lyx/lyx2lyx/lyx_1_3.py
+share/lyx/lyx2lyx/lyx_1_3.pyc
+share/lyx/lyx2lyx/lyx_1_3.pyo
+share/lyx/lyx2lyx/lyx_1_4.py
+share/lyx/lyx2lyx/lyx_1_4.pyc
+share/lyx/lyx2lyx/lyx_1_4.pyo
share/lyx/lyx2lyx/parser_tools.py
share/lyx/lyx2lyx/parser_tools.pyc
+share/lyx/lyx2lyx/parser_tools.pyo
+share/lyx/lyx2lyx/profiling.py
+share/lyx/lyx2lyx/profiling.pyc
+share/lyx/lyx2lyx/profiling.pyo
share/lyx/lyxrc.defaults
share/lyx/lyxrc.example
share/lyx/packages.lst
-share/lyx/reLyX/
-share/lyx/reLyX/BUGS
-share/lyx/reLyX/BasicLyX.pm
-share/lyx/reLyX/CHANGES
-share/lyx/reLyX/CleanTeX.pm
-share/lyx/reLyX/LastLyX.pm
-share/lyx/reLyX/MakePreamble.pm
-share/lyx/reLyX/README
-share/lyx/reLyX/ReadCommands.pm
-share/lyx/reLyX/RelyxFigure.pm
-share/lyx/reLyX/RelyxTable.pm
-share/lyx/reLyX/Text/
-share/lyx/reLyX/Text/TeX.pm
-share/lyx/reLyX/Verbatim.pm
-share/lyx/reLyX/reLyX.pod
-share/lyx/reLyX/reLyXmain.pl
-share/lyx/reLyX/syntax.default
share/lyx/scripts/
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/fig2pdftex.sh
+share/lyx/scripts/fig2pstex.sh
+share/lyx/scripts/fig_copy.sh
+share/lyx/scripts/layout2layout.py
+share/lyx/scripts/legacy_lyxpreview2ppm.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
+share/lyx/scripts/lyxpreview2bitmap.py
+share/lyx/scripts/lyxpreview_tools.py
+share/lyx/scripts/tex_copy.py
share/lyx/symbols
+share/lyx/syntax.default
share/lyx/templates/
share/lyx/templates/IEEEtran.lyx
+share/lyx/templates/README.new_templates
share/lyx/templates/aa.lyx
share/lyx/templates/aastex.lyx
+share/lyx/templates/agu_article.lyx
share/lyx/templates/dinbrief.lyx
share/lyx/templates/docbook_article.lyx
share/lyx/templates/elsart.lyx
@@ -930,15 +1009,7 @@
share/lyx/tex/revtex.cls
share/lyx/textclass.lst
share/lyx/ui/
+share/lyx/ui/classic.ui
share/lyx/ui/default.ui
-share/lyx/xfonts/
-share/lyx/xfonts/cmex10.pfb
-share/lyx/xfonts/cmmi10.pfb
-share/lyx/xfonts/cmr10.pfb
-share/lyx/xfonts/cmsy10.pfb
-share/lyx/xfonts/eufm10.pfb
-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
+share/lyx/ui/stdmenus.ui
+share/lyx/ui/stdtoolbars.ui
