* configure.ac

        * lib/lyx2lyx/lyx2lyx_version.py.in
        * lib/lyx2lyx/Makefile.am

	Add lyx2lyx_version.py to distribution.

        * lib/lyx2lyx/LyX.py
	Use lyx version as the same version of lyx2lyx.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13626 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/configure.ac b/configure.ac
index c2d5984e6a9101e6b935c8be85e02527d041f2c8..985c3214f7ec4eb0b5c7497203003e772390daac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -440,6 +440,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        development/lyx.spec \
        lib/Makefile \
        lib/doc/Makefile \
+       lib/lyx2lyx/lyx2lyx_version.py \
        lib/lyx2lyx/Makefile \
        intl/Makefile \
        po/Makefile.in \

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 5e36c19995c19f2e3c579debc5d29e9b29ee0b84..6621ad13815613bebe7451bc8502ae571aa733ee 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -25,7 +25,9 @@ import re
 import string
 import time
 
-version_lyx2lyx = "1.5.0svn"
+import lyx2lyx_version
+version_lyx2lyx = lyx2lyx_version.version
+
 default_debug_level = 2
 
 # Regular expressions used

diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am
index 270d49864618dad7f74e67da28e73ae9fea601bd..a7dca42b5547fd3bbe19416a526fe3318c1b1321 100644 (file)
--- a/lib/lyx2lyx/Makefile.am
+++ b/lib/lyx2lyx/Makefile.am
@@ -8,6 +8,7 @@ lyx2lyxdir = $(pkgdatadir)/lyx2lyx
 # and chmod manually in install-data-hook.
 dist_lyx2lyx_PYTHON = \
        lyx2lyx \
+       lyx2lyx_version.py \
        parser_tools.py \
        LyX.py \
        lyx_0_12.py \

diff --git a/lib/lyx2lyx/lyx2lyx_version.py.in b/lib/lyx2lyx/lyx2lyx_version.py.in
new file mode 100644 (file)
index 0000000..0bd7ea9
--- /dev/null
+++ b/lib/lyx2lyx/lyx2lyx_version.py.in
@@ -0,0 +1,23 @@
+# This file is part of lyx2lyx -*- python -*-
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2006 José Matos <jamatos@lyx.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+version = "@PACKAGE_VERSION@"
+
+if __name__ == "__main__":
+    pass
+