--- Begin Message ---
Source: cups
Version: 2.2.4-8
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Thank you for applying my patch from #837936 to make cups cross build.
Unfortunately, that no longer works. When cross building cups, mantohtml
fails to run again (and #837936 was meant to fix that).
It turns out that man/Makefile is now duplicated to man/Makefile.l10n
and it compiles its own mantohtml there with the builtin rule. Thus it
ends up using the wrong compiler and wrong flags. After copying the
relevant rule to man/Makefile.l10n, cups cross builds again. Please
consider applying the attached patch.
Helmut
diff --minimal -Nru cups-2.2.4/debian/changelog cups-2.2.4/debian/changelog
--- cups-2.2.4/debian/changelog 2017-10-10 13:21:37.000000000 +0200
+++ cups-2.2.4/debian/changelog 2017-10-12 22:43:29.000000000 +0200
@@ -1,3 +1,10 @@
+cups (2.2.4-8.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: fix manpage-translations.patch (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Thu, 12 Oct 2017 22:43:29 +0200
+
cups (2.2.4-8) unstable; urgency=medium
[ Didier Raboud ]
diff --minimal -Nru cups-2.2.4/debian/patches/manpage-translations.patch cups-2.2.4/debian/patches/manpage-translations.patch
--- cups-2.2.4/debian/patches/manpage-translations.patch 2017-10-10 13:08:15.000000000 +0200
+++ cups-2.2.4/debian/patches/manpage-translations.patch 2017-10-12 22:43:29.000000000 +0200
@@ -79,7 +79,7 @@
index 000000000..dca1d716b
--- /dev/null
+++ b/man/Makefile.l10n
-@@ -0,0 +1,248 @@
+@@ -0,0 +1,251 @@
+#
+# "$Id: $"
+#
@@ -316,6 +315,9 @@
+ $(MANTOHTML) `basename $$file .$(MAN8EXT)`.man >../../doc/help/man-`basename $$file .$(MAN8EXT)`.$(LANGUAGE).html; \
+ done
+
++$(MANTOHTML): $(MANTOHTML).c
++ $(CC_FOR_BUILD) -o $@ $<
++
+.SUFFIXES: .man.in .man
+# Keep the generated .man because they are needed for the html rule
+.PRECIOUS: %.man
--- End Message ---
--- Begin Message ---
Source: cups
Source-Version: 2.2.4-9
We believe that the bug you reported is fixed in the latest version of
cups, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 878326@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Didier Raboud <odyx@debian.org> (supplier of updated cups package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 13 Oct 2017 10:32:32 +0200
Source: cups
Binary: libcups2 libcupsimage2 libcupscgi1 libcupsmime1 libcupsppdc1 cups cups-core-drivers cups-daemon cups-client cups-ipp-utils libcups2-dev libcupsimage2-dev cups-bsd cups-common cups-server-common cups-ppdc
Architecture: source
Version: 2.2.4-9
Distribution: unstable
Urgency: medium
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Didier Raboud <odyx@debian.org>
Description:
cups - Common UNIX Printing System(tm) - PPD/driver support, web interfa
cups-bsd - Common UNIX Printing System(tm) - BSD commands
cups-client - Common UNIX Printing System(tm) - client programs (SysV)
cups-common - Common UNIX Printing System(tm) - common files
cups-core-drivers - Common UNIX Printing System(tm) - driverless printing
cups-daemon - Common UNIX Printing System(tm) - daemon
cups-ipp-utils - Common UNIX Printing System(tm) - IPP developer/admin utilities
cups-ppdc - Common UNIX Printing System(tm) - PPD manipulation utilities
cups-server-common - Common UNIX Printing System(tm) - server common files
libcups2 - Common UNIX Printing System(tm) - Core library
libcups2-dev - Common UNIX Printing System(tm) - Development files CUPS library
libcupscgi1 - Common UNIX Printing System(tm) - CGI library
libcupsimage2 - Common UNIX Printing System(tm) - Raster image library
libcupsimage2-dev - Common UNIX Printing System(tm) - Development files CUPS image li
libcupsmime1 - Common UNIX Printing System(tm) - MIME library
libcupsppdc1 - Common UNIX Printing System(tm) - PPD manipulation library
Closes: 878326
Changes:
cups (2.2.4-9) unstable; urgency=medium
.
[ Helmut Grohne ]
* Fix FTCBS; fix manpage-translations.patch (Closes: #878326)
Checksums-Sha1:
ca3c14575eaaa7432d06e74034e81e8dc0853495 3131 cups_2.2.4-9.dsc
e371897d1b012ce8a00207e9bdbc29bfe066acf8 356956 cups_2.2.4-9.debian.tar.xz
ad833977a1e96e997fb030d6e136f454b55dba08 8361 cups_2.2.4-9_source.buildinfo
Checksums-Sha256:
c1048bca74eb1b34247191a39b2854ff689343ceb13d6060e4ca142fc25d8536 3131 cups_2.2.4-9.dsc
4873b7476668ba27d8e7c74f6161262d2096bd4cdb7835e89a0daffb9cf90424 356956 cups_2.2.4-9.debian.tar.xz
bfd8b96ae5418c7bd3c7e9b1e95bedba6824472b977b290e7407ab93d28a7896 8361 cups_2.2.4-9_source.buildinfo
Files:
5f8ea9493b4e87bad612afebb1fc580f 3131 net optional cups_2.2.4-9.dsc
1e519d065026bdc1198b80e60b244fe7 356956 net optional cups_2.2.4-9.debian.tar.xz
5d9bcc3ac552f47753998481f6c60f96 8361 net optional cups_2.2.4-9_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQGzBAEBCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlngfsEACgkQi8+nHsoW
NFVlpgv+Pip7PFLnWu+0XFZXJdqvAYZFZUMPauWly4HnFZAkzjMfrZlARyryEhsC
1BOP5ONsjAD8+LUX5d1U8NtWaUZjxWHoLDAzzf+OQ+IaaWlmN9jaUTfsYTATzqSK
GRww5OulePgdqH5bzQc07ZIjK+/pjMrXxG/H9mfPE28GrU1WObCH1fD28wpXsyjK
5eTUg3fe4K/dNA/WlNAm+/hyvoXqmwpKyUrkSakdcnL+ZnadTmWm8rON23L+kZMc
VlUYJFtnOVTipfcU1LgBSItmxvTdaFDSvamrSu3S4x7dK6enDTU9PP/iBb4GCIDj
86IFAxET13EKokQXok53+pbFpOGBANrbLoWhmHn1qRSdfomRDHlNp0Y3mp+HCLyo
p0OC+TD6+s21NG7ALCkx+WQZg343sTyX7idckjtLaGM4Mh0pJqb03SQhKLnmu/9d
OmzNqTX8jPRsKFzkKyuoeiskiUaT/h89gcBnq1EuW2/z6GVg77fbU9YItckI++vm
S1gJeotO
=1kKX
-----END PGP SIGNATURE-----
--- End Message ---