From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 23 May 2023 14:48:28 +0000 (+0000)
Subject: Manual merge of version 3.2.2+dfsg-15+rpi1 and 3.2.2+dfsg-20 to produce 3.2.2+dfsg... 
X-Git-Tag: raspbian/3.2.2+dfsg-20+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e43598d24d40c0a4ad3bda1434821f98ce0ef16;p=fpc.git

Manual merge of version 3.2.2+dfsg-15+rpi1 and 3.2.2+dfsg-20 to produce 3.2.2+dfsg-20+rpi1
---

2d0d6dc899bf206cf2544105fc424b268fa740b4
diff --cc debian/changelog
index 16d8f550,940ff203..3ccab981
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,39 +1,50 @@@
- fpc (3.2.2+dfsg-15+rpi1) bookworm-staging; urgency=medium
++fpc (3.2.2+dfsg-20+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Oct 2014 23:12:17 +0000]
 +  * Set compiler defaults for raspbian.
 +
 +  [changes brought forward from 3.2.2+dfsg-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Feb 2022 19:45:37 +0000]
 +  * Apply hack to work around binutils bug https://sourceware.org/bugzilla/show_bug.cgi?id=28848
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Aug 2022 03:48:25 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 23 May 2023 14:48:02 +0000
++
+ fpc (3.2.2+dfsg-20) unstable; urgency=medium
+ 
+   * Fixed compiler internal error 2003042401 on mipsel.
+     This error occurs when compiling Lazarus  on mipsel architecture.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 30 Mar 2023 21:31:30 +0200
+ 
+ fpc (3.2.2+dfsg-19) unstable; urgency=medium
+ 
+   * Fixed missing crtbeginS.o on mipsel architecture.
+     Thanks to Peter Blackman<peter@pblackman.plus.com>
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Fri, 17 Mar 2023 13:45:28 +0100
+ 
+ fpc (3.2.2+dfsg-18) unstable; urgency=medium
+ 
+   * Revert "Removed strict dependency on GKT2 libraries."
+     This readds dependency on libgtk2.0-dev. (Closes: Bug#1026719)
+   * Fixed lintian overrides.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 07 Jan 2023 13:07:32 +0100
+ 
+ fpc (3.2.2+dfsg-17) unstable; urgency=medium
+ 
+   * Removed some lintian errors and warnings.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sun, 27 Nov 2022 20:50:54 +0100
+ 
+ fpc (3.2.2+dfsg-16) unstable; urgency=medium
+ 
+   * Removed strict dependency on GKT2 libraries. (Closes: Bug#967348)
+   * Packaged new units and executable programs that were missing until now.
+     (Closes: Bug#1016914)
+   * Updated lintian overrides file to ignore debian/source/timestamps.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 19 Nov 2022 18:35:07 +0100
  
  fpc (3.2.2+dfsg-15) unstable; urgency=medium
  
diff --cc debian/patches/series
index 84133cc5,5b9ded59..26a8736e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -32,5 -32,6 +32,8 @@@ fix-samplecfg-tool.patc
  glibc2.34.patch
  ppc64el-toc-fixes.patch
  pas2jni-cthreads.patch
+ change_fpmake_to_install_missing_package_examples.patch
+ Fix-missing-crtbeginS.o-on-mipsel.patch
+ 5-85c7368759f5fb53aa23e03c8cc27c2deb424b62.patch
 +raspbian.diff
 +force-abi-tags-in-cprt0.patch