summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-03-24 15:02:29 -0400
committerJoey Hess2016-03-24 15:02:29 -0400
commit51fa88feb1fd3621360c1db5b6b771a798a25a88 (patch)
treebff3f4d8ff052c1b95c7241bed4f4b8c7ef9368d /debian
parent416ae178ec7ed54d5740006a8dc6e1d2e30f00f4 (diff)
parent57431d90b5fb1c16973676bc6b0d32b12c26669b (diff)
Merge branch 'master' into typed-os-requirements
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index b3f19cbb..2c2b2ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.17.0) UNRELEASED; urgency=medium
+propellor (2.17.0) unstable; urgency=medium
* Added initial support for FreeBSD.
Thanks, Evan Cofsky.
@@ -29,7 +29,7 @@ propellor (2.17.0) UNRELEASED; urgency=medium
* Tor.named: Fix bug that sometimes caused the property to fail the first
time, though retrying succeeded.
- -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 17:58:08 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 24 Mar 2016 14:53:31 -0400
propellor (2.16.0) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index c88cc004..a71212db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/bin/false
+#!/usr/bin/make -f
# Avoid using cabal, as it writes to $HOME
export CABAL=./Setup