diff --git a/Tests.hs b/Tests.hs --- a/Tests.hs +++ b/Tests.hs @@ -9,6 +9,7 @@ import Debian.Debianize.Optparse(_flags, parseProgramArguments) import Control.Lens import Data.Algorithm.DiffContext (getContextDiff, prettyContextDiff) +import Data.Bool (bool) import Data.Function (on) import Data.List (sortBy) import Data.Map as Map (differenceWithKey, insert, intersectionWithKey) @@ -41,6 +42,7 @@ import Distribution.Compiler (CompilerFlavor(GHC)) import Distribution.Package (PackageName(PackageName)) import Prelude hiding (log) +import System.Directory (doesDirectoryExist) import System.Exit (exitWith, ExitCode(..)) import System.FilePath (()) import System.Process (readProcessWithExitCode) @@ -582,16 +584,23 @@ jstreePath = "/usr/share/clckwrks-0.13.2/jstree" json2Path = "/usr/share/clckwrks-0.13.2/json2" +-- | Obviously this is a hack, but the builddir is set to "dist-ghc" +-- by haskell-devscripts, while by default cabal sets it to "dist". +findBuildDir :: IO FilePath +findBuildDir = doesDirectoryExist "dist-ghc" >>= return . bool "dist" "dist-ghc" + test6 :: String -> Test test6 label = TestLabel label $ - TestCase (do result <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=dist/package.conf.inplace", "test-data/artvaluereport2/input/debian/Debianize.hs", "--dry-run"] "" + TestCase (do dist <- findBuildDir + result <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=" ++ dist ++ "/package.conf.inplace", "test-data/artvaluereport2/input/debian/Debianize.hs", "--dry-run"] "" assertEqual label (ExitSuccess, "", "") result) test7 :: String -> Test test7 label = TestLabel label $ - TestCase (do new <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=dist/package.conf.inplace", "debian/Debianize.hs", "--dry-run", "--native"] "" + TestCase (do dist <- findBuildDir + new <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=" ++ dist ++ "/package.conf.inplace", "debian/Debianize.hs", "--dry-run", "--native"] "" assertBool label (elem new [(ExitSuccess, "Ignored debianization file: debian/cabal-debian.1\nIgnored debianization file: debian/cabal-debian.manpages\nDebianization (dry run):\n No changes\n\n", ""), (ExitSuccess, "Ignored debianization file: debian/cabal-debian.manpages\nIgnored debianization file: debian/cabal-debian.1\nDebianization (dry run):\n No changes\n\n", "")])) diff --git a/cabal-debian.cabal b/cabal-debian.cabal --- a/cabal-debian.cabal +++ b/cabal-debian.cabal @@ -1,5 +1,5 @@ Name: cabal-debian -Version: 4.31.3 +Version: 4.31.4 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw License: BSD3 License-File: LICENSE @@ -305,7 +305,7 @@ Hs-Source-Dirs: . Main-is: Tests.hs ghc-options: -threaded -Wall -O2 - Build-Depends: base, cabal-debian, Cabal >= 1.18, containers, Diff >= 0.3.1, filepath, hsemail, HUnit, lens, process, text + Build-Depends: base >= 4.7.0.0, cabal-debian, Cabal >= 1.18, containers, Diff >= 0.3.1, directory, filepath, hsemail, HUnit, lens, process, text if flag(pretty-112) Build-Depends: pretty >= 1.1.2 else diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,139 @@ +haskell-cabal-debian (4.31.4) unstable; urgency=low + + * The test suite was failing during the debian package build because + it assumes the buildDir is in dist/, look for it in dist-ghc/ first. + + -- David Fox Sat, 22 Aug 2015 07:56:04 -0700 + +haskell-cabal-debian (4.31.3) unstable; urgency=low + + * Fix error message formatting (Joachim Breitner) + * Fix test suite result code (Joachim Breitner) + + -- David Fox Fri, 21 Aug 2015 17:29:57 -0700 + +haskell-cabal-debian (4.31.2) unstable; urgency=low + + * Fix some names in Extra-Source-Files and add some missing ones. + + -- David Fox Thu, 20 Aug 2015 16:01:40 -0700 + +haskell-cabal-debian (4.31.1) unstable; urgency=low + + * Map the cabal library Cabal library to the debian library packages + libghc-cabal-dev et. al. + + -- David Fox Thu, 20 Aug 2015 15:48:59 -0700 + +haskell-cabal-debian (4.31) unstable; urgency=low + + * Add some mappings from cabal build tools to debian package names: + ghc -> ghc, alex -> alex, happy -> happy + * Support Multi-Arch field in binaries (Joachim Breitner) + * Implement --roundtrip option (Joachim Breitner) + * Fixes for changelog entry formatting (Joachim Breitner) + * Fixes for License field of debian/copyright (Joachim Breitner) + * Only depend on ghc-doc if the package builds a library + * New mode of operation --upgrade + * No -prof and -doc package dependencies for binary and test suite packages + + -- David Fox Thu, 20 Aug 2015 14:31:28 -0700 + +haskell-cabal-debian (4.30.2) unstable; urgency=low + + * have runDebianizeScript look for source in src/ as well as ./ + + -- David Fox Sat, 08 Aug 2015 08:04:02 -0700 + +haskell-cabal-debian (4.30.1) unstable; urgency=low + + * Make sure apache configuration files end with .conf + + -- David Fox 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 + variable. + * Make compareDebianization a pure function. + * Remove MonadIO superclass from some functions + + -- David Fox Thu, 18 Jun 2015 09:12:59 -0700 + +haskell-cabal-debian (4.29.3) unstable; urgency=low + + * Fix escaping of wildcard characters that are not meaningful in cabal (i.e. square brackets) + * Fix generation of argument list when running an external debian/Debianization.hs script + (the whole thing was being repeated.) + * Make sure the enable tests and run tests options are handled correctly (not sure they were + wrong, but pretty sure they're now right.) + * Export Dmitry's performDebianization function instead of debianize in Debian.Debianize. + + -- David Fox Sat, 13 Jun 2015 05:24:03 -0700 + +haskell-cabal-debian (4.29) unstable; urgency=low + + * Restore the --epoch-map, --cabal-flag, --ghcjs, and --buildenvdir options + * Export parseProgramArguments' for parsing internally constructed + argument lists. + + -- David Fox Mon, 08 Jun 2015 06:37:25 -0700 + +haskell-cabal-debian (4.28) unstable; urgency=low + + * New command line parsing code from Dmitry Bogatov + * Drop support for old package old package formats + * Bug fixes and typos, API simplification, more + + -- David Fox Wed, 13 May 2015 06:49:04 -0700 + +haskell-cabal-debian (4.27.2) unstable; urgency=low + + * Change to the contents of the init.d file created for server packages. + In Debian.Debianize.Goodies.serverAtoms, insert a line into the init.d + script to set the datadir environment variable to /usr/share/cabalname + before startup. + + -- David Fox Wed, 22 Apr 2015 10:25:52 -0700 + +haskell-cabal-debian (4.27.1) unstable; urgency=low + + * Fix spurious "Just" in debian/copyright file. + + -- David Fox Tue, 21 Apr 2015 07:01:35 -0700 + +haskell-cabal-debian (4.27) unstable; urgency=low + + * Remove all vestiges of the old data-lens package. Thanks to + Dmitry Bogatov for help with this. + + -- David Fox Fri, 17 Apr 2015 15:01:27 -0700 + +haskell-cabal-debian (4.26) unstable; urgency=low + + * Revamp the way the final debian version number is computed in + Debian.Debianize.Finalize.debianVersion. + + -- David Fox Sun, 05 Apr 2015 10:49:33 -0700 + +haskell-cabal-debian (4.25) unstable; urgency=low + + * Make sure /proc is mounted when we run ghc to determine its version + number. This is only a concern when running in a build root. + * Fix whitespace handling bugs in copyright file parser and renderer. + + -- David Fox Sun, 05 Apr 2015 08:14:09 -0700 + +haskell-cabal-debian (4.24.9) unstable; urgency=low + + * Make debian/Debianize.hs a standard debianization script + * Make the test executable into a cabal test suite + * Make ghc-7.10 support official + * Simplify main in CabalDebian.hs + * Get rid of old --substvars option + + -- David Fox Wed, 01 Apr 2015 10:00:45 -0700 + haskell-cabal-debian (4.24.8) unstable; urgency=low * use ghcjs --numeric-ghc-version to set the compilerInfoCompat field diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +haskell-cabal-debian (4.31.4) unstable; urgency=low + + * The test suite was failing during the debian package build because + it assumes the buildDir is in dist/, look for it in dist-ghc/ first. + + -- David Fox Sat, 22 Aug 2015 07:56:04 -0700 + haskell-cabal-debian (4.31.3) unstable; urgency=low * Fix error message formatting (Joachim Breitner)