From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 10 Feb 2021 11:57:55 +0000 (+0000)
Subject: Merge version 4.1.1-2+rpi1 and 4.1.1-2.1 to produce 4.1.1-2.1+rpi1
X-Git-Tag: archive/raspbian/4.1.1-2.1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=643ef033dd3fbdaed16581803bc961ee1ef1b840;p=tesseract.git

Merge version 4.1.1-2+rpi1 and 4.1.1-2.1 to produce 4.1.1-2.1+rpi1
---

643ef033dd3fbdaed16581803bc961ee1ef1b840
diff --cc debian/changelog
index 973d46e,1e976fb..7e83381
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- tesseract (4.1.1-2+rpi1) bullseye-staging; urgency=medium
++tesseract (4.1.1-2.1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 23 Jan 2020 01:41:25 +0000]
 +  * Edit configure.ac to disable -march=native
 +  * Edit control/rules to enable autoreconf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Jan 2020 21:16:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Feb 2021 11:57:55 +0000
++
+ tesseract (4.1.1-2.1) unstable; urgency=medium
+ 
+   [ Peter Green ]
+   * Edit configure.ac to disable -march=native (Closes: #949638)
+   * Edit control/rules to enable autoreconf.
+ 
+  -- Paul Gevers <elbrus@debian.org>  Thu, 04 Feb 2021 21:49:33 +0100
  
  tesseract (4.1.1-2) unstable; urgency=medium