Your message dated Wed, 12 Jun 2024 16:50:12 +0000
with message-id <e1shraq-00arur...@fasolo.debian.org>
and subject line Bug#1067455: fixed in libgphoto2 2.5.31-3
has caused the Debian Bug report #1067455,
regarding libgphoto2: please reduce build-dependencies by moving things to 
Build-Depends-Indep <!nodoc>
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.)


-- 
1067455: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067455
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: libgphoto2
Version: 2.5.31-2.1
Severity: wishlist
Tags: patch

I noticed that libgphoto2 was blocking some of the rebuilds that are needed
for the 64-bit time_t transition, and was itself not buildable because it
was waiting for graphviz. This has now been resolved, but if libgphoto2 had
fewer build-dependencies, then it could have been built sooner.

Please consider applying the attached patches, also available as
<https://salsa.debian.org/debian-phototools-team/libgphoto2/-/merge_requests/7>.

I have confirmed (using diffoscope) that building with -Pnodoc,nocheck
skips installation of various build-dependencies, and skips production
of the -dev-doc package, but does not otherwise affect the package's
contents.

Thanks,
    smcv
>From 21d265c1b839fcfa0933ddb963788b7f5f9662f1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Mar 2024 17:29:31 +0000
Subject: [PATCH 1/3] d/control: Only require graphviz for Architecture: all
 builds

This reduces the length of dependency chains for bootstrapping or
re-bootstrapping architectures, for example during the 64-bit time_t
transition.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 5847c3c3e..fe7539ff4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian PhotoTools Maintainers <pkg-phototools-de...@alioth-lists.deb
 Uploaders:
  Ferenc Wágner <wf...@debian.org>,
 Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
-               graphviz,
                libcurl4-openssl-dev,
                libexif-dev,
                libgd-dev,
@@ -20,6 +19,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                zlib1g-dev
 Build-Depends-Indep:
  doxygen,
+ graphviz,
 Build-Conflicts: liblockdev1-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
-- 
2.43.0

>From c1605a2af5e0f048fafc6fee788506db4633e6ba Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Mar 2024 17:30:05 +0000
Subject: [PATCH 2/3] d/control, d/rules: Only run rdfind and symlinks if we
 built documentation

---
 debian/control | 4 ++--
 debian/rules   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index fe7539ff4..652ed43a5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,12 +14,12 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                libusb-1.0-0-dev,
                libxml2-dev,
                pkg-config,
-               rdfind,
-               symlinks,
                zlib1g-dev
 Build-Depends-Indep:
  doxygen,
  graphviz,
+ rdfind,
+ symlinks,
 Build-Conflicts: liblockdev1-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
diff --git a/debian/rules b/debian/rules
index b3fcf7ce8..b3c9ee7f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ DOC_IMG=$(CURDIR)/debian/libgphoto2-dev-doc/usr/share/doc/libgphoto2-6t64/libgph
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+built_binaries := $(shell dh_listpackages)
+
 ### soname version - libgphoto2-major:
 major=6t64
 
@@ -27,9 +29,11 @@ override_dh_install:
 		mkdir -p debian/libgphoto2-port12t64/lib/udev && \
 		mv debian/tmp/usr/lib/udev/check-mtp-device \
 			debian/libgphoto2-port12t64/lib/udev/check-mtp-device
+ifneq ($(filter %-doc,$(built_binaries)),)
 	# Using rdfind and symlinks to transform duplicated files in softlinks
 	rdfind -makesymlinks true -makeresultsfile false $(DOC_IMG)
 	symlinks -cr $(DOC_IMG)
+endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 override_dh_installudev:
-- 
2.43.0

>From 4e750496fdbfb0fa64bc2d92b52bf6b3a5dad14b Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 21 Mar 2024 17:31:05 +0000
Subject: [PATCH 3/3] d/control: Don't build -dev-doc package under nodoc
 build-profile

This allows the -l10n package to be built without also needing to build
developer documentation.
---
 debian/control | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 652ed43a5..268997c39 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,10 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                pkg-config,
                zlib1g-dev
 Build-Depends-Indep:
- doxygen,
- graphviz,
- rdfind,
- symlinks,
+ doxygen <!nodoc>,
+ graphviz <!nodoc>,
+ rdfind <!nodoc>,
+ symlinks <!nodoc>,
 Build-Conflicts: liblockdev1-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
@@ -45,6 +45,7 @@ Description: gphoto2 digital camera library (development files)
  This package contains the development files.
 
 Package: libgphoto2-dev-doc
+Build-Profiles: <!nodoc>
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-- 
2.43.0


--- End Message ---
--- Begin Message ---
Source: libgphoto2
Source-Version: 2.5.31-3
Done: Andreas Metzler <ametz...@debian.org>

We believe that the bug you reported is fixed in the latest version of
libgphoto2, 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 1067...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andreas Metzler <ametz...@debian.org> (supplier of updated libgphoto2 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: Wed, 12 Jun 2024 18:16:27 +0200
Source: libgphoto2
Architecture: source
Version: 2.5.31-3
Distribution: unstable
Urgency: medium
Maintainer: Debian PhotoTools Maintainers 
<pkg-phototools-devel@alioth-lists.debian.net>
Changed-By: Andreas Metzler <ametz...@debian.org>
Closes: 1065747 1067455
Changes:
 libgphoto2 (2.5.31-3) unstable; urgency=medium
 .
   [ Andreas Metzler ]
   * Team upload.
   * Also drop lintian-overrides for DEP17 diversions.
   * [lintian] (Build-)depend on pkgconf instead of pkg-config.
 .
   [ Helmut Grohne ]
   * Drop unnecessary DEP17 diversions: Affected files renamed for time64.
     Closes: #1065747
 .
   [Simon McVittie]
   * Only require graphviz for Architecture: all builds
   * Only run rdfind and symlinks if we built documentation.
   * Don't build -dev-doc package under nodoc build-profile.
     Closes: #1067455
Checksums-Sha1: 
 887eaa7feb7f4d6c8076f1477bb9812fdc689a66 2874 libgphoto2_2.5.31-3.dsc
 2a4f677722fe315d0556825981fa7c91fd02d165 100264 
libgphoto2_2.5.31-3.debian.tar.xz
Checksums-Sha256: 
 e9d1f34420fb9f04edab6c58bb29e8c0db0ec8d3201c07d57acb83bc8c677f25 2874 
libgphoto2_2.5.31-3.dsc
 764e7124bd4e0eb5d83c9c2b003df49aed86b8010092e22f658f0d291cc1a212 100264 
libgphoto2_2.5.31-3.debian.tar.xz
Files: 
 2b0e1ddac92359fa89a4a60e0daab14b 2874 libs optional libgphoto2_2.5.31-3.dsc
 f6cda10980cf9bec1061466b7706c749 100264 libs optional 
libgphoto2_2.5.31-3.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIyBAEBCgAdFiEE0uCSA5741Jbt9PpepU8BhUOCFIQFAmZpy/gACgkQpU8BhUOC
FITKDA/4hbRRrLBTD/Rr9EyrOokJuoLW1agrQpMSVPxB8HiNVe14ApJSYt411h+l
j3NnJqvWcu6b2mibSCq/0WB80lKOfA0d09B3CsImKKggSf4XSEaoeBFHUEDIZv29
GAAzrf/bemtQHXiBLy/clwcwMSbVpkuwqSmX6y/3KhGUrGrqJxulhnzSK+ToEgPa
Axm9qf+lXW4kBYsZfnD3SYbdPejrbZm+4BLL4wwSNJcpT5d+1FmOHPuwWwXQm5w+
8K+1Uzx1EJH3TOcUJlNfiaexrMqzzIFwg+JPHAHVGoklxyLAGCGOGf6wbNpItRlc
Tbk9C1bvr0jbkvJvE5US6Sb9E22EFO/hHLnUFBnJ+/5whNOAyZpAZJWHVF1Xdc2+
Vwj068Owohpxww+k6AxFVHYAODclfdj8CwiJVMYQy62llHFJ5R/z1wAwls3GaXTw
FQ2W0IhPMLOfXtACbgUFGoFRkORKa4/bvTMsDBsqIqW/8TS1gWIeojLLSm1jcinV
3+QmynjmGrfZbQJRg0JHRJfxDUEUo9xDKIxXy144BPLaW880TTrSe7IaCbeWP7un
Jy1wVwF6ehZ6G+pRUtA7YSvlKTbX/5A9S+IMQ8A2j+bG55SbVj7uHUngXk3sPUWm
WzlhWNx0quNSM+jIQvzY+vhO+k5FHl38NoCBm+7jpGSAsm5+0A==
=O9de
-----END PGP SIGNATURE-----

Attachment: pgp46LOGnD3km.pgp
Description: PGP signature


--- End Message ---

Reply via email to