lyx2lyx files: update GPL organization address and claim copyright also for the LyX...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40523 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 23ef0d3195d1a09473aa722a3b7aef004c48acdb..878017dc4b897fa2ea5ef59bfda85e01a43e05e3 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -1,5 +1,6 @@
 # This file is part of lyx2lyx
 # -*- coding: utf-8 -*-
+# Copyright (C) 2002-2011 The LyX Team
 # Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>
 # Copyright (C) 2002-2006 José Matos <jamatos@lyx.org>
 #
@@ -15,7 +16,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " The LyX module has all the rules related with different lyx file formats."
 
@@ -145,7 +146,7 @@ def trim_eol(line):
 
 
 def get_encoding(language, inputencoding, format, cjk_encoding):
-    " Returns enconding of the lyx file"
+    " Returns enconding of the LyX file"
     if format > 248:
         return "utf8"
     # CJK-LyX encodes files using the current locale encoding.

diff --git a/lib/lyx2lyx/generate_encoding_info.py b/lib/lyx2lyx/generate_encoding_info.py
index 211ea48405d929b396fc7ac977aec569148022ef..6766ef0520132b3c9657369f036a0d3ab87b0b3c 100644 (file)
--- a/lib/lyx2lyx/generate_encoding_info.py
+++ b/lib/lyx2lyx/generate_encoding_info.py
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 """ This module parses lib/languages and prints it as a python
 dictionary, ready to use by other python modules"""

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index c1c9f188d66b26cfb26ccf72a28c1e4031fe3c02..dbb31264f2fbdbf2f698d96fb634975025c3ec41 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+# Copyright (C) 2002-2011 The LyX Team
 # Copyright (C) 2002-2007 José Matos <jamatos@lyx.org>
 # Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>
 #
@@ -15,7 +16,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " Program used to convert between different versions of the lyx file format."
 import optparse
@@ -27,7 +28,7 @@ def main():
     args["usage"] = "usage: %prog [options] [file]"
 
     args["version"] = """lyx2lyx, version %s
-Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
+Copyright (C) 2011 The LyX Team, José Matos and Dekel Tsur""" % LyX.version__
 
     args["description"] = """Convert old lyx file <file> to newer format,
     files can be compressed with gzip.  If there no file is specified then
@@ -46,7 +47,7 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
     parser.add_option("--noisy",
                       action="store_const", const=10, dest="debug")
     parser.add_option("-c", "--encoding", dest="cjk_encoding",
-                      help="files in format 248 and lower are read and"
+                      help="files in format 413 and lower are read and"
                            " written in the format of CJK-LyX."
                            "If encoding is not given or 'auto' the encoding"
                            "is determined from the locale.")

diff --git a/lib/lyx2lyx/lyx2lyx_version.py.in b/lib/lyx2lyx/lyx2lyx_version.py.in
index 731ed0fb4cd7ba5e8e8c6e0a876f1e9399fa191c..e99da0bf64dc1dc84700c64894be95e27492b2ae 100644 (file)
--- a/lib/lyx2lyx/lyx2lyx_version.py.in
+++ b/lib/lyx2lyx/lyx2lyx_version.py.in
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 version = "@PACKAGE_VERSION@"
 

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index cfc6a75433fe5ccd5ffda0dfdd668ade7ace7e78..47bee707eaea8de372ab2ee7d1e7269d5e7e9a38 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -15,7 +15,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 ''' 

diff --git a/lib/lyx2lyx/profiling.py b/lib/lyx2lyx/profiling.py
index fbdb10a2c7775cdefd41936ffb563e9b553950e8..dd5cbeea0038737376be3062d29b235cc482150c 100755 (executable)
--- a/lib/lyx2lyx/profiling.py
+++ b/lib/lyx2lyx/profiling.py
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 # We need all this because lyx2lyx does not have the .py termination
 import imp

diff --git a/lib/lyx2lyx/test_parser_tools.py b/lib/lyx2lyx/test_parser_tools.py
index b1c84eea5219bdadc67e03f067444807d423e679..a8ef944df8a9dee222ec7f830da810cb84280c00 100644 (file)
--- a/lib/lyx2lyx/test_parser_tools.py
+++ b/lib/lyx2lyx/test_parser_tools.py
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " This modules tests the functions used to help parse lines."
 

diff --git a/lib/lyx2lyx/unicode_symbols.py b/lib/lyx2lyx/unicode_symbols.py
index 7f6d4bfb385f5f2b3525e36226c1fd32e41beac0..9df65e83f7990f0147ca1c091106a9240d768ea1 100644 (file)
--- a/lib/lyx2lyx/unicode_symbols.py
+++ b/lib/lyx2lyx/unicode_symbols.py
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " Import unicode_reps from this module for access to the unicode<->LaTeX mapping. "