diff -Nru tesseract-4.1.1/debian/changelog tesseract-4.1.1/debian/changelog
--- tesseract-4.1.1/debian/changelog 2020-01-19 05:48:59.000000000 +0000
+++ tesseract-4.1.1/debian/changelog 2020-01-28 21:16:55.000000000 +0000
@@ -1,3 +1,11 @@
+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.
+
+ -- 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:
diff -Nru tesseract-4.1.1/debian/control tesseract-4.1.1/debian/control
--- tesseract-4.1.1/debian/control 2020-01-19 05:47:02.000000000 +0000
+++ tesseract-4.1.1/debian/control 2020-01-28 21:16:55.000000000 +0000
@@ -5,7 +5,7 @@
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, 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
diff -Nru tesseract-4.1.1/debian/patches/no-march-native tesseract-4.1.1/debian/patches/no-march-native
--- tesseract-4.1.1/debian/patches/no-march-native 1970-01-01 00:00:00.000000000 +0000
+++ tesseract-4.1.1/debian/patches/no-march-native 2020-01-28 21:16:55.000000000 +0000
@@ -0,0 +1,28 @@
+Description: Edit configure.ac to disable -march=native
+ -march=native is inappropriate for a binary distribution like Debian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-01-23
+
+--- tesseract-4.1.1.orig/configure.ac
++++ tesseract-4.1.1/configure.ac
+@@ -136,7 +136,7 @@ AM_CONDITIONAL([FMA_OPT], $fma)
+ AX_CHECK_COMPILE_FLAG([-msse4.1], [sse41=true], [sse41=false], [$WERROR])
+ AM_CONDITIONAL([SSE41_OPT], $sse41)
+
+-AX_CHECK_COMPILE_FLAG([-march=native], [arch_native=true], [arch_native=false], [$WERROR])
++AX_CHECK_COMPILE_FLAG([-march=native], [arch_native=false], [arch_native=false], [$WERROR])
+ AM_CONDITIONAL([MARCH_NATIVE_OPT], $arch_native)
+
+ AC_ARG_WITH([extra-includes],
diff -Nru tesseract-4.1.1/debian/patches/series tesseract-4.1.1/debian/patches/series
--- tesseract-4.1.1/debian/patches/series 2019-12-26 20:46:07.000000000 +0000
+++ tesseract-4.1.1/debian/patches/series 2020-01-28 21:16:55.000000000 +0000
@@ -2,3 +2,4 @@
#fix-up-headers
helptext
#shebang.diff
+no-march-native
diff -Nru tesseract-4.1.1/debian/rules tesseract-4.1.1/debian/rules
--- tesseract-4.1.1/debian/rules 2019-12-26 20:46:07.000000000 +0000
+++ tesseract-4.1.1/debian/rules 2020-01-28 21:16:55.000000000 +0000
@@ -16,7 +16,7 @@
endif
%:
- dh $@ --parallel
+ dh $@ --parallel --with autoreconf
override_dh_auto_build:
make -j$(NUMJOBS)