From 746d6f91c99ba27335e557773c8af6a3b6403585 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 11 Jul 2015 08:19:15 +0000 Subject: [PATCH] set fixes to 1.4.2 git-svn-id: branches/fixes_1_4@49519 - --- .gitattributes | 4 ++-- debian/changelog | 6 ++++++ ide/lazarus.lpi | 14 +------------- ide/lazarus.res | Bin 1764 -> 1764 bytes ide/version.inc | 2 +- lazarus.app/Contents/Info.plist | 2 +- lcl/interfaces/lcl.lpk | 2 +- lcl/lclbase.lpk | 2 +- lcl/lclversion.pas | 4 ++-- .../{lcl-1.4.1.lpl => lcl-1.4.2.lpl} | 0 .../{lclbase-1.4.1.lpl => lclbase-1.4.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(+), 24 deletions(-) rename packager/globallinks/{lcl-1.4.1.lpl => lcl-1.4.2.lpl} (100%) rename packager/globallinks/{lclbase-1.4.1.lpl => lclbase-1.4.2.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index efeffb4bf0..e6a1bdad58 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7416,8 +7416,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.4.1.lpl svneol=native#text/plain -packager/globallinks/lclbase-1.4.1.lpl svneol=native#text/plain +packager/globallinks/lcl-1.4.2.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.4.2.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 6270c3f35d..cea38702c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (1.4.2-0) unstable; urgency=low + + * Snapshot building. + + -- Mattias Gaertner Sat, 11 Jul 2015 10:16:12 +0200 + lazarus (1.4.1-0) unstable; urgency=low * Snapshot building. diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index 5b817d8d24..dbf9542538 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -23,7 +23,7 @@ - + @@ -1316,18 +1316,6 @@ - - - - - - - - - - - - diff --git a/ide/lazarus.res b/ide/lazarus.res index 1733dc7a140adb6dd268ea5b5420c759413503b4..747e253c02d51837cd2abd8288a18bce52a4362e 100644 GIT binary patch delta 30 mcmaFD`-FGHJQhZ#$@5tfCnvB@VKkcjm38$b)`ZCm*jxazlM6Zk delta 30 mcmaFD`-FGHJQhaA$@5tfCp)kuOk$nFXgGN)>*~o1*jxas&CFBundlePackageType APPL CFBundleShortVersionString - Lazarus IDE v1.4.1 + Lazarus IDE v1.4.2 CFBundleSignature laza CFBundleVersion diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index d009663a4a..db5f372187 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -127,7 +127,7 @@ end;"/> "/> - + diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index f0de556b01..2ec421728c 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/lcl/lclversion.pas b/lcl/lclversion.pas index f002aec836..94b0462645 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -34,10 +34,10 @@ interface const lcl_major = 1; lcl_minor = 4; - lcl_release = 1; + lcl_release = 2; lcl_patch = 0; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.4.1.0'; + lcl_version = '1.4.2.0'; implementation diff --git a/packager/globallinks/lcl-1.4.1.lpl b/packager/globallinks/lcl-1.4.2.lpl similarity index 100% rename from packager/globallinks/lcl-1.4.1.lpl rename to packager/globallinks/lcl-1.4.2.lpl diff --git a/packager/globallinks/lclbase-1.4.1.lpl b/packager/globallinks/lclbase-1.4.2.lpl similarity index 100% rename from packager/globallinks/lclbase-1.4.1.lpl rename to packager/globallinks/lclbase-1.4.2.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index a147c83f55..5fdd69d2d6 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 2901f504a2..13f2f4cc25 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 08bd70cb02..3e98573827 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +