cabal-debian 4.30 → 4.30.2
raw patch · 4 files changed
+12/−4 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- cabal-debian.cabal +1/−1
- debian/changelog +6/−0
- src/Debian/Debianize/Goodies.hs +2/−2
- src/Debian/Debianize/Output.hs +3/−1
cabal-debian.cabal view
@@ -1,5 +1,5 @@ Name: cabal-debian-Version: 4.30+Version: 4.30.2 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw License: BSD3 License-File: LICENSE
debian/changelog view
@@ -1,3 +1,9 @@+haskell-cabal-debian (4.30.1) unstable; urgency=low++ * Make sure apache configuration files end with .conf++ -- David Fox <dsf@seereason.com> Mon, 29 Jun 2015 10:27:47 -0700+ haskell-cabal-debian (4.30) unstable; urgency=low * Remove mechanism to pass arguments via the CABALDEBIAN environment
src/Debian/Debianize/Goodies.hs view
@@ -172,8 +172,8 @@ siteAtoms pkgDesc b site = execCabalM (do (A.debInfo . D.atomSet) %= (Set.insert $ D.InstallDir b "/etc/apache2/sites-available")- (A.debInfo . D.atomSet) %= (Set.insert $ D.Link b ("/etc/apache2/sites-available/" ++ D.domain site) ("/etc/apache2/sites-enabled/" ++ D.domain site))- (A.debInfo . D.atomSet) %= (Set.insert $ D.File b ("/etc/apache2/sites-available" </> D.domain site) apacheConfig)+ (A.debInfo . D.atomSet) %= (Set.insert $ D.Link b ("/etc/apache2/sites-available/" ++ D.domain site ++ ".conf") ("/etc/apache2/sites-enabled/" ++ D.domain site ++ ".conf"))+ (A.debInfo . D.atomSet) %= (Set.insert $ D.File b ("/etc/apache2/sites-available" </> D.domain site ++ ".conf") apacheConfig) (A.debInfo . D.atomSet) %= (Set.insert $ D.InstallDir b (apacheLogDirectory b)) (A.debInfo . D.logrotateStanza) %= Map.insertWith mappend b (singleton
src/Debian/Debianize/Output.hs view
@@ -61,7 +61,9 @@ case exists of False -> return False True -> do- let args' = ["debian/Debianize.hs"] ++ args+ -- By default runhaskell looks for source in ., we will also look+ -- in src. Better would be to see where the cabal file looks.+ let args' = ["-i.:src", "debian/Debianize.hs"] ++ args hPutStrLn stderr ("running external debianization script in " ++ show here ++ ":\n " ++ showCommandForUser "runhaskell" args') result <- readProcessWithExitCode "runhaskell" args' "" case result of