From eec778bcd53b8c64868454722ea1fde6a569162f Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Thu, 27 Feb 2020 16:52:50 +0000
Subject: [PATCH]   Merge of commit 44246 from trunk branch   + other fixes to
 packages/*/fpmake.pp with wrong versions.   Fixes shortsrc target in
 fixes_3_2 branch.
 ------------------------------------------------------------------------
 r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines

  * Fix sourcezip make target, correcting mixed case input file names.


------------------------------------------------------------------------
--- Merging r44246 into '.':
U    packages/ide/fpmake.pp
U    packages/libgbafpc/fpmake.pp
U    packages/libndsfpc/fpmake.pp
U    packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r44246 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44247 -
---
 packages/gnutls/fpmake.pp     | 2 +-
 packages/ide/fpmake.pp        | 4 ++--
 packages/libgbafpc/fpmake.pp  | 2 +-
 packages/libmagic/fpmake.pp   | 2 +-
 packages/libndsfpc/fpmake.pp  | 2 +-
 packages/vcl-compat/fpmake.pp | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/gnutls/fpmake.pp b/packages/gnutls/fpmake.pp
index 7e40c5f4a9..b647f35912 100644
--- a/packages/gnutls/fpmake.pp
+++ b/packages/gnutls/fpmake.pp
@@ -19,7 +19,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
-    P.Version:='3.3.1';
+    P.Version:='3.2.0-beta';
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     if Defaults.CPU=jvm then
diff --git a/packages/ide/fpmake.pp b/packages/ide/fpmake.pp
index ff19a12145..73bd8b476c 100644
--- a/packages/ide/fpmake.pp
+++ b/packages/ide/fpmake.pp
@@ -297,8 +297,8 @@ begin
         with P.Sources do
         begin
         AddDoc('readme.ide');
-        AddSrc('readme.txt');
-        AddSrc('todo.txt');
+        AddSrc('README.txt');
+        AddSrc('TODO.txt');
         AddSrc('fp.ans');
         AddSrcFiles('*.tdf',P.Directory);
         AddSrcFiles('*.pas',P.Directory,true);
diff --git a/packages/libgbafpc/fpmake.pp b/packages/libgbafpc/fpmake.pp
index 14c29826ce..d389e64406 100644
--- a/packages/libgbafpc/fpmake.pp
+++ b/packages/libgbafpc/fpmake.pp
@@ -31,7 +31,7 @@ begin
      T.IncludePath.Add('src/gba');
      with T.Dependencies do
      begin
-       AddInclude('BoyScout.inc');
+       AddInclude('boyscout.inc');
        AddInclude('core_asm.as');
        AddInclude('disc.inc');
        AddInclude('disc_io.inc');
diff --git a/packages/libmagic/fpmake.pp b/packages/libmagic/fpmake.pp
index ba8ad175ab..b1ff91ee10 100644
--- a/packages/libmagic/fpmake.pp
+++ b/packages/libmagic/fpmake.pp
@@ -17,7 +17,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
-    P.Version:='3.3.1';
+    P.Version:='3.2.0-beta';
     P.Author := 'Library: libmagic';
     P.License := 'Library: GPL, header: LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
diff --git a/packages/libndsfpc/fpmake.pp b/packages/libndsfpc/fpmake.pp
index 140da25daa..530d6c1a02 100644
--- a/packages/libndsfpc/fpmake.pp
+++ b/packages/libndsfpc/fpmake.pp
@@ -109,7 +109,7 @@ begin
        AddInclude('dswifi9.inc');
        AddInclude('dswifi7.inc');
        AddInclude('netdb.inc');
-       AddInclude('sgIp_errno.inc');
+       AddInclude('sgIP_errno.inc');
      end;
      T.IncludePath.Add('src/dswifi/inc/netinet');
        T.Dependencies.AddInclude('in.inc');
diff --git a/packages/vcl-compat/fpmake.pp b/packages/vcl-compat/fpmake.pp
index 225cea5515..641bb14369 100644
--- a/packages/vcl-compat/fpmake.pp
+++ b/packages/vcl-compat/fpmake.pp
@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('vcl-compat');
-    P.ShortName:='vclcomp';
+    P.ShortName:='vcl';
     P.Author := 'Michael Van Canneyt';
     P.License := 'LGPL with modification';
     P.HomepageURL := 'www.freepascal.org';
@@ -26,7 +26,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
-    P.Version:='3.3.1';
+    P.Version:='3.2.0-beta';
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');
     P.Dependencies.Add('fcl-web');