remove wrong comments and add 1.3.6 to the list of releases

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

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 7a53b38f6b71409609849575ff2cb4e84d6ea584..53f486b1e4f119a43e876e12d39bd13d418ccab0 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-22  José Matos  <jamatos@lyx.org>
+
+       * lyx_1_4.py (convert_paperpackage, revert_paperpackage):
+       remove wrong comments
+
+       * LyX.py : add 1.3.6 to the releases list
+
 2005-07-18  José Matos  <jamatos@lyx.org>
 
        * lyx_1_4.py (convert_minipage, convert_frameless_box): small

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 7d8016c082e7e80cc1a411805a8ff87ee7b8ece0..102618d5b58f557416fc7e13e65b1b98871fa65c 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -45,7 +45,7 @@ format_relation = [("0_10",  [210], ["0.10.7","0.10"]),
                    ("1_1_6", [217], ["1.1.6","1.1.6fix1","1.1.6fix2","1.1"]),
                    ("1_1_6fix3", [218], ["1.1.6fix3","1.1.6fix4","1.1"]),
                    ("1_2", [220], ["1.2.0","1.2.1","1.2.3","1.2.4","1.2"]),
-                   ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3"]),
+                   ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3"]),
                    ("1_4", range(223,244), ["1.4.0cvs","1.4"])]
 
 

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 9701dbbbeba7e45d21d884e9c7c1e72485e98b65..423f68e6f55b5b9a388291787ef43b0796ac749b 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1521,7 +1521,6 @@ def revert_cite_engine(file):
 def convert_paperpackage(file):
     i = find_token(file.header, "\\paperpackage", 0)
     if i == -1:
-        file.warning("Malformed lyx file: Missing '\\paperpackage'.")
         return
 
     packages = {'default':'none','a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
@@ -1535,7 +1534,6 @@ def convert_paperpackage(file):
 def revert_paperpackage(file):
     i = find_token(file.header, "\\paperpackage", 0)
     if i == -1:
-        file.warning("Malformed lyx file: Missing '\\paperpackage'.")
         return
 
     packages = {'none':'a4', 'a4':'a4wide', 'a4wide':'widemarginsa4',