From eaac29e5cdb25102de5a48f4bd54a60c9d8bf24d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 24 Nov 2015 09:51:02 -0400 Subject: Revert "change joeyconfig back after merging from master" This reverts commit 7743ef8542b6490c3c42ac826a26aa0b24991f22. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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 -- cgit v1.3-2-g0d8e From 6f0fe3614f3c55c4a9e312aa6fa6730316fe5ec7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 19 Dec 2015 16:43:16 -0400 Subject: prep release --- debian/changelog | 6 +++--- propellor.cabal | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a4857ba4..8b3c42cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,15 @@ -propellor (2.15.1) UNRELEASED; urgency=medium +propellor (2.15.1) unstable; urgency=medium * Added git configs propellor.spin-branch and propellor.forbid-dirty-spin. Thanks, Sean Whitton. * Added User.systemAccountFor and User.systemAccountFor' properties. Thanks, Félix Sipma. - * Merged Utility changes from git-annex. * 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. - -- Joey Hess Tue, 08 Dec 2015 11:59:43 -0400 + -- Joey Hess Sat, 19 Dec 2015 16:43:09 -0400 propellor (2.15.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index a019afe8..14821441 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.15.0 +Version: 2.15.1 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess -- cgit v1.3-2-g0d8e From 65b598f6c8083725e43b2cb5c2219b5f52154bdc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 19 Dec 2015 17:49:44 -0400 Subject: cleanup --- debian/changelog | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 75a00e10..0f5fb1e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ 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. -- cgit v1.3-2-g0d8e