Your message dated Sat, 19 Aug 2017 15:07:09 +0000 with message-id <e1dj5lb-0009ms...@fasolo.debian.org> and subject line Bug#858097: fixed in gphoto2 2.5.14-1 has caused the Debian Bug report #858097, regarding gphoto2 FTCBFS: uses build architecture 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 ow...@bugs.debian.org immediately.) -- 858097: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858097 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Source: gphoto2 Version: 2.5.11-1 Tags: patch upstream User: helm...@debian.org Usertags: rebootstrap gphoto2 fails to cross build from source, because it uses the build architecture pkg-config when the host architecture one is needed. The cause is on the GP_PKG_CONFIG macro, which fails to consider $ac_tool_prefix. The upstream macro PKG_PROG_PKG_CONFIG does a better job at solving the same problem and simply replacing the failing macro fixes the cross build. Please consider applying the attached patch after stretch is released. Helmutdiff --minimal -Nru gphoto2-2.5.11/debian/changelog gphoto2-2.5.11/debian/changelog --- gphoto2-2.5.11/debian/changelog 2016-11-23 14:10:38.000000000 +0100 +++ gphoto2-2.5.11/debian/changelog 2017-03-18 10:11:58.000000000 +0100 @@ -1,3 +1,10 @@ +gphoto2 (2.5.11-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: cross.patch (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Sat, 18 Mar 2017 10:11:58 +0100 + gphoto2 (2.5.11-1) unstable; urgency=medium * New upstream release. diff --minimal -Nru gphoto2-2.5.11/debian/control gphoto2-2.5.11/debian/control --- gphoto2-2.5.11/debian/control 2016-11-05 17:48:16.000000000 +0100 +++ gphoto2-2.5.11/debian/control 2017-03-18 10:06:31.000000000 +0100 @@ -4,8 +4,8 @@ Maintainer: Debian PhotoTools Maintainers <pkg-phototools-de...@lists.alioth.debian.org> Uploaders: Herbert Parentes Fortes Neto <h...@debian.org> Build-Depends: - autotools-dev, debhelper (>= 9), + dh-autoreconf, libaa1-dev, libcdk5-dev, libexif-dev (>= 0.5.9), diff --minimal -Nru gphoto2-2.5.11/debian/patches/cross.patch gphoto2-2.5.11/debian/patches/cross.patch --- gphoto2-2.5.11/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2-2.5.11/debian/patches/cross.patch 2017-03-18 10:11:53.000000000 +0100 @@ -0,0 +1,77 @@ +From: Helmut Grohne <hel...@subdivi.de> +Subject: fix cross compilation + +Replace broken macro GP_PKG_CONFIG with upstream macro PKG_PROG_PKG_CONFIG. + +Index: gphoto2-2.5.11/gphoto-m4/gp-check-library.m4 +=================================================================== +--- gphoto2-2.5.11.orig/gphoto-m4/gp-check-library.m4 ++++ gphoto2-2.5.11/gphoto-m4/gp-check-library.m4 +@@ -106,7 +106,7 @@ + # ---------------------------------------------------------------------- + dnl + AC_REQUIRE([GP_CONFIG_MSG])dnl +-AC_REQUIRE([GP_PKG_CONFIG])dnl ++AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl + # Use _CFLAGS and _LIBS given to configure. + # This makes it possible to set these vars in a configure script +Index: gphoto2-2.5.11/gphoto-m4/gp-pkg-config.m4 +=================================================================== +--- gphoto2-2.5.11.orig/gphoto-m4/gp-pkg-config.m4 ++++ /dev/null +@@ -1,42 +0,0 @@ +-dnl @synopsis GP_PKG_CONFIG +-dnl +-dnl If you want to set the PKG_CONFIG_PATH, best do so before +-dnl calling GP_PKG_CONFIG +-AC_DEFUN([GP_PKG_CONFIG],[ +-# +-# [GP_PKG_CONFIG] +-# +-AC_ARG_VAR([PKG_CONFIG],[pkg-config package config utility]) +-export PKG_CONFIG +-AC_ARG_VAR([PKG_CONFIG_PATH],[directory where pkg-config looks for *.pc files]) +-export PKG_CONFIG_PATH +- +-AC_MSG_CHECKING([PKG_CONFIG_PATH]) +-if test "x${PKG_CONFIG_PATH}" = "x"; then +- AC_MSG_RESULT([empty]) +-else +- AC_MSG_RESULT([${PKG_CONFIG_PATH}]) +-fi +- +-dnl AC_REQUIRE([PKG_CHECK_MODULES]) +-AC_PATH_PROG([PKG_CONFIG],[pkg-config],[false]) +-if test "$PKG_CONFIG" = "false"; then +-AC_MSG_ERROR([ +-*** Build requires pkg-config +-*** +-*** Possible solutions: +-*** - set PKG_CONFIG to where your pkg-config is located +-*** - set PATH to include the directory where pkg-config is installed +-*** - get it from http://freedesktop.org/software/pkgconfig/ and install it +-]) +-fi +-])dnl +- +-dnl Please do not remove this: +-dnl filetype: d87b877b-80ec-447c-b042-21ec4a27c6f0 +-dnl I use this to find all the different instances of this file which +-dnl are supposed to be synchronized. +- +-dnl Local Variables: +-dnl mode: autoconf +-dnl End: +Index: gphoto2-2.5.11/configure.ac +=================================================================== +--- gphoto2-2.5.11.orig/configure.ac ++++ gphoto2-2.5.11/configure.ac +@@ -35,7 +35,6 @@ + AM_PROG_LIBTOOL + AC_PROG_INSTALL + AC_SYS_LARGEFILE +-GP_PKG_CONFIG + + GP_CONFIG_MSG([Compiler],[${CC}]) + AC_DEFINE_UNQUOTED([HAVE_CC],"$CC",[The C compiler we're using]) diff --minimal -Nru gphoto2-2.5.11/debian/patches/series gphoto2-2.5.11/debian/patches/series --- gphoto2-2.5.11/debian/patches/series 2016-11-23 14:10:38.000000000 +0100 +++ gphoto2-2.5.11/debian/patches/series 2017-03-18 10:07:20.000000000 +0100 @@ -1,3 +1,4 @@ 00-support_now_timevalue.patch 02-do_not_use_PATH_MAX.patch break_line_manpage.patch +cross.patch diff --minimal -Nru gphoto2-2.5.11/debian/rules gphoto2-2.5.11/debian/rules --- gphoto2-2.5.11/debian/rules 2016-11-23 14:10:38.000000000 +0100 +++ gphoto2-2.5.11/debian/rules 2017-03-18 10:07:14.000000000 +0100 @@ -13,4 +13,4 @@ dh_installchangelogs NEWS %: - dh $@ --with autotools_dev + dh $@ --with autoreconf
--- End Message ---
--- Begin Message ---Source: gphoto2 Source-Version: 2.5.14-1 We believe that the bug you reported is fixed in the latest version of gphoto2, 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 858...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Herbert Parentes Fortes Neto <h...@debian.org> (supplier of updated gphoto2 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 ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Sat, 19 Aug 2017 11:25:23 -0300 Source: gphoto2 Binary: gphoto2 Architecture: source Version: 2.5.14-1 Distribution: unstable Urgency: medium Maintainer: Debian PhotoTools Maintainers <pkg-phototools-de...@lists.alioth.debian.org> Changed-By: Herbert Parentes Fortes Neto <h...@debian.org> Description: gphoto2 - digital camera command-line client Closes: 858097 Changes: gphoto2 (2.5.14-1) unstable; urgency=medium . * New upstream version 2.5.14 * DH_LEVEL: 10 * debian/control: - Bump Standards-Version: from 3.9.8 to 4.0.0 * debian/copyright: - Update * debian/rules: - Set autoreconf * debian/patches: - (Closes: #858097) - fix cross compilation patch Checksums-Sha1: bb788c761bd751612df6a5cd351d343582f1527a 2207 gphoto2_2.5.14-1.dsc e9b6f0413a9a2e1aaa72014da8715a8954d21f77 1137240 gphoto2_2.5.14.orig.tar.gz baaaa88497a6589dfe7f265cca708e510a07f0e4 89116 gphoto2_2.5.14-1.debian.tar.xz 59d0917b0766093222831c748843d91e3ccd665d 7100 gphoto2_2.5.14-1_amd64.buildinfo Checksums-Sha256: a32e4afbce1726b58b3bdad0d624ca759486021596adb8f8a0d4e4fb14427c27 2207 gphoto2_2.5.14-1.dsc b85dcdf127b201a705f8c766e172b85191894cdc6b993a3821df3f40f7d01bed 1137240 gphoto2_2.5.14.orig.tar.gz bb1564e2192b3d082f0aabe56e551a9675f55f6ed93d9c233b8b5ff64ff8989f 89116 gphoto2_2.5.14-1.debian.tar.xz 2f685d6d12ce52790cce3d84de44c9cc00305aa5cadaad24f646221818408017 7100 gphoto2_2.5.14-1_amd64.buildinfo Files: 5bbf8531e8876a5888897446ca6078ea 2207 utils optional gphoto2_2.5.14-1.dsc aef94e4c95ad358486fc0776083dc375 1137240 utils optional gphoto2_2.5.14.orig.tar.gz cd8277ad55b9c6d3964308ad6a523fda 89116 utils optional gphoto2_2.5.14-1.debian.tar.xz 99ef819ae05d6eb48dabe3961f1823ae 7100 utils optional gphoto2_2.5.14-1_amd64.buildinfo -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEbiJhr5LBUJGFGPlCVSVvKKxgYRoFAlmYSx8QHGhwZm5AZGVi aWFuLm9yZwAKCRBVJW8orGBhGtCdEACnCYHYcVlQzwPM1lVXP4y0oBtizplOGtqQ 1yun6+GAx5KByYpGV4DABWFChU/GO/2Mp0V/awjjHkNhCrfsyxMF4TOP5FR+SVOx K/2tM3oimfFSwo7TCxR7aI5a6Ukh6VNUMTkPjMpzLmkvZ8iGiGpN70DFJrnG3FPy hWy9pMbHOIP/lugUtugqKF9GcEqUfCdaTJ0FuYEW/HGaBYQJ+1P1Yke1yPynsX6M rJA4sdNt8kcI5zGq2Ml+roPhxD4on8fuvqqRMZiXFAyQcyzeK6x2cLuCQatsvNDZ fHJkJa4ZQg+2RfJKnQsQ2wNvrIOz2tlvD6yx7DVKNTxyKe+gcCT38T3dyYwIzj3f UhbsXLuTaUTtBXk3InRgRpnVfKgOnJayk1XH0tvjTo3gCu9DLLGWopOWj5PyfXFP IEOWVb7hdZTIW7Gi6E4KyYs9BtvgfcAtqkoh5Et7ebO3DccbET/ESFoGhEIJWRtW w55NfNwKVhafrOxKt1PPGpS5f0UKVJK958/3pRnvBa0ZQZZTfjvwSF/hAkYqnXeG vmUH+5/JPPTd/f574n9J/AyWsWuS23nbVvTIoES38ZKr2YK2RLMwT7LL0gqYDp4C tj1kSHQ6SmMGWK2sFy0ZmEdUOzcTiNuOSKzBdNzutKnl3Xc43zI0OJlI2lhguEaa l2xDThwi8g== =JqdF -----END PGP SIGNATURE-----
--- End Message ---
