summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2018-12-04 14:39:35 -0400
committerJoey Hess2018-12-04 15:18:48 -0400
commitd2a526833f7178a04b00704890cf6ee8c1187618 (patch)
tree72f678d109304890db0d58470d709f5352f68c72 /debian
parent3a9b98f21c3e623006b596dfcf08a079f6212102 (diff)
libghc-stm-dev package won't be in new versions of debian
In Bootstrap, still try to install the package to support bootstrapping to old systems. If it's not available the bootstrapping will still succeed. The added apt-cache check is only to avoid apt complaining when asked to install a not available package. In debian/control, depend on ghc that includes stm, although propellor still supports being used with older versions of ghc Of course this control file is not being used for the package in debian any longer afaik, so something else will be done there.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control6
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 99236fff..776e57cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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.
-- 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),