From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 24 Jul 2022 06:38:25 +0000 (+0100)
Subject: Merge version 2.6.12-117+rpi1 and 2.6.12-118 to produce 2.6.12-118+rpi1
X-Git-Tag: archive/raspbian/2.7.1-4+rpi1~1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1506d88baa4aefc4e4a70ffd0576a2841e929887;p=gcl27.git

Merge version 2.6.12-117+rpi1 and 2.6.12-118 to produce 2.6.12-118+rpi1
---

1506d88baa4aefc4e4a70ffd0576a2841e929887
diff --cc debian/changelog
index be830e6,74a030f..7b88546
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- gcl (2.6.12-117+rpi1) bookworm-staging; urgency=medium
++gcl (2.6.12-118+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.12-83+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 23:08:39 +0000]
 +  * Make an error message more explicit.
 +  * Use the "arm" not the "armhf" relocations code,
 +    the "armhf" code is intended for systems that use thumb, which raspbian
 +    doesn't.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 03:25:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Jul 2022 06:38:25 +0000
++
+ gcl (2.6.12-118) unstable; urgency=medium
+ 
+   * Bug fix: "emacs dependency should be &quot;emacs | emacsen&quot;",
+     thanks to Adrian Bunk (Closes: #1006617).
+   * Bug fix: "Please remove dependency on install-info", thanks to
+     hille42@web.de</a>; (Closes: #1013691).
+   * Version_2.6.13pre118
+ 
+  -- Camm Maguire <camm@debian.org>  Tue, 12 Jul 2022 17:17:09 -0400
  
  gcl (2.6.12-117) unstable; urgency=medium