summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton2016-09-05 11:15:26 -0700
committerSean Whitton2016-09-05 11:15:26 -0700
commitcf9e354619f07d200b804393d5fb0b9ce5aa8370 (patch)
treee156d4efad8c8c5afad54cc1f070e06093c0aeb4
parent3a14e3410790be1457aff595bc4189ca2159a6f9 (diff)
fix sbuild haddock formatting
-rw-r--r--debian/changelog6
-rw-r--r--src/Propellor/Property/Sbuild.hs4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f46b487..9ee8f6e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+propellor (3.1.3) UNRELEASED; urgency=medium
+
+ * Fix Sbuild.hs haddock formatting error.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Mon, 05 Sep 2016 11:14:52 -0700
+
propellor (3.1.2) unstable; urgency=medium
[ Joey Hess ]
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index b55b6e8c..d385b2a6 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -12,8 +12,8 @@ eatmydata. This means we have to make several assumptions:
1. you want to build for a Debian release strictly newer than squeeze,
or for a Buntish release newer than or equal to trusty
-2. if you want to build for Debian stretch or newer, you have sbuild
-0.70.0 or newer (there is a backport to jessie)
+2. if you want to build for Debian stretch or newer, you have sbuild 0.70.0 or
+newer (there is a backport to jessie)
The latter is due to the migration from GnuPG v1 to GnuPG v2.1 in
Debian stretch, which older sbuild can't handle.