Merge branch 'joeyconfig'

debian/changelog

@@ -4,6 +4,7 @@ propellor (2.6.0) UNRELEASED; urgency=medium
     which allows to specify an image name and an optional tag. (API change)
     Thanks, Antoine Eiche.
   * Added --unset to delete a privdata field.
+  * Version dependency on exceptions.
 
  -- Joey Hess <id@joeyh.name>  Tue, 16 Jun 2015 14:49:12 -0400
 

debian/control

@@ -16,7 +16,7 @@ Build-Depends:
 	libghc-quickcheck2-dev,
 	libghc-mtl-dev,
 	libghc-transformers-dev,
-	libghc-exceptions-dev,
+	libghc-exceptions-dev (>= 0.6),
 Maintainer: Gergely Nagy <algernon@madhouse-project.org>
 Standards-Version: 3.9.6
 Vcs-Git: git://git.joeyh.name/propellor
@@ -38,7 +38,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 	libghc-quickcheck2-dev,
 	libghc-mtl-dev,
 	libghc-transformers-dev,
-	libghc-exceptions-dev,
+	libghc-exceptions-dev (>= 0.6),
 	git,
 Description: property-based host configuration management in haskell
  Propellor enures that the system it's run in satisfies a list of

propellor.cabal

@@ -38,7 +38,7 @@ Executable propellor
   Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5,
    IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal,
    containers, network, async, time, QuickCheck, mtl, transformers,
-   exceptions
+   exceptions (>= 0.6)
 
   if (! os(windows))
     Build-Depends: unix