From e65cb340658027b5eff292096de43dc00c705dda Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 26 Sep 2003 14:59:33 +0000 Subject: [PATCH] back to 1.3.4cvs git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7833 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 6 +++ Makefile.am | 2 +- config/ChangeLog | 5 +++ config/configure.ac | 4 +- config/configure.in | 2 +- development/ChangeLog | 4 ++ development/Makefile.am | 3 +- po/ChangeLog | 4 ++ po/postats.sh | 2 +- status.13x | 91 ++--------------------------------------- 10 files changed, 30 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6bcc5b1fc..78fba2ff9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-26 Jean-Marc Lasgouttes + + * Makefile.am (EXTRA_DIST): add README.MacOSX + + * status.13x: reset for 1.3.4cvs + 2003-09-25 Jean-Marc Lasgouttes * LyX 1.3.3 released diff --git a/Makefile.am b/Makefile.am index 5eaf4efa21..028366e60a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \ SUBDIRS = config development intl po boost src sourcedoc lib EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \ - UPGRADING lyx.man autogen.sh images + README.MacOSX UPGRADING lyx.man autogen.sh images # Hack so that the targets that use tar will also work with automake 1.4 AMTAR ?= $(TAR) diff --git a/config/ChangeLog b/config/ChangeLog index 55aae72ea3..b525686741 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2003-09-26 Jean-Marc Lasgouttes + + * configure.in (VERSION): + * configure.ac (VERSION): back to cvs work + 2003-09-25 Jean-Marc Lasgouttes * configure.in (VERSION): diff --git a/config/configure.ac b/config/configure.ac index fc28da6630..be1f057397 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(lyx,1.3.3,lyx-devel@lists.lyx.org) +AC_INIT(lyx,1.3.4cvs,lyx-devel@lists.lyx.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) AM_CONFIG_HEADER([src/config.h]) @@ -8,7 +8,7 @@ AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_AUX_DIR(config) PACKAGE=lyx${program_suffix} -VERSION="1.3.3" +VERSION="1.3.4cvs" LYX_CHECK_VERSION AM_MAINTAINER_MODE diff --git a/config/configure.in b/config/configure.in index 9d65c83799..bbd1473b2c 100644 --- a/config/configure.in +++ b/config/configure.in @@ -8,7 +8,7 @@ dnl AM_CONFIG_HEADER(src/config.h) AC_CONFIG_AUX_DIR(config) PACKAGE=lyx${program_suffix} -VERSION="1.3.3" +VERSION="1.3.4cvs" LYX_CHECK_VERSION AM_MAINTAINER_MODE diff --git a/development/ChangeLog b/development/ChangeLog index 753acb111b..af07b33c2a 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,7 @@ +2003-09-26 Jean-Marc Lasgouttes + + * Makefile.am (EXTRA_DIST): add directory MacOSX + 2003-09-11 Jean-Marc Lasgouttes * MacOSX/lyx.xpm: not needed after all... diff --git a/development/Makefile.am b/development/Makefile.am index 01ee6ff162..31e238b29d 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -2,4 +2,5 @@ include $(top_srcdir)/config/common.am EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \ gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \ - lyxserver lyx.spec.in lyx.spec OS2 Seminar.txt TodoPlan-1.3 tools Win32 + lyxserver lyx.spec.in lyx.spec OS2 Seminar.txt TodoPlan-1.3 tools \ + Win32 MacOSX diff --git a/po/ChangeLog b/po/ChangeLog index f87244be97..923a509cab 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2003-09-26 Jean-Marc Lasgouttes + + * postats.sh (lyx_version): update to 1.3.3 (will be 1.3.4cvs later) + 2003-09-25 Jean-Marc Lasgouttes * *.po: remerge for release diff --git a/po/postats.sh b/po/postats.sh index 750dc8bd8e..d763b8e3d4 100755 --- a/po/postats.sh +++ b/po/postats.sh @@ -16,7 +16,7 @@ # postats.sh po_files > "pathToWebPages"/i18n.php3 # modifiy this when you change version -lyx_version=1.3.2cvs +lyx_version=1.3.3 lyx_branch=BRANCH_1_3_X diff --git a/status.13x b/status.13x index 462cc29bf7..c7ae1fb8d3 100644 --- a/status.13x +++ b/status.13x @@ -1,10 +1,10 @@ -*- text -*- -This file describes what has been done in the preparation of LyX 1.3.3 +This file describes what has been done in the preparation of LyX 1.3.4 All comments are welcome. -You can find a list of bugs pending for 1.3.3 at URL -http://bugzilla.lyx.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&&target_milestone=1.3.3 +You can find a list of bugs pending for 1.3.4 at URL +http://bugzilla.lyx.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&&target_milestone=1.3.4 I'd be glad if some of you could take the time to check it out (or fix a bug or two if you are feeling adventurous). Let me recall that all @@ -22,91 +22,8 @@ What's new ** Updates -- add basic support for the memoir class - -- add Proof layout to elsart class and get sections to be numbered - -- make LyX compile almost out-of-the-box with Qt/Mac (see README.MacOSX) - -- add a bit of documentation of the AGU journals support in the - Extended manual; small tweaks to the english documentation; german - documentation overhaul; french documentation and examples update - -- completely new italian localization; french, german, russian and - slovenian localization updates ** Bug fixes -- fix possible crash when changing text class [bug #1050] - -- fix language setting when switching textclass - -- fix math bug where formulas containing for example a \prettyref - would not be parsed correctly [bug #1126] - -- speed up conversion of large old files on some systems - -- fix bad conversion of tables from LyX 1.0 [bug #1045] - -- convert old files (0.11 series) correctly, suppressing space - between number and units [bug #763] - -- fix docbook export with nested environments [bug #821] - -- output newline and hfill correctly in docbook [bug #1148] - -- when pressing delete or backspace over a selection, do not modify - the clipboard [bug #1049] - -- when inserting a float or a note over a selection, make sure that - the insets and font changes in the selection are correctly kept - (note however that doing this now modifies the clipboard) - -- clean-up properly after completed graphics conversion processes. - -- enable graphics conversion using the default convertDefault.sh converter - when exporting, even if convertDefault.sh is not executable. - -- work around a Qt 3.1.2 bug with the environment combo box [bug #1136] - -- fix bug where browsing for files in graphics inset would always - return an absolute path [bug #1028, Qt only] - -- do not write in preference file the colors which are still at their - default value [bug #1069, Qt only] - -- fix loading of symbol fonts [Qt 3.2.0 only] - -- fix loading of symbol fonts on solaris - -- fix the math panel symbols [Qt 3.2.0 only] - -- do not reset natbib style when adding a new entry to a citation [Qt - only] - -- allow insertion of width strings like "2.5in" into tabular dialog - [Qt only] - -- fix some cases where the View>TeX information dialog would get - confused because the same file gets listed several times - -- remove annoying message on console when LyX tries to make TeX fonts - available to the X server - -- it was not possible to view the french versions of the Extended and - Customization manual. - -- the lib/configure script now works correctly with zsh [bug #977] - -- add missing c_str.sed file in the distribution - -- hopefully really fix problems with patch requiring aclocal-1.6 - -- fix compilation on HP-UX 11.x - -- do not report failed inlining when compiling with gcc - -- fix compilation with new development versions of xforms - -- fix compilation with AikSaurus 1.0 +- add a couple forgotten MacOSX-related files