Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-01-25 15:24:44 -04:00
commit 527e020c10
4 changed files with 7 additions and 7 deletions

4
debian/changelog vendored
View File

@ -1,4 +1,4 @@
propellor (2.0.0) UNRELEASED; urgency=medium propellor (2.0.0) unstable; urgency=medium
* Property has been converted to a GADT, and will be Property NoInfo * Property has been converted to a GADT, and will be Property NoInfo
or Property HasInfo. or Property HasInfo.
@ -24,7 +24,7 @@ propellor (2.0.0) UNRELEASED; urgency=medium
* Added more network interface configuration properties. * Added more network interface configuration properties.
* Implemented OS.preserveNetwork. * Implemented OS.preserveNetwork.
-- Joey Hess <id@joeyh.name> Thu, 15 Jan 2015 20:14:29 -0400 -- Joey Hess <id@joeyh.name> Sun, 25 Jan 2015 15:23:08 -0400
propellor (1.3.2) unstable; urgency=medium propellor (1.3.2) unstable; urgency=medium

2
debian/copyright vendored
View File

@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: native package Source: native package
Files: * Files: *
Copyright: © 2010-2014 Joey Hess <id@joeyh.name> and contributors Copyright: © 2010-2015 Joey Hess <id@joeyh.name> and contributors
License: BSD-2-clause License: BSD-2-clause
License: BSD-2-clause License: BSD-2-clause

View File

@ -1,8 +1,8 @@
Propellor is versioned using the Haskell [Package Version Policy](https://www.haskell.org/haskellwiki/Package_versioning_policy). Propellor is versioned using the Haskell [Package Version Policy](https://www.haskell.org/haskellwiki/Package_versioning_policy).
This means that propellor 0.10.x contains some changes to its API; This means that propellor 2.10.x contains some changes to its API;
code written for propellor 0.9.x may need to be changed. Conversely, code written for propellor 2.9.x may need to be changed. Conversely,
there are no breaking changes between 0.10.1 and 0.10.2. there are no breaking changes between 2.10.1 and 2.10.2.
Whenever possible, breaking changes are made in a way that either changes a Whenever possible, breaking changes are made in a way that either changes a
data type, or a function name, so that code that used the old API version data type, or a function name, so that code that used the old API version

View File

@ -1,5 +1,5 @@
Name: propellor Name: propellor
Version: 1.3.2 Version: 2.0.0
Cabal-Version: >= 1.6 Cabal-Version: >= 1.6
License: BSD3 License: BSD3
Maintainer: Joey Hess <id@joeyh.name> Maintainer: Joey Hess <id@joeyh.name>