From 2e513dc98c51eca1cdfce3715b4a017be39734f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Apr 2016 15:31:35 -0400 Subject: Fix build with directory-1.2.6.2. It's now exporting a conflicting isSymbolicLink https://github.com/haskell/directory/issues/52 Only a few places in propellor use isSymbolicLink, but to prevent future problems, made as much of it as possible import Utility.Directory, which re-exports System.Directory without the conflicting symbol. (Utility.Tmp and System.Console.Concurrent.Internal cannot import Utility.Directory due to cycles, and don't use isSymbolicLink anyway.) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ef68886a..c6b93e15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ propellor (3.0.2) UNRELEASED; urgency=medium * Added Propellor.Property.Fstab, and moved the fstabbed property to there. * Attic module added for the backup system. Thanks, Félix Sipma. + * Fix build with directory-1.2.6.2. -- Joey Hess Tue, 05 Apr 2016 13:48:47 -0400 -- cgit v1.3-2-g0d8e From 60b12654b0746f9c35a38002d34e9ac69f76c738 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Apr 2016 15:47:22 -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 c6b93e15..58e32205 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,15 @@ -propellor (3.0.2) UNRELEASED; urgency=medium +propellor (3.0.2) unstable; urgency=medium * Added Apt.periodicUpdates. Thanks, Félix Sipma. - * Apt.unattendedUpgrades: Enable mailing problems reports to root. + * Apt.unattendedUpgrades: Enable mailing problem reports to root. Thanks, Félix Sipma. * Added Propellor.Property.Fstab, and moved the fstabbed property to there. * Attic module added for the backup system. Thanks, Félix Sipma. * Fix build with directory-1.2.6.2. - -- Joey Hess Tue, 05 Apr 2016 13:48:47 -0400 + -- Joey Hess Sat, 30 Apr 2016 15:46:50 -0400 propellor (3.0.1) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 215836ac..78a14c5e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 3.0.1 +Version: 3.0.2 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess -- cgit v1.3-2-g0d8e