From 4ee51d3b6189d6ecd671b57e1aa0a2b52c741a7a Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 3 Dec 2017 10:11:21 +0000 Subject: [PATCH] set fixes version to 1.8.0 git-svn-id: branches/fixes_1_8@56591 - --- .gitattributes | 4 ++-- debian/changelog | 6 ++++++ ide/version.inc | 2 +- lazarus.app/Contents/Info.plist | 2 +- lcl/interfaces/lcl.lpk | 2 +- lcl/lclbase.lpk | 2 +- lcl/lclversion.pas | 4 ++-- packager/globallinks/{lcl-1.8.0.5.lpl => lcl-1.8.0.6.lpl} | 0 .../{lclbase-1.8.0.5.lpl => lclbase-1.8.0.6.lpl} | 0 tools/install/linux/environmentoptions.xml | 2 +- tools/install/macosx/environmentoptions.xml | 2 +- tools/install/win/environmentoptions.xml | 2 +- 12 files changed, 17 insertions(+), 11 deletions(-) rename packager/globallinks/{lcl-1.8.0.5.lpl => lcl-1.8.0.6.lpl} (100%) rename packager/globallinks/{lclbase-1.8.0.5.lpl => lclbase-1.8.0.6.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index a41a904cff..4b7e531d86 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9698,8 +9698,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-1.8.0.5.lpl svneol=native#text/plain -packager/globallinks/lclbase-1.8.0.5.lpl svneol=native#text/plain +packager/globallinks/lcl-1.8.0.6.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.8.0.6.lpl svneol=native#text/plain packager/globallinks/leakview-1.lpl svneol=native#text/plain packager/globallinks/lhelpcontrolpkg-0.2.lpl svneol=native#text/plain packager/globallinks/lr_add_function-1.lpl svneol=native#text/plain diff --git a/debian/changelog b/debian/changelog index 1c89b8ec98..05c5bb9594 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (1.8.0) unstable; urgency=low + + * Final Release + + -- Mattias Gaertner Sun, 3 Dec 2017 11:04:22 +0100 + lazarus (1.8.0RC5) unstable; urgency=low * Release Candidate 5 diff --git a/ide/version.inc b/ide/version.inc index dfc772812e..0d8c516eac 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'1.8.0RC5' +'1.8.0' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 459621ff9d..9d42e269fe 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -152,7 +152,7 @@ CFBundleSignature 1 CFBundleVersion - 5 + 6 CSResourcesFileMapped NSHighResolutionCapable diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 8ca6fb026e..6d7074c747 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 e2a05007c6..bc4d63d09b 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/lcl/lclversion.pas b/lcl/lclversion.pas index a4f57ef3f0..373c0ec3c6 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -35,9 +35,9 @@ const lcl_major = 1; lcl_minor = 8; lcl_release = 0; - lcl_patch = 5; + lcl_patch = 6; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.8.0.5'; + lcl_version = '1.8.0.6'; implementation diff --git a/packager/globallinks/lcl-1.8.0.5.lpl b/packager/globallinks/lcl-1.8.0.6.lpl similarity index 100% rename from packager/globallinks/lcl-1.8.0.5.lpl rename to packager/globallinks/lcl-1.8.0.6.lpl diff --git a/packager/globallinks/lclbase-1.8.0.5.lpl b/packager/globallinks/lclbase-1.8.0.6.lpl similarity index 100% rename from packager/globallinks/lclbase-1.8.0.5.lpl rename to packager/globallinks/lclbase-1.8.0.6.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index 16eec22c78..2cb0cfd2be 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 a256e777e7..9599c932e3 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 5f32bb2e24..739e627ded 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +