summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2018-12-30 15:08:00 -0400
committerJoey Hess2018-12-30 15:08:00 -0400
commit84330a9a6dcd1dd2f2afa3f0ad5a8f07bd26f9d5 (patch)
tree8d31499a1ae4245a8098fcaa56f7107434b18de6 /debian
parent287887cff4e43b64a592121aaa7bc371433dd686 (diff)
parentf0a3ad02488ea89088cc06d112194d9db3b751e3 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control6
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e9c8bb00..c870e48a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
propellor (5.5.1) UNRELEASED; urgency=medium
* Some openbsd portability fixes. Thanks, rsiddharth.
+ * Added Libvirt module. Thanks, Sean Whitton.
+ * When bootstrapping on Debian, libghc-stm-dev may not be available,
+ as it's become part of ghc, so check before trying to install it.
+ * Fix build with ghc 8.6.3.
-- Joey Hess <id@joeyh.name> Tue, 23 Oct 2018 11:37:16 -0400
diff --git a/debian/control b/debian/control
index 0a8701a0..5a46822f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Build-Depends:
debhelper (>= 9),
git (>= 2.0),
- ghc (>= 7.6),
+ ghc (>= 8.4.3),
cabal-install,
libghc-async-dev,
libghc-split-dev,
@@ -16,7 +16,6 @@ Build-Depends:
libghc-mtl-dev,
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),
- libghc-stm-dev,
libghc-text-dev,
libghc-hashable-dev,
Maintainer: Joey Hess <id@joeyh.name>
@@ -28,7 +27,7 @@ Package: propellor
Architecture: any
Section: admin
Depends: ${misc:Depends}, ${shlibs:Depends},
- ghc (>= 7.4),
+ ghc (>= 8.4.3),
cabal-install,
libghc-async-dev,
libghc-split-dev,
@@ -40,7 +39,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-mtl-dev,
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),
- libghc-stm-dev,
libghc-text-dev,
libghc-hashable-dev,
git (>= 2.0),