/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 07:04:52 UTC
  • Revision ID: teddy@recompile.se-20240908070452-oyxj1zojswt0aft5
http://bugs.debian.org/1069689
Fix #1069689 by using pkg-config in debian/rules

The directory for systemd unit files (output of "pkg-config systemd
--variable=systemdsystemunitdir") has changed.  But there was a
hardcoded instance of this directory in debian/mandos.dirs.  Fix this
by removing the directory from debian/mandos.dirs, and instead
creating the correct directory explicitly in debian/rules.

* debian/mandos.dirs (lib/systemd/system): Removed.
* debian/rules (PKG_CONFIG): New; copied from Makefile.
  (override_dh_installdirs-indep): New; run dh_installdirs twice:
  first normally, and again for the systemd unit file directory.

Closes: #1069689
Reported-By: Helmut Grohne <helmut@subdivi.de>
Thanks: Helmut Grohne <helmut@subdivi.de> for report and analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
9
9
    MAKEFLAGS += -j$(NUMJOBS)
10
10
endif
11
11
 
 
12
PKG_CONFIG?=pkg-config
 
13
 
12
14
%:
13
15
        dh $@
14
16
 
 
17
override_dh_installdirs-indep:
 
18
        dh_installdirs
 
19
        dh_installdirs $(patsubst /%,%,$(shell $(PKG_CONFIG) \
 
20
                systemd --variable=systemdsystemunitdir))
 
21
 
15
22
override_dh_auto_build-arch:
16
23
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
17
24
 
35
42
                --exclude etc/mandos/plugin-helpers \
36
43
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugins.d \
37
44
                --exclude usr/lib/$(DEB_HOST_MULTIARCH)/mandos/plugin-helpers \
38
 
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
 
45
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d/
39
46
        chmod --recursive g-w -- \
40
47
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
41
48
 
43
50
        dh_fixperms --exclude etc/mandos/clients.conf
44
51
 
45
52
override_dh_auto_test-arch: ;
 
53
 
 
54
#bpo## dpkg-shlibdeps sees the "libgnutls28-dev (>= 3.6.6) |
 
55
#bpo## libgnutls28-dev (<< 3.6.0)," in the build-dependencies not as two
 
56
#bpo## alternatives, but as an absolute dependency on libgnutls30 >= 3.6.6.
 
57
#bpo## So we have to do this ugly hack to hide this build dependency if we
 
58
#bpo## compiled with libgnutls30 << 3.6.0.
 
59
#bpo#override_dh_shlibdeps-arch:
 
60
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
61
#bpo#           --show libgnutls30); \
 
62
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
63
#bpo#           && { cp --archive debian/control debian/control.orig; sed --in-place --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
 
64
#bpo#   dh_shlibdeps
 
65
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
66
#bpo#           --show libgnutls30); \
 
67
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
68
#bpo#           && mv debian/control.orig debian/control