summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-01-25 15:24:44 -0400
committerJoey Hess2015-01-25 15:24:44 -0400
commit527e020c103e2b9fb1716a157d7990df492f635f (patch)
tree2ebce75f58b3510d919ae4b1700ae450b2f5f383 /debian
parente6c7ad373fd24b8e53614d4778c0cd1a6f351db2 (diff)
parent32ca4d3af2589d393939e70a0d8cae339c0243b3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index abf6bd16..9410a516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
or Property HasInfo.
@@ -24,7 +24,7 @@ propellor (2.0.0) UNRELEASED; urgency=medium
* Added more network interface configuration properties.
* 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
diff --git a/debian/copyright b/debian/copyright
index d0071147..9a430c61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: native package
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