From 86f180ee7b79ff1afb945f99c9d058d666db169d Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 15 Sep 2018 19:57:31 +0000 Subject: [PATCH] set fixes version to 2.0.0RC1 git-svn-id: branches/fixes_2_0@59011 - --- .gitattributes | 4 ++-- components/lazutils/lazversion.pas | 4 ++-- debian/changelog | 6 ++++++ ide/lazarus.lpi | 3 +-- 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.lpl => lcl-2.0.0.1.lpl} | 0 .../{lclbase-2.lpl => lclbase-2.0.0.1.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(+), 13 deletions(-) rename packager/globallinks/{lcl-2.lpl => lcl-2.0.0.1.lpl} (100%) rename packager/globallinks/{lclbase-2.lpl => lclbase-2.0.0.1.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index 34467c6263..e11d6e53ad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10353,8 +10353,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.lpl svneol=native#text/plain -packager/globallinks/lclbase-2.lpl svneol=native#text/plain +packager/globallinks/lcl-2.0.0.1.lpl svneol=native#text/plain +packager/globallinks/lclbase-2.0.0.1.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 8667513898..65f533872e 100644 --- a/components/lazutils/lazversion.pas +++ b/components/lazutils/lazversion.pas @@ -23,9 +23,9 @@ const laz_major = 2; laz_minor = 0; laz_release = 0; - laz_patch = 0; + laz_patch = 1; laz_fullversion = ((laz_major * 100 + laz_minor) * 100 + laz_release) * 100 + laz_patch; - laz_version = '2.0.0.0'; + laz_version = '2.0.0.1'; implementation diff --git a/debian/changelog b/debian/changelog index dcd4cb5e17..13c49296a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (2.0.0RC1) unstable; urgency=low + + * Release Candidate 1. + + -- Mattias Gaertner Sat, 15 Sep 2018 21:48:22 +0200 + lazarus (2.0.0PreRelease) unstable; urgency=low * Pre Release Candidate. diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index 0d088cffa8..95d4709dac 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -23,8 +23,7 @@ - - + diff --git a/ide/lazarus.res b/ide/lazarus.res index e7f90c7a208c7a043c2d61f47b3816523eea3928..c31ebde06e888f29b111943f83a7633b6a5603ff 100644 GIT binary patch delta 37 tcmcbykK@KZjtwsC%nS@no88$p8Ci`O^cW19OF7z0IT*K>axgs>0|3)S3NZix delta 37 tcmcbykK@KZjtwsC%$y92o88$p8CeY(^cXCgOF7z0IT*K>axgs>0|3;E3PAt> diff --git a/ide/version.inc b/ide/version.inc index 78d640459a..a52ee1ac85 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'2.0.0PreRelease' +'2.0.0RC1' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 69b505aec2..7e04eb98d9 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -152,7 +152,7 @@ CFBundleSignature laza CFBundleVersion - 0 + 1 CSResourcesFileMapped NSHighResolutionCapable diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 83a6a2e89c..0b30f4e151 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 6136494519..b0a20fd1f7 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/packager/globallinks/lcl-2.lpl b/packager/globallinks/lcl-2.0.0.1.lpl similarity index 100% rename from packager/globallinks/lcl-2.lpl rename to packager/globallinks/lcl-2.0.0.1.lpl diff --git a/packager/globallinks/lclbase-2.lpl b/packager/globallinks/lclbase-2.0.0.1.lpl similarity index 100% rename from packager/globallinks/lclbase-2.lpl rename to packager/globallinks/lclbase-2.0.0.1.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index 36bc5e3116..a36d7391c5 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 e17ec079b4..9ea31ad00d 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 d749070b79..de78a2edd3 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +