From 0448fcf4cb1253ca122d4c5bfd9abcd2d41f9e56 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 11 Jan 2015 11:07:36 +0000 Subject: [PATCH] version 1.4RC1 git-svn-id: branches/fixes_1_4@47335 - --- .gitattributes | 4 ++-- debian/changelog | 6 ++++++ ide/lazarus.lpi | 3 ++- ide/lazarus.res | Bin 138412 -> 138412 bytes ide/version.inc | 2 +- lazarus.app/Contents/Info.plist | 2 +- lcl/interfaces/lcl.lpk | 8 +++----- lcl/lclbase.lpk | 2 +- lcl/lclversion.pas | 6 +++--- .../{lcl-1.3.lpl => lcl-1.4.0.1.lpl} | 0 .../{lclbase-1.3.lpl => lclbase-1.4.0.1.lpl} | 0 11 files changed, 19 insertions(+), 14 deletions(-) rename packager/globallinks/{lcl-1.3.lpl => lcl-1.4.0.1.lpl} (100%) rename packager/globallinks/{lclbase-1.3.lpl => lclbase-1.4.0.1.lpl} (100%) diff --git a/.gitattributes b/.gitattributes index e308d3c16a..192293b7eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7323,8 +7323,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.3.lpl svneol=native#text/plain -packager/globallinks/lclbase-1.3.lpl svneol=native#text/plain +packager/globallinks/lcl-1.4.0.1.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.4.0.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 39f21b838e..7d0d220f5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (1.4RC1-0) unstable; urgency=low + + * Snapshot building. + + -- Mattias Gaertner Sun, 11 Jan 2015 12:00:12 +0100 + lazarus (1.3.0) unstable; urgency=low * Snapshot building. diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index f27b15596a..7649878672 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -23,7 +23,8 @@ - + + diff --git a/ide/lazarus.res b/ide/lazarus.res index 496a3a35e1ca2c34751963826a955626a7a58052..b42fd65147af877076394a985ce307260c6b0633 100644 GIT binary patch delta 53 zcmZ3plVi I*qC_40Iod`QUCw| delta 53 zcmZ3plVi diff --git a/ide/version.inc b/ide/version.inc index 05595d72be..dbd52068e2 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'1.3' +'1.4RC1' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 37ebe8d8a8..491dafd146 100644 --- a/lazarus.app/Contents/Info.plist +++ b/lazarus.app/Contents/Info.plist @@ -148,7 +148,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - Lazarus IDE v1.3 beta + Lazarus IDE v1.4RC1 CFBundleSignature laza CFBundleVersion diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 0a2e1bbae2..59287689fc 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -2,6 +2,7 @@ + @@ -118,17 +119,15 @@ end;"/> - - - + @@ -2176,14 +2175,13 @@ end;"/> - + - diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index 6aae781a5d..1bd882341a 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -26,7 +26,7 @@ "/> - + diff --git a/lcl/lclversion.pas b/lcl/lclversion.pas index d31e75795d..f1b81938cd 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -33,11 +33,11 @@ interface const lcl_major = 1; - lcl_minor = 3; + lcl_minor = 4; lcl_release = 0; - lcl_patch = 0; + lcl_patch = 1; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.3'; + lcl_version = '1.4.0.1'; implementation diff --git a/packager/globallinks/lcl-1.3.lpl b/packager/globallinks/lcl-1.4.0.1.lpl similarity index 100% rename from packager/globallinks/lcl-1.3.lpl rename to packager/globallinks/lcl-1.4.0.1.lpl diff --git a/packager/globallinks/lclbase-1.3.lpl b/packager/globallinks/lclbase-1.4.0.1.lpl similarity index 100% rename from packager/globallinks/lclbase-1.3.lpl rename to packager/globallinks/lclbase-1.4.0.1.lpl