diff --git a/.gitattributes b/.gitattributes index e308d3c16a..20741fff02 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7259,6 +7259,7 @@ packager/frames/package_usage_options.pas svneol=native#text/pascal packager/globallinks/README.txt svneol=native#text/plain packager/globallinks/aarrebase-0.lpl svneol=native#text/plain packager/globallinks/aggpaslcl-1.lpl svneol=native#text/plain +packager/globallinks/alienguidsgn-1.lpl svneol=native#text/plain packager/globallinks/anchordocking-0.6.lpl svneol=native#text/plain packager/globallinks/anchordockingdsgn-0.5.lpl svneol=native#text/plain packager/globallinks/appforms-1.lpl svneol=native#text/plain @@ -7323,8 +7324,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.5.lpl svneol=native#text/plain +packager/globallinks/lclbase-1.5.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..4eee629490 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lazarus (1.5.0) unstable; urgency=low + + * Snapshot building. + + -- Mattias Gaertner Sun, 11 Jan 2015 12:07:35 +0100 + lazarus (1.3.0) unstable; urgency=low * Snapshot building. diff --git a/ide/version.inc b/ide/version.inc index 05595d72be..08fafd95b2 100644 --- a/ide/version.inc +++ b/ide/version.inc @@ -1 +1 @@ -'1.3' +'1.5' diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist index 37ebe8d8a8..35ef182075 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.5 beta CFBundleSignature laza CFBundleVersion diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 1ee02eeab7..6740f3ec99 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -3969,4 +3969,7 @@ begin Done := True; end; +initialization + writeln('AAA1 ',sizeof(TLazItemInfo)); + end. diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 0a2e1bbae2..8953c4b257 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..c057851314 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..c7fb4cc596 100644 --- a/lcl/lclversion.pas +++ b/lcl/lclversion.pas @@ -33,11 +33,11 @@ interface const lcl_major = 1; - lcl_minor = 3; + lcl_minor = 5; lcl_release = 0; lcl_patch = 0; lcl_fullversion = ((lcl_major * 100 + lcl_minor) * 100 + lcl_release) * 100 + lcl_patch; - lcl_version = '1.3'; + lcl_version = '1.5'; implementation diff --git a/packager/globallinks/alienguidsgn-1.lpl b/packager/globallinks/alienguidsgn-1.lpl new file mode 100644 index 0000000000..beff4a5e81 --- /dev/null +++ b/packager/globallinks/alienguidsgn-1.lpl @@ -0,0 +1 @@ +$(LazarusDir)/examples/designnonlcl/full/design/alienguidsgn.lpk diff --git a/packager/globallinks/lcl-1.3.lpl b/packager/globallinks/lcl-1.5.lpl similarity index 100% rename from packager/globallinks/lcl-1.3.lpl rename to packager/globallinks/lcl-1.5.lpl diff --git a/packager/globallinks/lclbase-1.3.lpl b/packager/globallinks/lclbase-1.5.lpl similarity index 100% rename from packager/globallinks/lclbase-1.3.lpl rename to packager/globallinks/lclbase-1.5.lpl diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml index 381fb2697d..276d345eeb 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 ab3c5e63c4..68765a8c54 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 a954cab58f..5ceaeafecb 100644 --- a/tools/install/win/environmentoptions.xml +++ b/tools/install/win/environmentoptions.xml @@ -1,7 +1,7 @@ - +