Merge version 4.1.1-1+rpi1 and 4.1.1-2 to produce 4.1.1-2+rpi1 archive/raspbian/4.1.1-2+rpi1 raspbian/4.1.1-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Tue, 28 Jan 2020 21:16:55 +0000 (21:16 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Tue, 28 Jan 2020 21:16:55 +0000 (21:16 +0000)
1  2 
debian/changelog
debian/control

index 557c130efb29e7386f43620bc923b30443b99ede,18311d32981afee36a8212fbf7895d3dc51d5aaa..973d46e2b3046b6726cc078bdeb97279d01051cc
@@@ -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 662c16e3309d65426a4e9524d398b21bba590c8d,e4a1d5c5c479b82a587f94072b22899e5fe6aec3..7b59f661925da80cab5e49ad2e7730311a40cd59
@@@ -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