diff --git a/Tests.hs b/Tests.hs --- a/Tests.hs +++ b/Tests.hs @@ -592,7 +592,8 @@ test7 label = TestLabel label $ TestCase (do new <- readProcessWithExitCode "runhaskell" ["--ghc-arg=-package-db=dist/package.conf.inplace", "debian/Debianize.hs", "--dry-run", "--native"] "" - assertEqual label (ExitSuccess, "Ignored debianization file: debian/cabal-debian.1\nIgnored debianization file: debian/cabal-debian.manpages\nDebianization (dry run):\n No changes\n\n", "") new) + 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", "")])) test8 :: String -> Test test8 label = 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 +Version: 4.31.2 Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw License: BSD3 License-File: LICENSE @@ -19,8 +19,17 @@ Cabal-Version: >= 1.8 Extra-Source-Files: changelog + debian/cabal-debian.1 + debian/cabal-debian.install + debian/cabal-debian.manpages debian/changelog + debian/compat + debian/control + debian/copyright debian/Debianize.hs + debian/rules + debian/source/format + debian/watch test-data/creativeprompts/input/debian/changelog test-data/creativeprompts/input/debian/copyright test-data/creativeprompts/input/creativeprompts.cabal @@ -29,7 +38,7 @@ test-data/creativeprompts/output/debian/watch test-data/creativeprompts/output/debian/creativeprompts-production.logrotate test-data/creativeprompts/output/debian/creativeprompts-production.install - test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com + test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com.conf test-data/creativeprompts/output/debian/creativeprompts-production.links test-data/creativeprompts/output/debian/changelog test-data/creativeprompts/output/debian/creativeprompts-production.postinst @@ -50,7 +59,7 @@ test-data/clckwrks-dot-com/input/clckwrks-dot-com.cabal test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.postinst test-data/clckwrks-dot-com/output/debian/watch - test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com + test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf test-data/clckwrks-dot-com/output/debian/changelog test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-backups.postinst @@ -107,6 +116,7 @@ test-data/archive/output/debian/control test-data/archive/output/debian/seereason-darcs-backups.install test-data/archive/output/debian/copyright + test-data/archive/output/debian/source/format test-data/artvaluereport2/input/artvaluereport2.cabal test-data/artvaluereport2/input/debian/changelog test-data/artvaluereport2/input/debian/Debianize.hs @@ -114,7 +124,7 @@ test-data/artvaluereport2/output/debian/artvaluereport2-staging.postinst test-data/artvaluereport2/output/debian/artvaluereport2-production.postinst test-data/artvaluereport2/output/debian/watch - test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com + test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com.conf test-data/artvaluereport2/output/debian/artvaluereport2-staging.install test-data/artvaluereport2/output/debian/artvaluereport2-staging.init test-data/artvaluereport2/output/debian/artvaluereport2-production.install @@ -134,6 +144,7 @@ test-data/artvaluereport2/output/debian/control test-data/artvaluereport2/output/debian/artvaluereport2-backups.install test-data/artvaluereport2/output/debian/copyright + test-data/artvaluereport2/output/debian/source/format Flag tests Description: enable the unit test executable (disabled by default because it has a lot of wacky dependencies.) diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,98 +1,3 @@ -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-haskell/Debian/Control/Text.hs b/debian-haskell/Debian/Control/Text.hs --- a/debian-haskell/Debian/Control/Text.hs +++ b/debian-haskell/Debian/Control/Text.hs @@ -29,7 +29,7 @@ import qualified Data.ByteString.Char8 as B import Data.Char (toLower, chr) import Data.List (find) -import qualified Data.Text as T (Text, pack, unpack, map, dropAround, reverse) +import qualified Data.Text as T (Text, pack, unpack, map, strip, reverse) import Data.Text.Encoding (decodeUtf8With, encodeUtf8) --import Data.Text.IO as T (readFile) import qualified Debian.Control.ByteString as B @@ -92,8 +92,7 @@ where hasFieldName :: String -> Field' T.Text -> Bool hasFieldName name (Field (fieldName',_)) = T.pack name == T.map toLower fieldName' hasFieldName _ _ = False - stripWS = T.dropAround (`elem` (" \t" :: String)) - -- T.strip would also strip newlines + stripWS = T.strip protectFieldText = protectFieldText' asString = T.unpack diff --git a/debian/Debianize.hs b/debian/Debianize.hs --- a/debian/Debianize.hs +++ b/debian/Debianize.hs @@ -19,10 +19,10 @@ customize :: Monad m => CabalT m () customize = do debianDefaults + -- mapCabal (PackageName "Cabal") (DebBase "cabal-122") + -- splitCabal (PackageName "Cabal") (DebBase "cabal") (Version [1,22] []) -- Force some values so they match the expected results rather than -- changing as new package versions arrive. - mapCabal (PackageName "Cabal") (DebBase "cabal-122") - splitCabal (PackageName "Cabal") (DebBase "cabal") (Version [1,22] []) (debInfo . control . maintainer) .= parseMaintainer "David Fox " (debInfo . sourceFormat) .= Native3 (debInfo . control . standardsVersion) .= Just (StandardsVersion 3 9 3 Nothing) diff --git a/debian/cabal-debian.1 b/debian/cabal-debian.1 new file mode 100644 --- /dev/null +++ b/debian/cabal-debian.1 @@ -0,0 +1,120 @@ +.\"Original page generated by txt2man and then hacked extensively. +.TH CABAL-DEBIAN 1 "May 10, 2010" + +.SH NAME +cabal-debian \- create Debian package meta data from a Haskell cabal file. + +.SH SYNOPSIS +.B cabal-debian +.RI [flags] + +.SH DESCRIPTION +cabal-debian will generated the Debian meta data for a Debian package from the +cabal file of a Haskell package. The program expects to find the package's +.cabal file in the directory from which it was run. + +.TP +.B +\fB--prefix=PATH\fP +Pass this prefix if we need to configure the package + +.TP +.B +\fB--ghc\fP +Compile with GHC. + +.TP +.B +\fB--hugs\fP +Compile with HUGS. + +.TP +.B +\fB--jhc\fP +Compile with JHC. + +.TP +.B +\fB--nhc\fP +Compile with NHC. + +.TP +.B +\fB-h, -?, \-\-help\fP +Show this help text. + +.TP +.B +\fB--name\fP=NAME +Override the default package name. +.TP +.B +\fB--disable-haddock\fP +Don't generate API docs. +.TP +.B +\fB--disable-library-profiling\fP +Don't generate profiling libraries. +.TP +.B +\fB--disable-optimization\fP +Don't generate optimised code. + +.TP +.B +\fB--disable-split-objs\fP +Don't split object files to save space. + +.TP +.B +\fB-f\fP FLAGS, \fB--flags\fP=FLAGS +Set given flags in Cabal conditionals. + +.TP +.B +\fB--release\fP=RELEASE +Override the default package release. + +.TP +.B +\fB--debdir\fP=DEBDIR +Override the default output directory ("./debian"). + +.TP +.B +\fB-v n,q \fB--verbose=n\fP +Change build verbosity. + +.TP +.B +\fB--version\fP=VERSION +Override the default package version. + +.TP +.B +\fB--maintainer\fP=Maintainer Name +Override the Maintainer name and email in $DEBEMAIL/$EMAIL/$DEBFULLNAME/$FULLNAME. + +.TP +.B +\fB--debianize\fP +Generate a new debianization, replacing any existing one. One of +\fB--debianize\fP, \fB--substvar\fP, or \fB--update-debianization\fP is +required. + +.TP +.B +\fB--substvar\fP=Doc, Prof, or Dev +Write out the list of dependencies required for the dev, prof or doc package +depending on the argument. This value can be added to the appropriate substvars +file. + +.TP +.B +\fB--update-debianization\fP +Update an existing debianization. + +.SH AUTHOR +This manual page was originally written by Erik de Castro Lopo + for the Debian GNU/Linux system (but may be used by +others). diff --git a/debian/cabal-debian.install b/debian/cabal-debian.install new file mode 100644 --- /dev/null +++ b/debian/cabal-debian.install @@ -0,0 +1,1 @@ +dist-ghc/build/cabal-debian/cabal-debian usr/bin diff --git a/debian/cabal-debian.manpages b/debian/cabal-debian.manpages new file mode 100644 --- /dev/null +++ b/debian/cabal-debian.manpages @@ -0,0 +1,1 @@ +debian/*.1 diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +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 ./ diff --git a/debian/compat b/debian/compat new file mode 100644 --- /dev/null +++ b/debian/compat @@ -0,0 +1,1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 --- /dev/null +++ b/debian/control @@ -0,0 +1,151 @@ +Source: haskell-cabal-debian +Maintainer: David Fox +Priority: extra +Section: haskell +Build-Depends: debhelper (>= 9), + haskell-devscripts (>= 0.8), + cdbs, + ghc, + ghc-prof, + libghc-cabal-dev (>= 1.18) | ghc, + libghc-cabal-prof (>= 1.18) | ghc-prof, + libghc-diff-dev (>= 0.3.1), + libghc-diff-prof (>= 0.3.1), + libghc-hunit-dev, + libghc-hunit-prof, + libghc-unixutils-dev (>= 1.53), + libghc-unixutils-prof (>= 1.53), + libghc-ansi-wl-pprint-dev (>= 0.6), + libghc-ansi-wl-pprint-dev (<< 0.7), + libghc-ansi-wl-pprint-prof (>= 0.6), + libghc-ansi-wl-pprint-prof (<< 0.7), + libghc-bifunctors-dev, + libghc-bifunctors-prof, + libghc-data-default-dev, + libghc-data-default-prof, + libghc-debian-dev (>= 3.87), + libghc-debian-prof (>= 3.87), + libghc-exceptions-dev, + libghc-exceptions-prof, + libghc-hsemail-dev, + libghc-hsemail-prof, + libghc-lens-dev, + libghc-lens-prof, + libghc-memoize-dev (>= 0.7), + libghc-memoize-prof (>= 0.7), + libghc-mtl-dev, + libghc-mtl-prof, + libghc-network-uri-dev, + libghc-network-uri-prof, + libghc-newtype-generics-dev (>= 0.4), + libghc-newtype-generics-prof (>= 0.4), + libghc-optparse-applicative-dev (>= 0.11), + libghc-optparse-applicative-dev (<< 0.12), + libghc-optparse-applicative-prof (>= 0.11), + libghc-optparse-applicative-prof (<< 0.12), + libghc-parsec3-dev (>= 3), + libghc-parsec3-prof (>= 3), + libghc-puremd5-dev, + libghc-puremd5-prof, + libghc-regex-tdfa-dev, + libghc-regex-tdfa-prof, + libghc-set-extra-dev, + libghc-set-extra-prof, + libghc-syb-dev, + libghc-syb-prof, + libghc-text-dev, + libghc-text-prof, + libghc-utf8-string-dev, + libghc-utf8-string-prof, +Build-Depends-Indep: ghc-doc, + libghc-cabal-doc | ghc-doc, + libghc-diff-doc, + libghc-hunit-doc, + libghc-unixutils-doc, + libghc-ansi-wl-pprint-doc, + libghc-bifunctors-doc, + libghc-data-default-doc, + libghc-debian-doc, + libghc-exceptions-doc, + libghc-hsemail-doc, + libghc-lens-doc, + libghc-memoize-doc, + libghc-mtl-doc, + libghc-network-uri-doc, + libghc-newtype-generics-doc, + libghc-optparse-applicative-doc, + libghc-parsec3-doc, + libghc-puremd5-doc, + libghc-regex-tdfa-doc, + libghc-set-extra-doc, + libghc-syb-doc, + libghc-text-doc, + libghc-utf8-string-doc, +Standards-Version: 3.9.3 +Homepage: https://github.com/ddssff/cabal-debian +X-Description: Create a Debianization for a Cabal package + This package supports the generation of a package Debianization (i.e. + the files in the @debian@ subdirectory) for a cabal package, + either through a library API or using the cabal-debian executable. + For documentation of the executable, run + @cabal-debian --help@, for documentation of the library API follow + the link to the @Debian.Debianize@ module below. + +Package: cabal-debian +Architecture: any +Section: misc +Depends: ${haskell:Depends}, + ${misc:Depends}, + apt-file, + debian-policy, + debhelper, + haskell-devscripts (>= 0.8.19), +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: libghc-cabal-debian-dev +Architecture: any +Depends: ${haskell:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, + debian-policy +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: libghc-cabal-debian-prof +Architecture: any +Depends: ${haskell:Depends}, + ${misc:Depends}, +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Provides: ${haskell:Provides}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} + +Package: libghc-cabal-debian-doc +Architecture: all +Section: doc +Depends: ${haskell:Depends}, + ${misc:Depends}, +Recommends: ${haskell:Recommends}, +Suggests: ${haskell:Suggests}, +Conflicts: ${haskell:Conflicts}, +Description: ${haskell:ShortDescription}${haskell:ShortBlurb} + ${haskell:LongDescription} + . + ${haskell:Blurb} diff --git a/debian/copyright b/debian/copyright new file mode 100644 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,45 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cabal-debian +Upstream-Contact: David Fox +Source: https://hackage.haskell.org/package/cabal-debian + +Files: * +Copyright: Copyright (c) 2007-2014, David Fox, Jeremy Shaw +License: BSD3 + +Files: debian/* +Copyright: held by the contributors mentioned in debian/changelog +License: BSD3 + +License: BSD3 + The packageing was adjusted to Debian conventions by Joachim Breitner + on Sat, 01 May 2010 21:16:18 +0200, and is licenced under + the same terms as the package itself. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + * The names of contributors may not be used to endorse or promote + products derived from this software without specific prior + written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/rules b/debian/rules new file mode 100644 --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +DEB_ENABLE_TESTS = yes +DEB_CABAL_PACKAGE = cabal-debian +DEB_DEFAULT_COMPILER = ghc + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/hlibrary.mk + +build/cabal-debian:: build-ghc-stamp diff --git a/debian/source/format b/debian/source/format new file mode 100644 --- /dev/null +++ b/debian/source/format @@ -0,0 +1,1 @@ +3.0 (native) diff --git a/debian/watch b/debian/watch new file mode 100644 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hackage.haskell.org/package/cabal-debian/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/src/Debian/Debianize/Bundled.hs b/src/Debian/Debianize/Bundled.hs --- a/src/Debian/Debianize/Bundled.hs +++ b/src/Debian/Debianize/Bundled.hs @@ -1,5 +1,10 @@ -- | Determine whether a specific version of a Haskell package is -- bundled with into this particular version of the given compiler. +-- This is done by getting the "Provides" field from the output of +-- "apt-cache showpkg ghc" (run in the appropriate changeroot) and +-- converting the debian package names back to Cabal package names. +-- *That* is done using the debianNameMap of CabalInfo, which is +-- built using the mapCabal, splitCabal, and remapCabal functions. {-# LANGUAGE FlexibleContexts, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell #-} module Debian.Debianize.Bundled diff --git a/src/Debian/Debianize/Details.hs b/src/Debian/Debianize/Details.hs --- a/src/Debian/Debianize/Details.hs +++ b/src/Debian/Debianize/Details.hs @@ -41,3 +41,4 @@ -- remapCabal (PackageName "haskeline") (DebBase "haskeline0713") mapCabal (PackageName "haskell-src-exts") (DebBase "src-exts") mapCabal (PackageName "haskell-src-meta") (DebBase "src-meta") + mapCabal (PackageName "Cabal") (DebBase "cabal") diff --git a/test-data/alex/output/debian/changelog b/test-data/alex/output/debian/changelog --- a/test-data/alex/output/debian/changelog +++ b/test-data/alex/output/debian/changelog @@ -1,5 +1,5 @@ haskell-alex (3.0.2-1~hackage1) UNRELEASED; urgency=low - * Initial release (Closes: #nnnn) + * Initial release -- Simon Marlow Thu, 31 Jan 2013 10:51:47 -0800 diff --git a/test-data/alex/output/debian/control b/test-data/alex/output/debian/control --- a/test-data/alex/output/debian/control +++ b/test-data/alex/output/debian/control @@ -9,9 +9,6 @@ ghc-prof, alex, libghc-quickcheck2-dev (>= 2), - libghc-quickcheck2-prof (>= 2), -Build-Depends-Indep: ghc-doc - , libghc-quickcheck2-doc (>= 2) | libghc-quickcheck1-doc (<< 2) Standards-Version: 3.9.6 Homepage: http://www.haskell.org/alex/ X-Description: Alex is a tool for generating lexical analysers in Haskell diff --git a/test-data/alex/output/debian/copyright b/test-data/alex/output/debian/copyright --- a/test-data/alex/output/debian/copyright +++ b/test-data/alex/output/debian/copyright @@ -12,7 +12,7 @@ License: BSD3 License: BSD3 -Comment: Copyright (c) 1995-2011, Chris Dornan and Simon Marlow + Copyright (c) 1995-2011, Chris Dornan and Simon Marlow All rights reserved. . Redistribution and use in source and binary forms, with or without diff --git a/test-data/archive/output/debian/control b/test-data/archive/output/debian/control --- a/test-data/archive/output/debian/control +++ b/test-data/archive/output/debian/control @@ -8,15 +8,8 @@ , ghc , ghc-prof , libghc-extra-dev - , libghc-extra-prof , libghc-archive-dev (>= 1.7) - , libghc-archive-prof (>= 1.7) , libghc-network-dev - , libghc-network-prof -Build-Depends-Indep: ghc-doc - , libghc-extra-doc - , libghc-archive-doc - , libghc-network-doc Standards-Version: 3.8.1 X-Description: Backups of the seereason darcs repositories Install this somewhere other than where the server is running get diff --git a/test-data/archive/output/debian/source/format b/test-data/archive/output/debian/source/format new file mode 100644 --- /dev/null +++ b/test-data/archive/output/debian/source/format @@ -0,0 +1,1 @@ +3.0 (native) diff --git a/test-data/artvaluereport-data/output/debian/control b/test-data/artvaluereport-data/output/debian/control --- a/test-data/artvaluereport-data/output/debian/control +++ b/test-data/artvaluereport-data/output/debian/control @@ -62,6 +62,8 @@ , libghc-mtl-prof , libghc-network-dev (>= 2.4) , libghc-network-prof (>= 2.4) + , libghc-old-time-dev + , libghc-old-time-prof , libghc-pandoc-dev , libghc-pandoc-prof , libghc-pandoc-types-dev @@ -118,6 +120,7 @@ , libghc-maccatcher-doc , libghc-mtl-doc , libghc-network-doc + , libghc-old-time-doc , libghc-pandoc-doc , libghc-pandoc-types-doc , libghc-parsec3-doc (>= 3) | libghc-parsec2-doc (<< 3) diff --git a/test-data/artvaluereport2/output/debian/artvaluereport2-production.install b/test-data/artvaluereport2/output/debian/artvaluereport2-production.install --- a/test-data/artvaluereport2/output/debian/artvaluereport2-production.install +++ b/test-data/artvaluereport2/output/debian/artvaluereport2-production.install @@ -2,7 +2,7 @@ DataTables-1.8.2 usr/share/ArtValueReport/. Udon.js usr/share/ArtValueReport/. blueprint usr/share/ArtValueReport/. -debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com /etc/apache2/sites-available/ +debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com.conf /etc/apache2/sites-available/ flexbox.css usr/share/ArtValueReport/. html5sortable usr/share/ArtValueReport/. jGFeed usr/share/ArtValueReport/. diff --git a/test-data/artvaluereport2/output/debian/artvaluereport2-production.links b/test-data/artvaluereport2/output/debian/artvaluereport2-production.links --- a/test-data/artvaluereport2/output/debian/artvaluereport2-production.links +++ b/test-data/artvaluereport2/output/debian/artvaluereport2-production.links @@ -1,1 +1,1 @@ -/etc/apache2/sites-available/my.appraisalreportonline.com /etc/apache2/sites-enabled/my.appraisalreportonline.com +/etc/apache2/sites-available/my.appraisalreportonline.com.conf /etc/apache2/sites-enabled/my.appraisalreportonline.com.conf diff --git a/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com b/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com deleted file mode 100644 --- a/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com +++ /dev/null @@ -1,32 +0,0 @@ - - ServerAdmin logic@seereason.com - ServerName www.my.appraisalreportonline.com - ServerAlias my.appraisalreportonline.com - - ErrorLog /var/log/apache2/artvaluereport2-production/error.log - CustomLog /var/log/apache2/artvaluereport2-production/access.log combined - - ProxyRequests Off - AllowEncodedSlashes NoDecode - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - Deny from all - #Allow from all - - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - #Deny from all - Allow from all - - - SetEnv proxy-sendcl 1 - - ProxyPass / http://127.0.0.1:9027/ nocanon - ProxyPassReverse / http://127.0.0.1:9027/ - diff --git a/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com.conf b/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com.conf new file mode 100644 --- /dev/null +++ b/test-data/artvaluereport2/output/debian/cabalInstall/7e4b5d8641f6fae99e9ae9b2d8893bc7/my.appraisalreportonline.com.conf @@ -0,0 +1,32 @@ + + ServerAdmin logic@seereason.com + ServerName www.my.appraisalreportonline.com + ServerAlias my.appraisalreportonline.com + + ErrorLog /var/log/apache2/artvaluereport2-production/error.log + CustomLog /var/log/apache2/artvaluereport2-production/access.log combined + + ProxyRequests Off + AllowEncodedSlashes NoDecode + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + Deny from all + #Allow from all + + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + #Deny from all + Allow from all + + + SetEnv proxy-sendcl 1 + + ProxyPass / http://127.0.0.1:9027/ nocanon + ProxyPassReverse / http://127.0.0.1:9027/ + diff --git a/test-data/artvaluereport2/output/debian/control b/test-data/artvaluereport2/output/debian/control --- a/test-data/artvaluereport2/output/debian/control +++ b/test-data/artvaluereport2/output/debian/control @@ -8,192 +8,68 @@ , ghc , ghc-prof , libghc-extra-dev (>= 1.35) - , libghc-extra-prof (>= 1.35) , libghc-hjscript-dev - , libghc-hjscript-prof , libghc-hatex-dev - , libghc-hatex-prof , libghc-quickcheck2-dev (>= 2) - , libghc-quickcheck2-prof (>= 2) , libghc-rjson-dev - , libghc-rjson-prof , libghc-unixutils-dev - , libghc-unixutils-prof , libghc-acid-state-dev (>= 0.6) - , libghc-acid-state-prof (>= 0.6) , libghc-applicative-extras-dev (>= 0.1.5) - , libghc-applicative-extras-prof (>= 0.1.5) , libghc-archive-dev (>= 1.2.9) - , libghc-archive-prof (>= 1.2.9) , libghc-artvaluereport-data-dev (>= 1.66) - , libghc-artvaluereport-data-prof (>= 1.66) , libghc-authenticate-dev - , libghc-authenticate-prof , libghc-blaze-html-dev - , libghc-blaze-html-prof , libghc-blaze-markup-dev - , libghc-blaze-markup-prof , libghc-cereal-dev - , libghc-cereal-prof , libghc-data-accessor-dev - , libghc-data-accessor-prof , libghc-debian-dev - , libghc-debian-prof , libghc-debian-packaging-dev (>= 0.8) - , libghc-debian-packaging-prof (>= 0.8) , libghc-digestive-functors-dev - , libghc-digestive-functors-prof , libghc-digestive-functors-happstack-dev - , libghc-digestive-functors-happstack-prof , libghc-directory-tree-dev - , libghc-directory-tree-prof , libghc-fb-dev - , libghc-fb-prof , libghc-groom-dev - , libghc-groom-prof , libghc-happstack-dev - , libghc-happstack-prof , libghc-happstack-authenticate-dev - , libghc-happstack-authenticate-prof , libghc-happstack-extra-dev - , libghc-happstack-extra-prof , libghc-happstack-hsp-dev - , libghc-happstack-hsp-prof , libghc-happstack-scaffolding-dev (>= 0.23) - , libghc-happstack-scaffolding-prof (>= 0.23) , libghc-happstack-server-dev - , libghc-happstack-server-prof , libghc-happstack-util-dev - , libghc-happstack-util-prof , libghc-harp-dev - , libghc-harp-prof , libghc-hslogger-dev - , libghc-hslogger-prof , libghc-hsp-dev (>= 0.4.4) - , libghc-hsp-prof (>= 0.4.4) , libghc-hsx-dev - , libghc-hsx-prof , libghc-html-dev - , libghc-html-prof , libghc-html-entities-dev - , libghc-html-entities-prof , libghc-ixset-dev - , libghc-ixset-prof , libghc-jmacro-dev (>= 0.6.2) - , libghc-jmacro-prof (>= 0.6.2) , libghc-json-dev - , libghc-json-prof , libghc-language-css-dev - , libghc-language-css-prof , libghc-lifted-base-dev - , libghc-lifted-base-prof , libghc-mtl-dev - , libghc-mtl-prof , libghc-network-dev (>= 2.4) - , libghc-network-prof (>= 2.4) + , libghc-old-locale-dev + , libghc-old-time-dev , libghc-pandoc-dev - , libghc-pandoc-prof - , libghc-parsec3-dev (>= 3) | libghc-parsec2-dev (<< 3) - , libghc-parsec3-prof (>= 3) | libghc-parsec2-prof (<< 3) + , libghc-parsec3-dev , libghc-process-extras-dev (>= 0.5) - , libghc-process-extras-prof (>= 0.5) , libghc-puremd5-dev - , libghc-puremd5-prof , libghc-random-dev - , libghc-random-prof , libghc-regex-compat-dev - , libghc-regex-compat-prof , libghc-revision-dev - , libghc-revision-prof , libghc-safe-dev - , libghc-safe-prof , libghc-safecopy-dev (>= 0.5.1) - , libghc-safecopy-prof (>= 0.5.1) , libghc-syb-dev - , libghc-syb-prof , libghc-syb-with-class-dev - , libghc-syb-with-class-prof , libghc-tagged-dev - , libghc-tagged-prof , libghc-text-dev - , libghc-text-prof , libghc-uniplate-dev - , libghc-uniplate-prof , libghc-utf8-string-dev - , libghc-utf8-string-prof , libghc-web-routes-dev - , libghc-web-routes-prof , libghc-web-routes-happstack-dev - , libghc-web-routes-happstack-prof , libghc-web-routes-hsp-dev - , libghc-web-routes-hsp-prof , libghc-web-routes-th-dev - , libghc-web-routes-th-prof -Build-Depends-Indep: ghc-doc - , libjs-jquery-ui (<< 1.10) - , libjs-jquery - , libjs-jcrop - , libghc-extra-doc - , libghc-hjscript-doc - , libghc-hatex-doc - , libghc-quickcheck2-doc (>= 2) | libghc-quickcheck1-doc (<< 2) - , libghc-rjson-doc - , libghc-unixutils-doc - , libghc-acid-state-doc - , libghc-applicative-extras-doc - , libghc-archive-doc - , libghc-artvaluereport-data-doc - , libghc-authenticate-doc - , libghc-blaze-html-doc - , libghc-blaze-markup-doc - , libghc-cereal-doc - , libghc-data-accessor-doc - , libghc-debian-doc - , libghc-debian-packaging-doc - , libghc-digestive-functors-doc - , libghc-digestive-functors-happstack-doc - , libghc-directory-tree-doc - , libghc-fb-doc - , libghc-groom-doc - , libghc-happstack-doc - , libghc-happstack-authenticate-doc - , libghc-happstack-extra-doc - , libghc-happstack-hsp-doc - , libghc-happstack-scaffolding-doc - , libghc-happstack-server-doc - , libghc-happstack-util-doc - , libghc-harp-doc - , libghc-hslogger-doc - , libghc-hsp-doc - , libghc-hsx-doc - , libghc-html-doc - , libghc-html-entities-doc - , libghc-ixset-doc - , libghc-jmacro-doc - , libghc-json-doc - , libghc-language-css-doc - , libghc-lifted-base-doc - , libghc-mtl-doc - , libghc-network-doc - , libghc-pandoc-doc - , libghc-parsec3-doc (>= 3) | libghc-parsec2-doc (<< 3) - , libghc-process-extras-doc - , libghc-puremd5-doc - , libghc-random-doc - , libghc-regex-compat-doc - , libghc-revision-doc - , libghc-safe-doc - , libghc-safecopy-doc - , libghc-syb-doc - , libghc-syb-with-class-doc - , libghc-tagged-doc - , libghc-text-doc - , libghc-uniplate-doc - , libghc-utf8-string-doc - , libghc-web-routes-doc - , libghc-web-routes-happstack-doc - , libghc-web-routes-hsp-doc - , libghc-web-routes-th-doc Standards-Version: 3.9.6 Homepage: http://appraisalreportonline.com X-Description: Haskell modules for fine art appraisal applications diff --git a/test-data/artvaluereport2/output/debian/source/format b/test-data/artvaluereport2/output/debian/source/format new file mode 100644 --- /dev/null +++ b/test-data/artvaluereport2/output/debian/source/format @@ -0,0 +1,1 @@ +3.0 (native) diff --git a/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com b/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com deleted file mode 100644 --- a/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com +++ /dev/null @@ -1,32 +0,0 @@ - - ServerAdmin logic@seereason.com - ServerName www.clckwrks.com - ServerAlias clckwrks.com - - ErrorLog /var/log/apache2/clckwrks-dot-com-production/error.log - CustomLog /var/log/apache2/clckwrks-dot-com-production/access.log combined - - ProxyRequests Off - AllowEncodedSlashes NoDecode - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - Deny from all - #Allow from all - - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - #Deny from all - Allow from all - - - SetEnv proxy-sendcl 1 - - ProxyPass / http://127.0.0.1:9029/ nocanon - ProxyPassReverse / http://127.0.0.1:9029/ - diff --git a/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf b/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf new file mode 100644 --- /dev/null +++ b/test-data/clckwrks-dot-com/output/debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf @@ -0,0 +1,32 @@ + + ServerAdmin logic@seereason.com + ServerName www.clckwrks.com + ServerAlias clckwrks.com + + ErrorLog /var/log/apache2/clckwrks-dot-com-production/error.log + CustomLog /var/log/apache2/clckwrks-dot-com-production/access.log combined + + ProxyRequests Off + AllowEncodedSlashes NoDecode + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + Deny from all + #Allow from all + + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + #Deny from all + Allow from all + + + SetEnv proxy-sendcl 1 + + ProxyPass / http://127.0.0.1:9029/ nocanon + ProxyPassReverse / http://127.0.0.1:9029/ + diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install +++ b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.install @@ -1,1 +1,1 @@ -debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com /etc/apache2/sites-available/ +debian/cabalInstall/6cb4323c6b76525f567919adaf912663/clckwrks.com.conf /etc/apache2/sites-available/ diff --git a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links --- a/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links +++ b/test-data/clckwrks-dot-com/output/debian/clckwrks-dot-com-production.links @@ -1,1 +1,1 @@ -/etc/apache2/sites-available/clckwrks.com /etc/apache2/sites-enabled/clckwrks.com +/etc/apache2/sites-available/clckwrks.com.conf /etc/apache2/sites-enabled/clckwrks.com.conf diff --git a/test-data/clckwrks-dot-com/output/debian/control b/test-data/clckwrks-dot-com/output/debian/control --- a/test-data/clckwrks-dot-com/output/debian/control +++ b/test-data/clckwrks-dot-com/output/debian/control @@ -9,49 +9,22 @@ , ghc-prof , libghc-clckwrks-dev (>= 0.13) , libghc-clckwrks-dev (<< 0.15) - , libghc-clckwrks-prof (>= 0.13) - , libghc-clckwrks-prof (<< 0.15) , libghc-clckwrks-plugin-bugs-dev (>= 0.3) , libghc-clckwrks-plugin-bugs-dev (<< 0.4) - , libghc-clckwrks-plugin-bugs-prof (>= 0.3) - , libghc-clckwrks-plugin-bugs-prof (<< 0.4) , libghc-clckwrks-plugin-media-dev (>= 0.3) , libghc-clckwrks-plugin-media-dev (<< 0.4) - , libghc-clckwrks-plugin-media-prof (>= 0.3) - , libghc-clckwrks-plugin-media-prof (<< 0.4) , libghc-clckwrks-theme-clckwrks-dev (>= 0.2) , libghc-clckwrks-theme-clckwrks-dev (<< 0.3) - , libghc-clckwrks-theme-clckwrks-prof (>= 0.2) - , libghc-clckwrks-theme-clckwrks-prof (<< 0.3) , libghc-happstack-server-dev (>= 7.0) , libghc-happstack-server-dev (<< 7.2) - , libghc-happstack-server-prof (>= 7.0) - , libghc-happstack-server-prof (<< 7.2) , libghc-hsp-dev (>= 0.7) , libghc-hsp-dev (<< 0.8) - , libghc-hsp-prof (>= 0.7) - , libghc-hsp-prof (<< 0.8) , libghc-mtl-dev (>= 2.0) , libghc-mtl-dev (<< 2.2) - , libghc-mtl-prof (>= 2.0) - , libghc-mtl-prof (<< 2.2) , libghc-text-dev (>= 0.11) , libghc-text-dev (<< 0.12) - , libghc-text-prof (>= 0.11) - , libghc-text-prof (<< 0.12) , libghc-web-plugins-dev (>= 0.1) , libghc-web-plugins-dev (<< 0.2) - , libghc-web-plugins-prof (>= 0.1) - , libghc-web-plugins-prof (<< 0.2) -Build-Depends-Indep: ghc-doc - , libghc-clckwrks-doc - , libghc-clckwrks-plugin-bugs-doc - , libghc-clckwrks-plugin-media-doc - , libghc-happstack-server-doc - , libghc-hsp-doc - , libghc-mtl-doc - , libghc-text-doc - , libghc-web-plugins-doc Standards-Version: 3.9.6 Homepage: http://www.clckwrks.com/ X-Description: clckwrks.com diff --git a/test-data/clckwrks-dot-com/output/debian/copyright b/test-data/clckwrks-dot-com/output/debian/copyright --- a/test-data/clckwrks-dot-com/output/debian/copyright +++ b/test-data/clckwrks-dot-com/output/debian/copyright @@ -12,7 +12,7 @@ License: BSD3 License: BSD3 -Comment: Copyright (c) 2012, Jeremy Shaw + Copyright (c) 2012, Jeremy Shaw . All rights reserved. . diff --git a/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com b/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com deleted file mode 100644 --- a/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com +++ /dev/null @@ -1,32 +0,0 @@ - - ServerAdmin logic@seereason.com - ServerName www.creativeprompts.com - ServerAlias creativeprompts.com - - ErrorLog /var/log/apache2/creativeprompts-production/error.log - CustomLog /var/log/apache2/creativeprompts-production/access.log combined - - ProxyRequests Off - AllowEncodedSlashes NoDecode - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - Deny from all - #Allow from all - - - - AddDefaultCharset off - Order deny,allow - #Allow from .example.com - #Deny from all - Allow from all - - - SetEnv proxy-sendcl 1 - - ProxyPass / http://127.0.0.1:9022/ nocanon - ProxyPassReverse / http://127.0.0.1:9022/ - diff --git a/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com.conf b/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com.conf new file mode 100644 --- /dev/null +++ b/test-data/creativeprompts/output/debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com.conf @@ -0,0 +1,32 @@ + + ServerAdmin logic@seereason.com + ServerName www.creativeprompts.com + ServerAlias creativeprompts.com + + ErrorLog /var/log/apache2/creativeprompts-production/error.log + CustomLog /var/log/apache2/creativeprompts-production/access.log combined + + ProxyRequests Off + AllowEncodedSlashes NoDecode + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + Deny from all + #Allow from all + + + + AddDefaultCharset off + Order deny,allow + #Allow from .example.com + #Deny from all + Allow from all + + + SetEnv proxy-sendcl 1 + + ProxyPass / http://127.0.0.1:9022/ nocanon + ProxyPassReverse / http://127.0.0.1:9022/ + diff --git a/test-data/creativeprompts/output/debian/control b/test-data/creativeprompts/output/debian/control --- a/test-data/creativeprompts/output/debian/control +++ b/test-data/creativeprompts/output/debian/control @@ -8,129 +8,50 @@ , ghc , ghc-prof , libghc-extra-dev - , libghc-extra-prof , libghc-hjscript-dev - , libghc-hjscript-prof , libghc-http-dev - , libghc-http-prof , libghc-quickcheck2-dev (>= 2) | libghc-quickcheck1-dev (<< 2) - , libghc-quickcheck2-prof (>= 2) | libghc-quickcheck1-prof (<< 2) , libghc-unixutils-dev (>= 1.29) - , libghc-unixutils-prof (>= 1.29) , libghc-unixutils-shadow-dev - , libghc-unixutils-shadow-prof , libghc-acid-state-dev (>= 0.6.0) - , libghc-acid-state-prof (>= 0.6.0) , libghc-archive-dev (>= 1.2.9) - , libghc-archive-prof (>= 1.2.9) , libghc-authenticate-dev (>= 0.8.0) - , libghc-authenticate-prof (>= 0.8.0) , libghc-blaze-html-dev (>= 0.5) - , libghc-blaze-html-prof (>= 0.5) , libghc-blaze-markup-dev - , libghc-blaze-markup-prof , libghc-debian-packaging-dev (>= 0.8) - , libghc-debian-packaging-prof (>= 0.8) , libghc-digestive-functors-dev (>= 0.2) - , libghc-digestive-functors-prof (>= 0.2) , libghc-digestive-functors-happstack-dev (>= 0.1) - , libghc-digestive-functors-happstack-prof (>= 0.1) , libghc-digestive-functors-hsp-dev (>= 0.3.1) - , libghc-digestive-functors-hsp-prof (>= 0.3.1) , libghc-extensible-exceptions-dev - , libghc-extensible-exceptions-prof , libghc-happstack-authenticate-dev (>= 0.6) - , libghc-happstack-authenticate-prof (>= 0.6) , libghc-happstack-hsp-dev (>= 7.1) , libghc-happstack-hsp-dev (<< 7.2) - , libghc-happstack-hsp-prof (>= 7.1) - , libghc-happstack-hsp-prof (<< 7.2) , libghc-happstack-server-dev (>= 7.0) , libghc-happstack-server-dev (<< 7.1) - , libghc-happstack-server-prof (>= 7.0) - , libghc-happstack-server-prof (<< 7.1) , libghc-hslogger-dev - , libghc-hslogger-prof , libghc-hsp-dev (>= 0.7.1) , libghc-hsp-dev (<< 0.8) - , libghc-hsp-prof (>= 0.7.1) - , libghc-hsp-prof (<< 0.8) , libghc-hsx-dev (>= 0.10.2) , libghc-hsx-dev (<< 0.11) - , libghc-hsx-prof (>= 0.10.2) - , libghc-hsx-prof (<< 0.11) , libghc-ixset-dev - , libghc-ixset-prof , libghc-jmacro-dev - , libghc-jmacro-prof , libghc-json-dev - , libghc-json-prof , libghc-mtl-dev - , libghc-mtl-prof , libghc-network-dev - , libghc-network-prof + , libghc-old-locale-dev + , libghc-old-time-dev , libghc-parsec3-dev (>= 3) | libghc-parsec2-dev (<< 3) - , libghc-parsec3-prof (>= 3) | libghc-parsec2-prof (<< 3) , libghc-random-dev - , libghc-random-prof , libghc-safecopy-dev (>= 0.6.0) - , libghc-safecopy-prof (>= 0.6.0) , libghc-syb-dev - , libghc-syb-prof , libghc-text-dev (>= 0.11) - , libghc-text-prof (>= 0.11) , libghc-utf8-string-dev - , libghc-utf8-string-prof , libghc-web-routes-dev (>= 0.26.2) - , libghc-web-routes-prof (>= 0.26.2) , libghc-web-routes-happstack-dev - , libghc-web-routes-happstack-prof , libghc-web-routes-hsp-dev - , libghc-web-routes-hsp-prof , libghc-web-routes-th-dev - , libghc-web-routes-th-prof , libghc-xss-sanitize-dev (>= 0.3.0.1) - , libghc-xss-sanitize-prof (>= 0.3.0.1) , haskell-hsx-utils -Build-Depends-Indep: ghc-doc - , libghc-extra-doc - , libghc-hjscript-doc - , libghc-http-doc - , libghc-quickcheck2-doc (>= 2) | libghc-quickcheck1-doc (<< 2) - , libghc-unixutils-doc - , libghc-unixutils-shadow-doc - , libghc-acid-state-doc - , libghc-archive-doc - , libghc-authenticate-doc - , libghc-blaze-html-doc - , libghc-blaze-markup-doc - , libghc-debian-packaging-doc - , libghc-digestive-functors-doc - , libghc-digestive-functors-happstack-doc - , libghc-digestive-functors-hsp-doc - , libghc-extensible-exceptions-doc - , libghc-happstack-authenticate-doc - , libghc-happstack-hsp-doc - , libghc-happstack-server-doc - , libghc-hslogger-doc - , libghc-hsp-doc - , libghc-hsx-doc - , libghc-ixset-doc - , libghc-jmacro-doc - , libghc-json-doc - , libghc-mtl-doc - , libghc-network-doc - , libghc-parsec3-doc (>= 3) | libghc-parsec2-doc (<< 3) - , libghc-random-doc - , libghc-safecopy-doc - , libghc-syb-doc - , libghc-text-doc - , libghc-utf8-string-doc - , libghc-web-routes-doc - , libghc-web-routes-happstack-doc - , libghc-web-routes-hsp-doc - , libghc-web-routes-th-doc - , libghc-xss-sanitize-doc Standards-Version: 3.8.1 X-Description: creativeprompts.com A social site for sharing story ideas. diff --git a/test-data/creativeprompts/output/debian/creativeprompts-production.install b/test-data/creativeprompts/output/debian/creativeprompts-production.install --- a/test-data/creativeprompts/output/debian/creativeprompts-production.install +++ b/test-data/creativeprompts/output/debian/creativeprompts-production.install @@ -1,1 +1,1 @@ -debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com /etc/apache2/sites-available/ +debian/cabalInstall/a1cb9e4b5241944a3da44e00220b5c31/creativeprompts.com.conf /etc/apache2/sites-available/ diff --git a/test-data/creativeprompts/output/debian/creativeprompts-production.links b/test-data/creativeprompts/output/debian/creativeprompts-production.links --- a/test-data/creativeprompts/output/debian/creativeprompts-production.links +++ b/test-data/creativeprompts/output/debian/creativeprompts-production.links @@ -1,1 +1,1 @@ -/etc/apache2/sites-available/creativeprompts.com /etc/apache2/sites-enabled/creativeprompts.com +/etc/apache2/sites-available/creativeprompts.com.conf /etc/apache2/sites-enabled/creativeprompts.com.conf