Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-21 21:08:39 -04:00
commit 072eede646
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -21,6 +21,7 @@ propellor (1.0.0) unstable; urgency=medium
* Propellor can now be used to provision chroots. * Propellor can now be used to provision chroots.
* systemd-nspawn containers can now be managed by propellor, very similar * systemd-nspawn containers can now be managed by propellor, very similar
to its handling of docker containers. to its handling of docker containers.
* Debian package will be maintained by Gergely Nagy.
-- Joey Hess <joeyh@debian.org> Fri, 21 Nov 2014 20:58:02 -0400 -- Joey Hess <joeyh@debian.org> Fri, 21 Nov 2014 20:58:02 -0400

2
debian/control vendored
View File

@ -16,7 +16,7 @@ Build-Depends:
libghc-quickcheck2-dev, libghc-quickcheck2-dev,
libghc-mtl-dev, libghc-mtl-dev,
libghc-monadcatchio-transformers-dev, libghc-monadcatchio-transformers-dev,
Maintainer: Debian QA Group <packages@qa.debian.org> Maintainer: Gergely Nagy <algernon@madhouse-project.org>
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Vcs-Git: git://git.kitenet.net/propellor Vcs-Git: git://git.kitenet.net/propellor
Homepage: http://propellor.branchable.com/ Homepage: http://propellor.branchable.com/