summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0f5fb1e4..75a00e10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ propellor (2.15.1) unstable; urgency=medium
* Gpg.keyImported converted to not use a flag file and instead check
if gpg has the provided key already.
Thanks, FĂ©lix Sipma.
+ * Merged Utility changes from git-annex.
* Clean build with ghc 7.10.
* Merged Utility changes from git-annex.
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