summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Schmidt <berni@debian.org>2020-08-16 10:39:34 +0200
committerBernhard Schmidt <berni@debian.org>2020-08-16 10:39:34 +0200
commit62f9a3c02950839ef9eb5f5fb4cbdd7b7d33ccbc (patch)
tree758a6af55fa1a4620f8d9fd28617e4e9844a0670
parent7ba9d08967531199c7644c963b44493f1b67454e (diff)
Changelog for 2.5~beta1-2debian/2.5_beta1-2
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e0afaef..dffc4ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvpn (2.5~beta1-2) experimental; urgency=medium
+
+ * Set Build-Conflicts: systemctl, see Bug#959828
+
+ -- Bernhard Schmidt <berni@debian.org> Sun, 16 Aug 2020 10:33:47 +0200
+
openvpn (2.5~beta1-1) experimental; urgency=medium
* d/gbp.conf for experimental 2.5 branch
diff --git a/debian/control b/debian/control
index adf3f70..ca71b4e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
python3-docutils,
systemd [linux-any]
# systemctl from src:docker-systemctl-replacement declaring Provides: systemd
+# only necessary for experimental with the apscud resolver
# See Bug#959828
Build-Conflicts: systemctl
Standards-Version: 4.5.0