summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-11-21 13:21:51 -0400
committerJoey Hess2015-11-21 13:21:51 -0400
commitcdcabc4ba35d16c69c6e039d75521dd41aec96a3 (patch)
tree926dcf8d3727983b44d0ff50a49ec20bbd47e89f /debian
parent1366fd272b70c15d8a28bd6fd44fde970cfa05e3 (diff)
parentdd5ffce2b68ac0b4e306682e8511f13974948e39 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e5bb541b..84c3fc6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-propellor (2.13.1) UNRELEASED; urgency=medium
+propellor (2.14.0) UNRELEASED; urgency=medium
* Add Propellor.Property.PropellorRepo.hasOriginUrl, an explicit way to
set the git repository url normally implicitly set when using --spin.
+ * Added Chroot.noServices property.
+ * DiskImage creation automatically uses Chroot.noServices.
+ * Removed the (unused) dependency on quickcheck.
+ * DebianMirror: Added a DebianMirror type for configuration (API change)
+ Thanks, Félix Sipma.
+ * DebianMirror: Add RsyncExtra to configuration.
+ Thanks, Félix Sipma.
-- Joey Hess <id@joeyh.name> Wed, 11 Nov 2015 13:37:00 -0400
diff --git a/debian/control b/debian/control
index 1a7909a3..757462d1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
libghc-ansi-terminal-dev,
libghc-ifelse-dev,
libghc-network-dev,
- libghc-quickcheck2-dev,
libghc-mtl-dev,
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),
@@ -37,7 +36,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-ansi-terminal-dev,
libghc-ifelse-dev,
libghc-network-dev,
- libghc-quickcheck2-dev,
libghc-mtl-dev,
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),