cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-06-30 16:50:33 -04:00
parent a17c048a7b 7cd4c0054f
commit 76c68c6d0a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

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

4
debian/control vendored
View File

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

2
propellor.cabal
View File

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