/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 07:04:52 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • 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:
mandos.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2019-06-20">
 
6
<!ENTITY TIMESTAMP "2023-04-30">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
69
69
  <refsect1 id="description">
70
70
    <title>DESCRIPTION</title>
71
71
    <para>
72
 
      The file &CONFPATH; is a simple configuration file for
 
72
      The file &CONFPATH; is a configuration file for
73
73
      <citerefentry><refentrytitle>mandos</refentrytitle>
74
74
      <manvolnum>8</manvolnum></citerefentry>, and is read by it at
75
75
      startup.  The configuration file starts with <quote><literal