From bbb1ae08050fb38233bfb5aa1798d014e0f6b73b Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 13 Apr 2019 08:37:09 +0000 Subject: [PATCH] set fixes version 2.0.2 git-svn-id: branches/fixes_2_0@60953 - --- .gitattributes | 4 ++-- components/lazutils/lazversion.pas | 4 ++-- debian/changelog | 6 ++++++ ide/lazarus.lpi | 2 +- ide/lazarus.res | Bin 139096 -> 139096 bytes ide/version.inc | 2 +- lazarus.app/Contents/Info.plist | 2 +- lcl/interfaces/lcl.lpk | 2 +- lcl/lclbase.lpk | 2 +- .../{lcl-2.0.1.lpl => lcl-2.0.2.lpl} | 0 .../{lclbase-2.0.1.lpl => lclbase-2.0.2.lpl} | 0 tools/install/linux/environmentoptions.xml | 2 +- tools/install/macosx/environmentoptions.xml | 2 +- tools/install/win/environmentoptions.xml | 2 +- 14 files changed, 18 insertions(+), 12 deletions(-) rename packager/globallinks/{lcl-2.0.1.lpl => lcl-2.0.2.lpl} (100%) rename packager/globallinks/{lclbase-2.0.1.lpl => lclbase-2.0.2.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index ff44a9f354..d993f4e5c7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10833,8 +10833,8 @@ packager/globallinks/lazutils-1.lpl svneol=native#text/plain packager/globallinks/lazvlc-1.lpl svneol=native#text/plain packager/globallinks/lazwebextra-0.9.lpl svneol=native#text/plain packager/globallinks/lazwiki-1.0.1.lpl svneol=native#text/plain -packager/globallinks/lcl-2.0.1.lpl svneol=native#text/plain -packager/globallinks/lclbase-2.0.1.lpl svneol=native#text/plain +packager/globallinks/lcl-2.0.2.lpl svneol=native#text/plain +packager/globallinks/lclbase-2.0.2.lpl svneol=native#text/plain packager/globallinks/lclextensions_package-0.6.1.lpl svneol=native#text/plain packager/globallinks/lclfpreport-0.lpl svneol=native#text/plain packager/globallinks/leakview-1.lpl svneol=native#text/plain diff --git a/components/lazutils/lazversion.pas b/components/lazutils/lazversion.pas index 55c3c8c137..ca0cd4a683 100644 --- a/components/lazutils/lazversion.pas +++ b/components/lazutils/lazversion.pas @@ -22,10 +22,10 @@ interface const laz_major = 2; laz_minor = 0; - laz_release = 1; + laz_release = 2; laz_patch = 0; laz_fullversion = ((laz_major * 100 + laz_minor) * 100 + laz_release) * 100 + laz_patch; - laz_version = '2.0.1.0'; + laz_version = '2.0.2.0'; implementation diff --git a/debian/changelog b/debian/changelog index 5043f63585..e58272bf3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (2.0.2.0) stable; urgency=low + + * Final Release. + + -- Mattias Gaertner Sat, 13 Apr 2019 10:32:22 +0200 + lazarus (2.0.0.4) stable; urgency=low * Final Release. diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index 969320d797..f1830d013a 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -24,7 +24,7 @@ - + diff --git a/ide/lazarus.res b/ide/lazarus.res index c2b3328a0912958716679452c89abc091511823e..eabe858acf708b8fe07cfdb0096d13fa63db19eb 100644 GIT binary patch delta 48 zcmcbykK@KZjtw5{%nS@nlfBs!CqH4I!fM2z$6zqImSg$kHS8A6DxB>qoQ&I5IGIeu E0EI;k00000 delta 48 zcmcbykK@KZjtw5{%q$EHlfBs!C%@san7oF43abHw9)rnbSB~Y)DxB>qoQ&I5IGIeu E0EcP~)c^nh diff --git a/ide/version.inc b/ide/version.inc index cdadf45183..d1fd896c7e 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'2.0.1' +'2.0.2' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 4a9a5e8c22..cd1608f3a8 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -148,7 +148,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.1 + 2.0.2 CFBundleSignature laza CFBundleVersion diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 29c0bad2b0..61f1a06d5b 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -128,7 +128,7 @@ end;"/> "/> - + diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index 0b9234782b..a06ebf2d09 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -25,7 +25,7 @@ "/> - + diff --git a/packager/globallinks/lcl-2.0.1.lpl b/packager/globallinks/lcl-2.0.2.lpl similarity index 100% rename from packager/globallinks/lcl-2.0.1.lpl rename to packager/globallinks/lcl-2.0.2.lpl diff --git a/packager/globallinks/lclbase-2.0.1.lpl b/packager/globallinks/lclbase-2.0.2.lpl similarity index 100% rename from packager/globallinks/lclbase-2.0.1.lpl rename to packager/globallinks/lclbase-2.0.2.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index d02c183b25..60a4e4ee88 100644 --- a/tools/install/linux/environmentoptions.xml +++ b/tools/install/linux/environmentoptions.xml @@ -1,7 +1,7 @@ - + diff --git a/tools/install/macosx/environmentoptions.xml b/tools/install/macosx/environmentoptions.xml index 9e876a8bfc..4774e292a0 100644 --- a/tools/install/macosx/environmentoptions.xml +++ b/tools/install/macosx/environmentoptions.xml @@ -1,7 +1,7 @@ - + diff --git a/tools/install/win/environmentoptions.xml b/tools/install/win/environmentoptions.xml index 0db2e7535e..3c1434fd99 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +