From 0b62e3e66cf4d8fe8c7795392fac29fa52a85db7 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 3 Dec 2017 10:25:57 +0000 Subject: [PATCH] set fixes version to 1.8.1 git-svn-id: branches/fixes_1_8@56595 - --- .gitattributes | 4 ++-- debian/changelog | 8 +++++++- ide/version.inc | 2 +- lazarus.app/Contents/Info.plist | 4 ++-- lcl/interfaces/lcl.lpk | 2 +- lcl/lclbase.lpk | 2 +- lcl/lclversion.pas | 6 +++--- packager/globallinks/{lcl-1.8.0.6.lpl => lcl-1.8.1.lpl} | 0 .../{lclbase-1.8.0.6.lpl => lclbase-1.8.1.lpl} | 0 tools/install/linux/environmentoptions.xml | 2 +- tools/install/macosx/environmentoptions.xml | 2 +- tools/install/win/environmentoptions.xml | 2 +- 12 files changed, 20 insertions(+), 14 deletions(-) rename packager/globallinks/{lcl-1.8.0.6.lpl => lcl-1.8.1.lpl} (100%) rename packager/globallinks/{lclbase-1.8.0.6.lpl => lclbase-1.8.1.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index 4b7e531d86..e517819eed 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.6.lpl svneol=native#text/plain -packager/globallinks/lclbase-1.8.0.6.lpl svneol=native#text/plain +packager/globallinks/lcl-1.8.1.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.8.1.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 05c5bb9594..ab9752c4f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -lazarus (1.8.0) unstable; urgency=low +lazarus (1.8.1) unstable; urgency=low + + * Development version + + -- Mattias Gaertner Sun, 3 Dec 2017 11:04:22 +0100 + +lazarus (1.8.0) stable; urgency=low * Final Release diff --git a/ide/version.inc b/ide/version.inc index 0d8c516eac..dc66d92cdc 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'1.8.0' +'1.8.1' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 9d42e269fe..d47a098060 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -148,11 +148,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.8.0 + 1.8.1 CFBundleSignature 1 CFBundleVersion - 6 + 0 CSResourcesFileMapped NSHighResolutionCapable diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 6d7074c747..875e77390a 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 bc4d63d09b..c14de6d434 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/lcl/lclversion.pas b/lcl/lclversion.pas index 373c0ec3c6..1b9851dc2a 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -34,10 +34,10 @@ interface const lcl_major = 1; lcl_minor = 8; - lcl_release = 0; - lcl_patch = 6; + lcl_release = 1; + lcl_patch = 0; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.8.0.6'; + lcl_version = '1.8.1.0'; implementation diff --git a/packager/globallinks/lcl-1.8.0.6.lpl b/packager/globallinks/lcl-1.8.1.lpl similarity index 100% rename from packager/globallinks/lcl-1.8.0.6.lpl rename to packager/globallinks/lcl-1.8.1.lpl diff --git a/packager/globallinks/lclbase-1.8.0.6.lpl b/packager/globallinks/lclbase-1.8.1.lpl similarity index 100% rename from packager/globallinks/lclbase-1.8.0.6.lpl rename to packager/globallinks/lclbase-1.8.1.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index 2cb0cfd2be..20e6ae72a0 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 9599c932e3..35c202a905 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 739e627ded..0192a51a45 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +