Your message dated Fri, 15 Feb 2019 23:04:07 +0000
with message-id <[email protected]>
and subject line Bug#922408: fixed in dwdiff 2.1.2-2
has caused the Debian Bug report #922408,
regarding dwdiff FTCBFS: uses the wrong pkg-config
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
922408: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922408
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: dwdiff
Version: 2.1.2-1
Tags: patch
User: [email protected]
Usertags: rebootstrap
dwdiff fails to cross build from source, becaue it uses the build
architecture pkg-config where it needs the host architecture one. The
attached patch makes dwdiff cross buildable. Please consider applying
it.
Helmut
diff --minimal -Nru dwdiff-2.1.2/debian/changelog dwdiff-2.1.2/debian/changelog
--- dwdiff-2.1.2/debian/changelog 2018-12-10 20:21:45.000000000 +0100
+++ dwdiff-2.1.2/debian/changelog 2019-02-15 15:49:38.000000000 +0100
@@ -1,3 +1,10 @@
+dwdiff (2.1.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Fri, 15 Feb 2019 15:49:38 +0100
+
dwdiff (2.1.2-1) unstable; urgency=medium
* New upstream version
diff --minimal -Nru dwdiff-2.1.2/debian/patches/cross.patch
dwdiff-2.1.2/debian/patches/cross.patch
--- dwdiff-2.1.2/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ dwdiff-2.1.2/debian/patches/cross.patch 2019-02-15 15:49:36.000000000
+0100
@@ -0,0 +1,36 @@
+--- dwdiff-2.1.2.orig/config.pkg
++++ dwdiff-2.1.2/config.pkg
+@@ -125,11 +125,12 @@
+ fi
+
+ if [ "yes" = "${with_unicode}" ] ; then
++ : "${PKG_CONFIG:=pkg-config}"
+ {
+ check_message "Checking for ICU pkg-config... "
+ {
+- echo "Running pkg-config --cflags --libs
icu-uc" >> config.log
+- if pkg-config --cflags --libs icu-uc 2>&1 >
/dev/null ; then
++ echo "Running $PKG_CONFIG --cflags --libs
icu-uc" >> config.log
++ if $PKG_CONFIG --cflags --libs icu-uc 2>&1 >
/dev/null ; then
+ check_message_result "yes"
+ true
+ else
+@@ -156,15 +157,15 @@
+ }
+ EOF
+ clean .config.o
+- test_link "functions in libicu"
ICUFLAGS="\`pkg-config --cflags icu-uc\`" ICULIBS="\`pkg-config --libs icu-uc\`"
++ test_link "functions in libicu"
ICUFLAGS="\`$PKG_CONFIG --cflags icu-uc\`" ICULIBS="\`$PKG_CONFIG --libs
icu-uc\`"
+ }
+ } || {
+ check_message_result "!! Could not compile with Unicode
support. Try configuring with --without-unicode."
+ exit 1
+ }
+
+- ICUFLAGS="-DUSE_UNICODE \`pkg-config --cflags icu-uc\`"
+- ICULIBS="\`pkg-config --libs icu-uc\`"
++ ICUFLAGS="-DUSE_UNICODE \`$PKG_CONFIG --cflags icu-uc\`"
++ ICULIBS="\`$PKG_CONFIG --libs icu-uc\`"
+ if checkfunction "nl_langinfo" "nl_langinfo(CODESET);"
"<langinfo.h>" ; then
+ ICUFLAGS="${ICUFLAGS} -DUSE_NL_LANGINFO"
+ fi
diff --minimal -Nru dwdiff-2.1.2/debian/patches/series
dwdiff-2.1.2/debian/patches/series
--- dwdiff-2.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ dwdiff-2.1.2/debian/patches/series 2019-02-15 15:47:27.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru dwdiff-2.1.2/debian/rules dwdiff-2.1.2/debian/rules
--- dwdiff-2.1.2/debian/rules 2018-06-04 14:43:13.000000000 +0200
+++ dwdiff-2.1.2/debian/rules 2019-02-15 15:47:46.000000000 +0100
@@ -24,6 +24,7 @@
-include /usr/share/dpkg/buildtools.mk
export CC
+export PKG_CONFIG ?= pkg-config
export CFLAGS = \
$(shell dpkg-buildflags --get CFLAGS) \
$(shell dpkg-buildflags --get CPPFLAGS)
--- End Message ---
--- Begin Message ---
Source: dwdiff
Source-Version: 2.1.2-2
We believe that the bug you reported is fixed in the latest version of
dwdiff, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Barak A. Pearlmutter <[email protected]> (supplier of updated dwdiff 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 15 Feb 2019 20:53:28 +0000
Source: dwdiff
Binary: dwdiff dwdiff-dbgsym
Architecture: source amd64
Version: 2.1.2-2
Distribution: unstable
Urgency: medium
Maintainer: Barak A. Pearlmutter <[email protected]>
Changed-By: Barak A. Pearlmutter <[email protected]>
Description:
dwdiff - diff program that operates word by word
Closes: 922408
Changes:
dwdiff (2.1.2-2) unstable; urgency=medium
.
[ Helmut Grohne ]
* Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #922408)
.
[ Barak A. Pearlmutter ]
* Accept patch
* Tell gbp the upstream tarball is .xz
* Bump policy version
* Bump to debhelper 12
Checksums-Sha1:
63b704d467c9297ec6c282d56df6c91c496b0ce2 1823 dwdiff_2.1.2-2.dsc
a0d3baf4ee7b27857a237f181495f22bdee467bc 4284 dwdiff_2.1.2-2.debian.tar.xz
ee641808b944d21a552cf8265429041fdbef6900 84300 dwdiff-dbgsym_2.1.2-2_amd64.deb
87eaf57155220c21e11ee813e0662f24fab18c57 5722 dwdiff_2.1.2-2_amd64.buildinfo
1655aa6234a59194b58507b1ab689bd9ccf99c7d 59704 dwdiff_2.1.2-2_amd64.deb
Checksums-Sha256:
85a4a629932d3460278d3d6d93b67620a3fa7c8ef82af1a55a0da335f896a04a 1823
dwdiff_2.1.2-2.dsc
4428de6319059aa947664bfd2eb11da5a5b1e39b5e47f02a101dc3d6ed18608f 4284
dwdiff_2.1.2-2.debian.tar.xz
b53906e1f96c17dc5d324671f2c74857b63561b9a1006663cb5446ecaae85de4 84300
dwdiff-dbgsym_2.1.2-2_amd64.deb
6bee6226e86a3501794dedaf5efa8ce588f582541b24a0a7838060040f633867 5722
dwdiff_2.1.2-2_amd64.buildinfo
f83d5f9d93130f305133c06f6dae319fd684422cd02f7d68274d67430a0cb58a 59704
dwdiff_2.1.2-2_amd64.deb
Files:
81c0f5d98a63410434b6bd5a9db30f89 1823 utils optional dwdiff_2.1.2-2.dsc
1f880dfc4c6b3bba420b7f2720ccb03a 4284 utils optional
dwdiff_2.1.2-2.debian.tar.xz
f2b74c488f7370feb41a47d4544456eb 84300 debug optional
dwdiff-dbgsym_2.1.2-2_amd64.deb
73b002362b9ff5bd5299fb83312e8dbe 5722 utils optional
dwdiff_2.1.2-2_amd64.buildinfo
a8cfcd8d8420ffb7dedce8c72499e92d 59704 utils optional dwdiff_2.1.2-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEZPQp426hHMLZZlRvEltXR14ZDRgFAlxnQFsACgkQEltXR14Z
DRiJTg/+LiWJwy79bTODIlVUPV/P/gOTX/yKgHPz6+U9l5FZ8MMsD+WOFnuVvLk5
cx+nmwetLaztew3f+i8rNFZRWCAm3emC2VYKlgYsfeGsAKsOilxxown5m+AjkqWy
eBQQpFZ71Bx/5UwowObXkmqbvUlpFaobH1oCnYRvCapbVHD8sJblDHy7ufxDTVkr
ncyhxRf+iYcKRdj+4h78LjKQJhN5TKYPppovZLg5Q6LCcxQpKYBHJX03b8CW4wh+
z6q9UlUktW1ZL5nehljhK0lO3nY3LTwnPwuzVlrPkKR3f5lFasPn9n+wWdfeN3ig
LiTDzoDzZWNqmq5xpMpinDFb0trf7gJRAp7u02XohuFKHXtsGZHkAXPJjiWSuM4D
tdRronxLciHEmg2feuKDPo4qnrDdcWEVA8iShOxL6JRv5EYM86MpuHIm7+0fImJU
e/Wwm/6ZDWSWZtpV+7PkINm5hwDQ5mMxhTa0cwIYx14scNXoG+bZV2fJUtcj2ysZ
VtVuKGRbr9v1aX14d59Mc8kqxkZanjC5gXDREGfuIaINlTH8md/JWkCqkQ6wvfIA
6crdH/05nDJRvORnoi6suivbM9NXdcRH9WugeEvLf3Jb19IVz9ubjFy2BUGCXItJ
Fmt4GnvMyVpzkZFoTH2/h+ZQ2bPE7pJSj/Fw0BEtHpLXZamdR7c=
=xWyG
-----END PGP SIGNATURE-----
--- End Message ---
