Merged revisions 10166,10168,10170,10172,10176-10178,10180,10183-10184,10187-10188,10191-10192,10200-10201,10203-10204,10206,10212,10219,10221,10232,10234,10238-10239,10243,10246,10251,10253-10254,10264,10266,10271,10273,10276-10279,10281 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r10166 | peter | 2008-02-03 00:09:20 +0100 (Sun, 03 Feb 2008) | 2 lines
  
    * package in directory fixed
........
  r10212 | peter | 2008-02-04 21:59:59 +0100 (Mon, 04 Feb 2008) | 2 lines
  
    * version 2.2.1, required by fppkg
........
  r10219 | peter | 2008-02-05 00:47:40 +0100 (Tue, 05 Feb 2008) | 5 lines
  
    * dependency os and cpu added
    * change version to "major.minor.micro-build"
    * write manifest per package in the package directory so it is archived
      in all the packages
........
  r10221 | peter | 2008-02-05 00:55:44 +0100 (Tue, 05 Feb 2008) | 2 lines
  
    * depend on 2.2.1 paszlib and fcl-process
........
  r10246 | peter | 2008-02-08 00:52:47 +0100 (Fri, 08 Feb 2008) | 3 lines
  
    * use TFPVersion internally
    * getfilename is now always generated with version like 1.2.3-4
........
  r10281 | peter | 2008-02-10 20:10:21 +0100 (Sun, 10 Feb 2008) | 2 lines
  
    * log archive name that is created
........

git-svn-id: branches/fixes_2_2@10287 -

packages/fcl-process/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='fcl-process';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1-1';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/win',AllWindowsOSes);

packages/fpmkunit/fpmake.pp

@@ -6,6 +6,7 @@ uses fpmkunit;
 
 Var
   P : TPackage;
+  D : TDependency;
 begin
   With Installer do
     begin
@@ -15,10 +16,12 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='fpmkunit';
 {$endif ALLPACKAGES}
-    P.Version:='2.2.0';
+    P.Version:='2.2.1-1';
     P.Description:='Free Pascal Make Tool';
-    P.Dependencies.Add('paszlib');
-    P.Dependencies.Add('fcl-process');
+    D:=P.Dependencies.Add('paszlib');
+      D.Version:='2.2.1-0';
+    D:=P.Dependencies.Add('fcl-process');
+      D.Version:='2.2.1-0';
     P.Targets.AddUnit('src/fpmkunit.pp');
 
 {$ifndef ALLPACKAGES}

packages/hash/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='hash';
 {$endif ALLPACKAGES}
-    P.Version:='2.0.0';
+    P.Version:='2.2.1';
     T:=P.Targets.AddUnit('src/md5.pp');
     T:=P.Targets.AddUnit('src/crc.pas');
     T:=P.Targets.AddUnit('src/ntlm.pas');

packages/paszlib/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:='paszlib';
 {$endif ALLPACKAGES}
-    P.Version:='2.2.0';
+    P.Version:='2.2.1';
     P.Dependencies.Add('hash');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');