Bug#811057: FTBFS: config.guess: Hunk #1 FAILED at 3

[Logan Rosen]

Package: tkgate
Version: 2.0~b10-4
Followup-For: Bug #811057
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Remove debian/patches/03_config.diff from series, as debhelper now
updates config.{sub,guess} automatically, causing the patch to not apply
cleanly.
  * Remove autotools-dev from debian/{control,rules}, as it is no longer
necessary due to debhelper's aforementioned new automatic behavior.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-7-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u tkgate-2.0~b10/debian/control tkgate-2.0~b10/debian/control
--- tkgate-2.0~b10/debian/control
+++ tkgate-2.0~b10/debian/control
@@ -1,13 +1,12 @@
 Source: tkgate
 Section: electronics
 Priority: optional
-Maintainer: Ubuntu Developers 
-XSBC-Original-Maintainer: Debian Science Maintainers 
+Maintainer: Debian Science Maintainers 
 Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) ,
 	   Georges Khaznadar 
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>=7.0.50~), tcl8.5-dev, tk8.5-dev, bison|byacc, flex,
- xutils-dev, libx11-dev, quilt (>= 0.46-7~), autotools-dev,
+ xutils-dev, libx11-dev, quilt (>= 0.46-7~),
  hardening-wrapper
 Homepage: http://www.tkgate.org/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/tkgate.git
diff -u tkgate-2.0~b10/debian/patches/series tkgate-2.0~b10/debian/patches/series
--- tkgate-2.0~b10/debian/patches/series
+++ tkgate-2.0~b10/debian/patches/series
@@ -1,5 +1,4 @@
 01_paths.diff
-03_config.diff
 04_typos.diff
 hardening.patch
 remove-shebang-line.patch
diff -u tkgate-2.0~b10/debian/rules tkgate-2.0~b10/debian/rules
--- tkgate-2.0~b10/debian/rules
+++ tkgate-2.0~b10/debian/rules
@@ -5,7 +5,7 @@
 export DEB_BUILD_HARDENING=1
 
 %:
-	dh $@ --with quilt,autotools_dev
+	dh $@ --with quilt
 
 override_dh_auto_configure:
 	dh_auto_configure -- LDFLAGS="$(LDFLAGS) -Wl,--as-needed -lm"

Bug#811057: FTBFS: config.guess: Hunk #1 FAILED at 3

[Martin Michlmayr]

Package: tkgate
Version: 2.0~b10-4

tkgate fails to build in unstable:

> sbuild (Debian sbuild) 0.67.0 (26 Dec 2015) on dl580gen9-02.hlinux
...
> dh clean --with quilt,autotools_dev
>dh_testdir
>dh_auto_clean
>dh_quilt_unpatch
> No patch removed
>dh_autotools-dev_restoreconfig
>debian/rules override_dh_clean
> make[1]: Entering directory '/<>'
> dh_clean
> rm -f libexec/*
> make[1]: Leaving directory '/<>'
>  debian/rules build
> dh build --with quilt,autotools_dev
>dh_testdir
>dh_update_autotools_config
>dh_quilt_patch
> Applying patch 01_paths.diff
> patching file scripts/parms.tcl
> patching file src/tkgate/verilog_out.c
> 
> Applying patch 03_config.diff
> patching file config.guess
> Hunk #1 FAILED at 3.
> 1 out of 1 hunk FAILED -- rejects in file config.guess
> patching file config.sub
> Hunk #1 FAILED at 3.
> 1 out of 1 hunk FAILED -- rejects in file config.sub
> Patch 03_config.diff does not apply (enforce with -f)
> dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned 
> exit code 1
> debian/rules:8: recipe for target 'build' failed

-- 
Martin Michlmayr
Linux for HPE Helion, Hewlett Packard Enterprise