From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 28 Jan 2020 21:16:55 +0000 (+0000)
Subject: Merge version 4.1.1-1+rpi1 and 4.1.1-2 to produce 4.1.1-2+rpi1
X-Git-Tag: archive/raspbian/4.1.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1cdb65c20ab119929e55daa3e0995e9dc7f5eb4c;p=tesseract.git

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

1cdb65c20ab119929e55daa3e0995e9dc7f5eb4c
diff --cc debian/changelog
index 557c130,18311d3..973d46e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,18 @@@
- tesseract (4.1.1-1+rpi1) bullseye-staging; urgency=medium
++tesseract (4.1.1-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 23 Jan 2020 01:41:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Jan 2020 21:16:55 +0000
++
+ tesseract (4.1.1-2) unstable; urgency=medium
+ 
+   * Update debian/control:
+     - add build dependency from autoconf-archive (closes: #949119)
+     - add dependency libarchive-dev for libtesseract-dev (closes: #949140)
+ 
+  -- Alexander Pozdnyakov <almipo@mail.ru>  Sun, 19 Jan 2020 08:48:59 +0300
  
  tesseract (4.1.1-1) unstable; urgency=medium
  
diff --cc debian/control
index 662c16e,e4a1d5c..7b59f66
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,8 +4,8 @@@ Priority: optiona
  Maintainer: Alexander Pozdnyakov <almipo@mail.ru>
  Build-Depends: debhelper (>= 9), libleptonica-dev (>= 1.75.3),
                 automake, libtool, libarchive-dev, libpango1.0-dev, libcairo2-dev, libicu-dev,
-                libpng-dev, libjpeg-dev, libtiff-dev, zlib1g-dev, git, asciidoc,
+                libpng-dev, libjpeg-dev, libtiff-dev, zlib1g-dev, git, autoconf-archive, asciidoc,
 -               xsltproc, docbook-xsl, docbook-xml, tesseract-ocr-eng (>= 4.00~)
 +               xsltproc, docbook-xsl, docbook-xml, tesseract-ocr-eng (>= 4.00~), dh-autoreconf
  Standards-Version: 4.4.1
  Homepage: https://github.com/tesseract-ocr/
  Vcs-Git: https://github.com/AlexanderP/tesseract-debian.git