Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-08 15:57:56 -04:00
commit de50503e4d
3 changed files with 5 additions and 4 deletions

5
debian/changelog vendored
View File

@ -1,12 +1,13 @@
propellor (0.9.2) UNRELEASED; urgency=medium propellor (0.9.2) unstable; urgency=medium
* Added nginx module, contributed by Félix Sipma. * Added nginx module, contributed by Félix Sipma.
* Added firewall module, contributed by Arnaud Bailly. * Added firewall module, contributed by Arnaud Bailly.
* Apache: Fix daemon reload when enabling a new module or site. * Apache: Fix daemon reload when enabling a new module or site.
* Docker: Stop using docker.io; that was a compat symlink in * Docker: Stop using docker.io; that was a compat symlink in
the Debian package which has been removed in docker.io 1.3.1~dfsg1-2. the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
* Orphaned the Debian package, as I am retiring from Debian.
-- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400 -- Joey Hess <joeyh@debian.org> Sat, 08 Nov 2014 15:57:36 -0400
propellor (0.9.1) unstable; urgency=medium propellor (0.9.1) unstable; urgency=medium

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: Joey Hess <joeyh@debian.org> Maintainer: Debian QA Group <packages@qa.debian.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/

View File

@ -1,5 +1,5 @@
Name: propellor Name: propellor
Version: 0.9.1 Version: 0.9.2
Cabal-Version: >= 1.6 Cabal-Version: >= 1.6
License: BSD3 License: BSD3
Maintainer: Joey Hess <joey@kitenet.net> Maintainer: Joey Hess <joey@kitenet.net>