summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-04-17 20:05:41 -0400
committerJoey Hess2014-04-17 20:05:41 -0400
commit88b1724713b91fb7458ca527916247d0d53b9560 (patch)
treed74292d9e11b5660a1a650e7b3fc7aa0878fcc30 /debian
parent312a9c3fc99ab16876b0edaf491a46c737d802b3 (diff)
parentd934c95b96ce5c770acf3482ab64383266cbb997 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 172ca7ae..e7654a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ propellor (0.3.1) UNRELEASED; urgency=medium
* Properties can now be satisfied differently on different operating
systems.
* Standard apt configuration for stable now includes backports.
+ * Cron jobs generated by propellor use flock(1) to avoid multiple
+ instances running at a time.
-- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 15:00:11 -0400
diff --git a/debian/rules b/debian/rules
index dafe10f6..fa44abab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#!/bin/false -f
# Avoid using cabal, as it writes to $HOME
export CABAL=./Setup