Merged revision(s) 47390 #8fcd9bf8b1 from trunk:

PascalScript: update the license form origin

git-svn-id: branches/fixes_1_4@47391 -

.gitattributes

@@ -67,6 +67,7 @@ components/IndustrialStuff/source/ledbuttons.res -text
 components/IndustrialStuff/source/lednumber.pas svneol=native#text/pascal
 components/IndustrialStuff/source/sensors.pas svneol=native#text/pascal
 components/IndustrialStuff/source/sensors.res -text
+components/PascalScript/LICENSE.md svneol=native#text/plain
 components/PascalScript/README.lazarus.txt svneol=native#text/pascal
 components/PascalScript/Samples/Console/sample1.dpr svneol=native#text/pascal
 components/PascalScript/Samples/Console/sample2.dpr svneol=native#text/pascal
@@ -176,7 +177,6 @@ components/PascalScript/Source/PascalScript_RO_Reg.pas svneol=native#text/pascal
 components/PascalScript/Source/arm.inc svneol=native#text/pascal
 components/PascalScript/Source/changelog.txt svneol=native#text/pascal
 components/PascalScript/Source/eDefines.inc svneol=native#text/pascal
-components/PascalScript/Source/license.txt svneol=native#text/pascal
 components/PascalScript/Source/pascalscript.lpk svneol=native#text/pascal
 components/PascalScript/Source/pascalscript.lrs svneol=native#text/pascal
 components/PascalScript/Source/pascalscript.pas svneol=native#text/pascal

components/PascalScript/LICENSE.md

@@ -0,0 +1,18 @@
+# RemObjects Pascal Script
+Created By Carlo Kok 	   			
+ck@remobjects.com
+
+Copyright (C) 2000-2014 by Carlo Kok and RemObjects Software, LLC
+
+This software is provided 'as-is', without any expressed or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any kind of application, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented, you must not claim that you wrote the original software.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. You must have a visible line in your programs aboutbox or documentation that it is made using RemObjects Pascal Script and where RemObjects Pascal Script can be found.
+4. This notice may not be removed or altered from any source distribution.
+
+If you have any questions concerning this license contact info@remobjects.com
+
+Carlo Kok, RemObjects Software
+

components/PascalScript/README.lazarus.txt

@@ -7,7 +7,7 @@ Fixed for Lazarus by Bogusіaw Brandys
 
 For details also see the description in the lpk file (Lazarus Package).
 
-For license details see Source/license.txt or the package file.
+For license details see LICENSE.md or the package file.
 
 This copy only provides the files required by Lazarus. The original 
 distribution also contains files for using PascalScript in Delphi and
@@ -15,6 +15,4 @@ additional documentation.
 
 Files in this distributions may also be modified or outdated.
 
-In case of any issues you are advised to check the original distribution.
+In case of any issues you are advised to check the original distribution at https://github.com/remobjects/pascalscript/
-
-

components/PascalScript/Source/license.txt

@@ -1,29 +0,0 @@
-*********************************************************************
-RemObjects Pascal Script
-Created By Carlo Kok 	   			ck@carlo-kok.com
-*********************************************************************
-Copyright (C) 2000-2004 by Carlo Kok, Innerfuse, RemObjects
-
-This software is provided 'as-is', without any expressed or implied
-warranty. In no event will the author be held liable for any damages
-arising from the use of this software.
-Permission is granted to anyone to use this software for any kind of
-application, and to alter it and redistribute it freely, subject to
-the following restrictions:
-1. The origin of this software must not be misrepresented, you must
-   not claim that you wrote the original software.
-2. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-3. You must have a visible line in your programs aboutbox or
-   documentation that it is made using RemObjects Pascal Script and
-   where RemObjects Pascal Script can be found.
-4. This notice may not be removed or altered from any source
-   distribution.
-
-If you have any questions concerning this license write me (Carlo Kok):
-  ck@carlo-kok.com or try our newsserver:
-  news://news.RemObjects.com/
-
-Carlo Kok
-RemObjects Software
-

components/PascalScript/Source/pascalscript.lpk

@@ -2,62 +2,43 @@
 <CONFIG>
   <Package Version="4">
     <Name Value="pascalscript"/>
+    <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
-    <Author Value="Carlo Kok"/>
+    <Author Value="Original by Carlo Kok / Modified by various"/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Parsing>
-        <SyntaxOptions>
-          <DelphiCompat Value="True"/>
-          <UseAnsiStrings Value="True"/>
-        </SyntaxOptions>
-      </Parsing>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
       <Other>
         <Verbosity>
           <ShowHints Value="False"/>
         </Verbosity>
-        <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
-    <Description Value="RemObjects Pascal Script 
+    <Description Value="Modified version of (see readme)
-Created by Carlo Kok
+  RemObjects Pascal Script 
-RemObjects Software
+  Created by Carlo Kok
+  RemObjects Software
 Fixed for Lazarus by Bogusіaw Brandys
 "/>
-    <License Value="*********************************************************************
+    <License Value="RemObjects Pascal Script
-RemObjects Pascal Script
+Created By Carlo Kok 	   			
-Created By Carlo Kok 	   			ck@carlo-kok.com
+ck@remobjects.com
-*********************************************************************
-Copyright (C) 2000-2004 by Carlo Kok, Innerfuse, RemObjects
 
-This software is provided 'as-is', without any expressed or implied
+Copyright (C) 2000-2014 by Carlo Kok and RemObjects Software, LLC
-warranty. In no event will the author be held liable for any damages
-arising from the use of this software.
-Permission is granted to anyone to use this software for any kind of
-application, and to alter it and redistribute it freely, subject to
-the following restrictions:
-1. The origin of this software must not be misrepresented, you must
-   not claim that you wrote the original software.
-2. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-3. You must have a visible line in your programs aboutbox or
-   documentation that it is made using RemObjects Pascal Script and
-   where RemObjects Pascal Script can be found.
-4. This notice may not be removed or altered from any source
-   distribution.
 
-If you have any questions concerning this license write me (Carlo Kok):
+This software is provided 'as-is', without any expressed or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.
-  ck@carlo-kok.com or try our newsserver:
+Permission is granted to anyone to use this software for any kind of application, and to alter it and redistribute it freely, subject to the following restrictions:
-  news://news.RemObjects.com/
 
-Carlo Kok
+1. The origin of this software must not be misrepresented, you must not claim that you wrote the original software.
-RemObjects Software
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. You must have a visible line in your programs aboutbox or documentation that it is made using RemObjects Pascal Script and where RemObjects Pascal Script can be found.
+4. This notice may not be removed or altered from any source distribution.
+
+If you have any questions concerning this license contact info@remobjects.com
+
+Carlo Kok, RemObjects Software
 "/>
     <Version Build="1"/>
     <Files Count="46">
@@ -247,7 +228,6 @@ RemObjects Software
         <UnitName Value="uPSR_comobj"/>
       </Item46>
     </Files>
-    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="LCL"/>