Skip to content
Snippets Groups Projects

Move several dependencies to Build-Depends-Indep <!nodoc>

Merged Simon McVittie requested to merge smcv/libgphoto2:nodoc into debian/master
1 unresolved thread
  • 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.

  • d/control, d/rules: Only run rdfind and symlinks if we built documentation

  • 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.

Closes: #1067455

The second and third commits are optional, the first is the highest-impact.

Edited by Simon McVittie

Merge request reports

Pipeline #655535 failed

Pipeline failed for 4e750496 on smcv:nodoc

Approved by

Merged by Andreas MetzlerAndreas Metzler 1 year ago (Mar 29, 2024 3:45pm UTC)

Merge details

  • Changes merged into debian/master with d04c52e9.
  • Deleted the source branch.

Pipeline #659035 failed

Pipeline failed for d04c52e9 on debian/master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
27 29 mkdir -p debian/libgphoto2-port12t64/lib/udev && \
28 30 mv debian/tmp/usr/lib/udev/check-mtp-device \
29 31 debian/libgphoto2-port12t64/lib/udev/check-mtp-device
32 ifneq ($(filter %-doc,$(built_binaries)),)
  • Drive-by remark: This could probably move to a execute_after_dh_install-indep: with the same effect but less make conditional (assuming "modern enough debhelper", which I did not check for). The existing -test part above could probably go into an execute_after_dh_install-arch: target at the same time.

  • Author Contributor

    I didn't want to make stylistic changes that could conflict with how the package's maintainers would prefer this to look, but the maintainers are of course welcome to do this however they think is best.

    If the maintainers want my third commit "d/control: Don't build -dev-doc package under nodoc build-profile" then this part would still need to be conditional on whether we're building the -dev-doc (and therefore whether rdfind and symlinks are guaranteed to be installed), so it would still need the ifneq.

    If the maintainers would prefer to only take the first two commits (which bring 95% of the benefit), then yes this could move to an execute_after_dh_install-indep and would no longer need a make conditional.

  • Please register or sign in to reply
  • Simon McVittie marked this merge request as ready

    marked this merge request as ready

  • Simon McVittie changed the description

    changed the description

  • Thank you!

  • Andreas Metzler approved this merge request

    approved this merge request

  • Andreas Metzler mentioned in commit d04c52e9

    mentioned in commit d04c52e9

  • Andreas Metzler mentioned in commit d9b9cad4

    mentioned in commit d9b9cad4

  • Please register or sign in to reply
    Loading