debian 3.65.1 → 3.66
raw patch · 17 files changed
+327/−42 lines, 17 filesdep +ansi-wl-pprintdep −pretty-class
Dependencies added: ansi-wl-pprint
Dependencies removed: pretty-class
Files
- Debian/Apt/Index.hs +1/−2
- Debian/Changes.hs +3/−2
- Debian/Control/PrettyPrint.hs +4/−3
- Debian/Control/String.hs +4/−5
- Debian/Deb.hs +3/−3
- Debian/Relation/Common.hs +1/−1
- Debian/Sources.hs +1/−2
- Debian/URI.hs +1/−1
- Debian/Util/FakeChanges.hs +1/−1
- Debian/Version/Common.hs +1/−1
- Test/Changes.hs +7/−11
- Test/Control.hs +81/−0
- Test/Main.hs +26/−2
- Test/SourcesList.hs +1/−1
- debian.cabal +3/−3
- debian/changelog +185/−0
- utils/Report.hs +4/−4
Debian/Apt/Index.hs view
@@ -39,8 +39,7 @@ import System.FilePath (takeBaseName) --import qualified System.Unix.Misc as Misc import Text.ParserCombinators.Parsec.Error-import Text.PrettyPrint.Class (pretty)-+import Text.PrettyPrint.ANSI.Leijen (pretty) -- |Package indexes on the server are uncompressed or compressed with -- gzip or bzip2. We do not know what will exist on the server until we
Debian/Changes.hs view
@@ -19,7 +19,7 @@ import Debian.Version import System.Posix.Types import Text.Regex.TDFA-import Text.PrettyPrint.HughesPJ+import Text.PrettyPrint.ANSI.Leijen -- |A file generated by dpkg-buildpackage describing the result of a -- package build@@ -78,6 +78,7 @@ changedFilePriority file ++ " " ++ changedFileName file) +prettyEntry :: ChangeLogEntry -> Doc prettyEntry (Entry package version dists urgency details who date) = text (package ++ " (" ++ show (prettyDebianVersion version) ++ ") " ++ intercalate " " (map releaseName' dists) ++ "; urgency=" ++ urgency ++ "\n\n" ++ details ++ " -- " ++ who ++ " " ++ date ++ "\n\n")@@ -219,7 +220,7 @@ case text =~ changesRE :: MatchResult String of MR {mrSubList = []} -> Nothing MR {mrSubList = [_, name, version, dists, urgency, _, details]} ->- Just $ Entry name + Just $ Entry name (parseDebianVersion version) (map parseReleaseName . words $ dists) urgency
Debian/Control/PrettyPrint.hs view
@@ -1,18 +1,19 @@ {-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-} module Debian.Control.PrettyPrint where +import Data.List (intersperse) import qualified Data.ByteString.Char8 as C-import Text.PrettyPrint.HughesPJ+import Text.PrettyPrint.ANSI.Leijen import Debian.Control.Common ppControl :: (ToText a) => Control' a -> Doc ppControl (Control paragraph) =- fsep (map ppParagraph paragraph)+ vcat (map ppParagraph paragraph) ppParagraph :: (ToText a) => Paragraph' a -> Doc ppParagraph (Paragraph fields) =- fsep (map ppField fields)+ vcat (map ppField fields ++ [empty]) ppField :: (ToText a) => Field' a -> Doc ppField (Field (n,v)) = totext n <> text ":" <> totext v
Debian/Control/String.hs view
@@ -23,20 +23,19 @@ , raiseFields ) where -import qualified Control.Exception as E +import qualified Control.Exception as E import Data.Char (toLower) import Data.List import Text.ParserCombinators.Parsec import System.IO import Debian.Control.Common-import Text.PrettyPrint.Class (Pretty(pretty))-import Text.PrettyPrint.HughesPJ (text, vcat, ($$))+import Text.PrettyPrint.ANSI.Leijen (Pretty(pretty), text, vcat, (<$>), empty) -- |This may have bad performance issues (why?) instance Pretty (Control' String) where- pretty (Control paragraphs) = vcat (map (\ p -> pretty p $$ text "") paragraphs)+ pretty (Control paragraphs) = vcat (map (\ p -> pretty p) paragraphs) instance Pretty (Paragraph' String) where- pretty (Paragraph fields) = vcat (map pretty fields)+ pretty (Paragraph fields) = vcat (map pretty fields ++ [empty]) instance Pretty (Field' String) where pretty (Field (name,value)) = text $ name ++":"++ value
Debian/Deb.hs view
@@ -6,7 +6,7 @@ import Data.ByteString.Lazy (empty) import Debian.Control.Common import System.Exit (ExitCode(..))-import System.Process (CmdSpec(RawCommand), readProcessWithExitCode)+import System.Process (readProcessWithExitCode) import System.Unix.Directory (withTemporaryDirectory, withWorkingDirectory) import System.Unix.FilePath (realpath) @@ -15,9 +15,9 @@ withTemporaryDirectory ("fields.XXXXXX") $ \tmpdir -> do debFP <- realpath debFP withWorkingDirectory tmpdir $- do (res, out, err) <- readProcessWithExitCode "ar" ["x",debFP,"control.tar.gz"] empty+ do (res, out, err) <- readProcessWithExitCode "ar" ["x",debFP,"control.tar.gz"] "" when (res /= ExitSuccess) (error $ "Dpkg.fields: " ++ show out ++ "\n" ++ show err ++ "\n" ++ show res)- (res, out, err) <- readProcessWithExitCode "tar" ["xzf", "control.tar.gz", "./control"] empty+ (res, out, err) <- readProcessWithExitCode "tar" ["xzf", "control.tar.gz", "./control"] "" when (res /= ExitSuccess) (error $ "Dpkg.fields: " ++ show out ++ "\n" ++ show err ++ "\n" ++ show res) c <- parseControlFromFile "control" case c of
Debian/Relation/Common.hs view
@@ -5,7 +5,7 @@ import Data.List import Text.ParserCombinators.Parsec import Data.Function-import Text.PrettyPrint (Doc, text)+import Text.PrettyPrint.ANSI.Leijen (Doc, text) -- Local Modules
Debian/Sources.hs view
@@ -4,8 +4,7 @@ import Data.List (intercalate) import Debian.Release import Debian.URI-import Text.PrettyPrint.HughesPJ (text)-import Text.PrettyPrint.Class (Pretty(pretty))+import Text.PrettyPrint.ANSI.Leijen (Pretty(pretty), text) data SourceType = Deb | DebSrc
Debian/URI.hs view
@@ -27,7 +27,7 @@ fileFromURI :: URI -> IO (Either SomeException L.ByteString) fileFromURI uri = fileFromURIStrict uri >>= either (return . Left) (return . Right . L.fromChunks . (: [])) -fileFromURIStrict :: URI -> IO (Either SomeException L.ByteString)+fileFromURIStrict :: URI -> IO (Either SomeException B.ByteString) fileFromURIStrict uri = try $ case (uriScheme uri, uriAuthority uri) of ("file:", Nothing) -> B.readFile (uriPath uri)
Debian/Util/FakeChanges.hs view
@@ -19,7 +19,7 @@ import Text.Regex.TDFA import Prelude hiding (catch, concat, foldr, all, mapM) import Network.BSD-import Text.PrettyPrint.Class (pretty)+import Text.PrettyPrint.ANSI.Leijen (pretty) import Debian.Control import qualified Debian.Deb as Deb
Debian/Version/Common.hs view
@@ -17,7 +17,7 @@ import Text.ParserCombinators.Parsec import Text.Regex import Debian.Version.Internal-import Text.PrettyPrint (Doc, text)+import Text.PrettyPrint.ANSI.Leijen (Doc, text) prettyDebianVersion :: DebianVersion -> Doc prettyDebianVersion (DebianVersion s _) = text s
Test/Changes.hs view
@@ -11,13 +11,12 @@ show = show . prettyDebianVersion deriving instance Show ChangeLogEntry -s3 = intercalate "\n" +s3 = unlines ["name (version) dist; urgency=urgency", " * details",- " -- David Fox <dsf@seereason.com> Wed, 21 Nov 2007 01:26:57 +0000",- ""]+ " -- David Fox <dsf@seereason.com> Wed, 21 Nov 2007 01:26:57 +0000"] -s4 = intercalate "\n" +s4 = unlines ["haskell-regex-compat (0.92-3+seereason1~jaunty4) jaunty-seereason; urgency=low", "", " [ Joachim Breitner ]",@@ -26,10 +25,9 @@ "", " [ Marco Túlio Gontijo e Silva ]", "",- " -- David Fox <dsf@seereason.com> Wed, 21 Nov 2007 01:26:57 +0000",- ""]+ " -- David Fox <dsf@seereason.com> Wed, 21 Nov 2007 01:26:57 +0000"] -s1 = intercalate "\n" +s1 = unlines ["haskell-regex-compat (0.92-3+seereason1~jaunty4) jaunty-seereason; urgency=low", "", " [ Joachim Breitner ]",@@ -103,10 +101,9 @@ " * Using \"Generic Haskell cabal library packaging files v9\".", " ", " -- Ian Lynagh (wibble) <igloo@debian.org> Wed, 21 Nov 2007 01:26:57 +0000",- " ",- ""]+ " "] -s2 = intercalate "\n"+s2 = unlines ["haskell-haskeline (0.6.1.6-1+seereason1~jaunty6) jaunty-seereason; urgency=low", "", " * New upstream version.",@@ -160,7 +157,6 @@ " * Initial Debian package. (Closes: #496961)", "", " -- Marco Túlio Gontijo e Silva <marcot@holoscopio.com> Wed, 11 Mar 2009 18:58:06 -0300",- "", ""] test3 =
+ Test/Control.hs view
@@ -0,0 +1,81 @@+{-# LANGUAGE FlexibleInstances, StandaloneDeriving #-}+module Test.Control where++import Test.HUnit+import Data.List (intercalate)+import Debian.Control+import Debian.Control.PrettyPrint (ppControl, ppParagraph)+import Debian.Control.String ({- Pretty instances -})+import Text.PrettyPrint.ANSI.Leijen (pretty)++deriving instance Eq (Control' String)+deriving instance Show (Control' String)+deriving instance Show (Paragraph' String)+deriving instance Show (Field' String)++-- Additional tests of the results of parsing additional+-- inter-paragraph newlines, or missing terminating newlines, would be+-- good.+controlTests =+ [ TestCase (assertEqual "pretty1" control (either (error "parser failed") id (parseControl "debian/control" sample)))+ , TestCase (assertEqual "pretty2" sample (show (ppControl control)))+ , TestCase (assertEqual "pretty3" (head paragraphs ++ "\n") (show (ppParagraph (head (unControl control)))))+ -- The Pretty class instances are distinct implementations from+ -- those in Debian.Control.PrettyPrint. Not sure why, there is a+ -- terse note about performance concerns.+ , TestCase (assertEqual "pretty4" sample (show (pretty control)))+ , TestCase (assertEqual "pretty5" (head paragraphs ++ "\n") (show (pretty (head (unControl control))))) ]++-- | These paragraphs have no terminating newlines. They are added+-- where appropriate to the expected test results.+paragraphs =+ [ "Source: haskell-debian\nSection: haskell\nPriority: extra\nMaintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>\nUploaders: Joachim Breitner <nomeata@debian.org>\nBuild-Depends: debhelper (>= 7)\n , cdbs\n , haskell-devscripts (>= 0.7)\n , ghc\n , ghc-prof\n , libghc-hunit-dev\n , libghc-hunit-prof\n , libghc-mtl-dev\n , libghc-mtl-prof\n , libghc-parsec3-dev\n , libghc-parsec3-prof\n , libghc-pretty-class-dev\n , libghc-pretty-class-prof\n , libghc-process-extras-dev (>= 0.4)\n , libghc-process-extras-prof (>= 0.4)\n , libghc-regex-compat-dev\n , libghc-regex-compat-prof\n , libghc-regex-tdfa-dev (>= 1.1.3)\n , libghc-regex-tdfa-prof\n , libghc-bzlib-dev (>= 0.5.0.0-4)\n , libghc-bzlib-prof\n , libghc-haxml-prof (>= 1:1.20)\n , libghc-unixutils-dev (>= 1.50)\n , libghc-unixutils-prof (>= 1.50)\n , libghc-zlib-dev\n , libghc-zlib-prof\n , libghc-network-dev (>= 2.4)\n , libghc-network-prof (>= 2.4)\n , libghc-utf8-string-dev\n , libghc-utf8-string-prof,\n , libcrypto++-dev\nBuild-Depends-Indep: ghc-doc\n , libghc-hunit-doc\n , libghc-mtl-doc\n , libghc-parsec3-doc\n , libghc-pretty-class-doc\n , libghc-process-extras-doc (>= 0.4)\n , libghc-regex-compat-doc\n , libghc-regex-tdfa-doc\n , libghc-bzlib-doc\n , libghc-haxml-doc (>= 1:1.20)\n , libghc-unixutils-doc (>= 1.50)\n , libghc-zlib-doc\n , libghc-network-doc (>= 2.4)\n , libghc-utf8-string-doc\nStandards-Version: 3.9.2\nHomepage: http://hackage.haskell.org/package/debian\nVcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-debian\nVcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-debian",+ "Package: libghc-debian-dev\nArchitecture: any\nDepends: ${haskell:Depends}\n , ${shlibs:Depends}\n , ${misc:Depends}\nRecommends: ${haskell:Recommends}\nSuggests: ${haskell:Suggests}\nProvides: ${haskell:Provides}\nDescription: Haskell library for working with the Debian package system\n This package provides a library for the Haskell programming language.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the libraries compiled for GHC 6.",+ "Package: libghc-debian-prof\nArchitecture: any\nDepends: ${haskell:Depends}\n , ${shlibs:Depends}\n , ${misc:Depends}\nRecommends: ${haskell:Recommends}\nSuggests: ${haskell:Suggests}\nProvides: ${haskell:Provides}\nDescription: Profiling library for working with the Debian package system\n This package provides a library for the Haskell programming language,\n compiled for profiling.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the profiling libraries compiled for GHC 6.",+ "Package: libghc-debian-doc\nSection: doc\nArchitecture: all\nDepends: ${misc:Depends}, ${haskell:Depends}\nRecommends: ${haskell:Recommends}\nSuggests: ${haskell:Suggests}\nDescription: Documentation for Debian package system library\n This package provides the documentation for a library for the Haskell\n programming language.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the library documentation.",+ "Package: haskell-debian-utils\nSection: devel\nArchitecture: any\nDepends: ghc, ${misc:Depends}, ${shlibs:Depends}\nRecommends: apt-file\nDescription: Various helpers to work with Debian packages\n This package contains tools shipped with the Haskell library \8220debian\8221:\n .\n * fakechanges:\n Sometimes you have the .debs, .dsc, .tar.gz, .diff.gz, etc from a package\n build, but not the .changes file. This package lets you create a fake\n .changes file in case you need one.\n .\n * debian-report:\n Analyze Debian repositories and generate reports about their contents and\n relations. For example, a list of all packages in a distribution that are\n trumped by another distribution.\n .\n * cabal-debian:\n Tool for creating debianizations of Haskell packages based on the .cabal\n file. If apt-file is installed it will use it to discover what is the\n debian package name of a C library.\n .\n * apt-get-build-depends:\n Tool which will parse the Build-Depends{-Indep} lines from debian/control\n and apt-get install the required packages" ]++sample :: String+sample = intercalate "\n\n" paragraphs ++ "\n"++-- | The expecte result of parsing the sample control file.+control =+ Control+ { unControl = [Paragraph [Field ("Source"," haskell-debian")+ ,Field ("Section"," haskell")+ ,Field ("Priority"," extra")+ ,Field ("Maintainer"," Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>")+ ,Field ("Uploaders"," Joachim Breitner <nomeata@debian.org>")+ ,Field ("Build-Depends"," debhelper (>= 7)\n , cdbs\n , haskell-devscripts (>= 0.7)\n , ghc\n , ghc-prof\n , libghc-hunit-dev\n , libghc-hunit-prof\n , libghc-mtl-dev\n , libghc-mtl-prof\n , libghc-parsec3-dev\n , libghc-parsec3-prof\n , libghc-pretty-class-dev\n , libghc-pretty-class-prof\n , libghc-process-extras-dev (>= 0.4)\n , libghc-process-extras-prof (>= 0.4)\n , libghc-regex-compat-dev\n , libghc-regex-compat-prof\n , libghc-regex-tdfa-dev (>= 1.1.3)\n , libghc-regex-tdfa-prof\n , libghc-bzlib-dev (>= 0.5.0.0-4)\n , libghc-bzlib-prof\n , libghc-haxml-prof (>= 1:1.20)\n , libghc-unixutils-dev (>= 1.50)\n , libghc-unixutils-prof (>= 1.50)\n , libghc-zlib-dev\n , libghc-zlib-prof\n , libghc-network-dev (>= 2.4)\n , libghc-network-prof (>= 2.4)\n , libghc-utf8-string-dev\n , libghc-utf8-string-prof,\n , libcrypto++-dev")+ ,Field ("Build-Depends-Indep"," ghc-doc\n , libghc-hunit-doc\n , libghc-mtl-doc\n , libghc-parsec3-doc\n , libghc-pretty-class-doc\n , libghc-process-extras-doc (>= 0.4)\n , libghc-regex-compat-doc\n , libghc-regex-tdfa-doc\n , libghc-bzlib-doc\n , libghc-haxml-doc (>= 1:1.20)\n , libghc-unixutils-doc (>= 1.50)\n , libghc-zlib-doc\n , libghc-network-doc (>= 2.4)\n , libghc-utf8-string-doc")+ ,Field ("Standards-Version"," 3.9.2")+ ,Field ("Homepage"," http://hackage.haskell.org/package/debian")+ ,Field ("Vcs-Darcs"," http://darcs.debian.org/pkg-haskell/haskell-debian")+ ,Field ("Vcs-Browser"," http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-debian")]+ ,Paragraph [Field ("Package"," libghc-debian-dev")+ ,Field ("Architecture"," any")+ ,Field ("Depends"," ${haskell:Depends}\n , ${shlibs:Depends}\n , ${misc:Depends}")+ ,Field ("Recommends"," ${haskell:Recommends}")+ ,Field ("Suggests"," ${haskell:Suggests}")+ ,Field ("Provides"," ${haskell:Provides}")+ ,Field ("Description"," Haskell library for working with the Debian package system\n This package provides a library for the Haskell programming language.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the libraries compiled for GHC 6.")]+ ,Paragraph [Field ("Package"," libghc-debian-prof")+ ,Field ("Architecture"," any")+ ,Field ("Depends"," ${haskell:Depends}\n , ${shlibs:Depends}\n , ${misc:Depends}")+ ,Field ("Recommends"," ${haskell:Recommends}")+ ,Field ("Suggests"," ${haskell:Suggests}")+ ,Field ("Provides"," ${haskell:Provides}")+ ,Field ("Description"," Profiling library for working with the Debian package system\n This package provides a library for the Haskell programming language,\n compiled for profiling.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the profiling libraries compiled for GHC 6.")],+ Paragraph [Field ("Package"," libghc-debian-doc")+ ,Field ("Section"," doc")+ ,Field ("Architecture"," all")+ ,Field ("Depends"," ${misc:Depends}, ${haskell:Depends}")+ ,Field ("Recommends"," ${haskell:Recommends}")+ ,Field ("Suggests"," ${haskell:Suggests}")+ ,Field ("Description"," Documentation for Debian package system library\n This package provides the documentation for a library for the Haskell\n programming language.\n See http://www.haskell.org/ for more information on Haskell.\n .\n This library includes modules covering almost every aspect of the Debian\n packaging system, including low level data types such as version numbers\n and dependency relations, on up to the types necessary for computing and\n installing build dependencies, building source and binary packages,\n and inserting them into a repository.\n .\n This package contains the library documentation.")],+ Paragraph [Field ("Package"," haskell-debian-utils")+ ,Field ("Section"," devel")+ ,Field ("Architecture"," any")+ ,Field ("Depends"," ghc, ${misc:Depends}, ${shlibs:Depends}")+ ,Field ("Recommends"," apt-file")+ ,Field ("Description"," Various helpers to work with Debian packages\n This package contains tools shipped with the Haskell library \8220debian\8221:\n .\n * fakechanges:\n Sometimes you have the .debs, .dsc, .tar.gz, .diff.gz, etc from a package\n build, but not the .changes file. This package lets you create a fake\n .changes file in case you need one.\n .\n * debian-report:\n Analyze Debian repositories and generate reports about their contents and\n relations. For example, a list of all packages in a distribution that are\n trumped by another distribution.\n .\n * cabal-debian:\n Tool for creating debianizations of Haskell packages based on the .cabal\n file. If apt-file is installed it will use it to discover what is the\n debian package name of a C library.\n .\n * apt-get-build-depends:\n Tool which will parse the Build-Depends{-Indep} lines from debian/control\n and apt-get install the required packages")]]}
Test/Main.hs view
@@ -1,17 +1,41 @@ module Main where +import Data.List (intercalate) import Test.HUnit import System.Exit import Test.Changes+import Test.Control import Test.Versions --import Test.VersionPolicy import Test.SourcesList import Test.Dependencies+import Text.PrettyPrint.ANSI.Leijen (Doc, text, (<+>), (<$>), fillSep, renderPretty, displayS) main =- do (c,st) <- runTestText putTextToShowS (TestList (versionTests ++ sourcesListTests ++ dependencyTests ++ changesTests))+ do (c,st) <- runTestText putTextToShowS (TestList (versionTests ++ sourcesListTests ++ dependencyTests ++ changesTests ++ controlTests ++ prettyTests)) putStrLn (st "") case (failures c) + (errors c) of 0 -> return () n -> exitFailure- ++-- | I was converting from one pretty printing package to another and+-- was unclear how this should work.+prettyTests =+ [ TestCase (assertEqual+ "pretty0"+ (unlines+ ["Usage: debian-report <old sources.list> <new sources.list>",+ "",+ "Find all the packages referenced by the",+ "second sources.list which trump packages",+ "find in the first sources.list."])+ (displayS (renderPretty 1.0 40 (helpText "debian-report")) "")+ ) ]++helpText :: String -> Doc+helpText progName =+ (text "Usage:" <+> text progName <+> text "<old sources.list>" <+> text "<new sources.list>" <$>+ text [] <$>+ (fillSep $ map text $ words $ "Find all the packages referenced by the second sources.list which trump packages find in the first sources.list.") <$>+ text []+ )
Test/SourcesList.hs view
@@ -1,7 +1,7 @@ module Test.SourcesList where import Test.HUnit-import Text.PrettyPrint.Class (pretty)+import Text.PrettyPrint.ANSI.Leijen (pretty) import Debian.Sources --import Data.Maybe
debian.cabal view
@@ -1,5 +1,5 @@ Name: debian-Version: 3.65.1+Version: 3.66 License: BSD3 License-File: debian/copyright Author: David Fox <dsf@seereason.com>, Jeremy Shaw <jeremy@seereason.com>, Clifford Beshers <beshers@seereason.com>@@ -14,13 +14,14 @@ the Debian policy manual - version numbers, control file syntax, etc. extra-source-files: Test/Main.hs, Test/Changes.hs, Test/Dependencies.hs,- Test/SourcesList.hs, Test/VersionPolicy.hs, Test/Versions.hs+ Test/SourcesList.hs, Test/VersionPolicy.hs, Test/Versions.hs, Test/Control.hs, debian/changelog Flag cabal19 Description: True if Cabal >= 1.9 is available Library Build-Depends:+ ansi-wl-pprint, base >= 4 && < 5, bytestring, bzlib,@@ -34,7 +35,6 @@ old-locale, parsec >= 2 && <4, pretty,- pretty-class, process, process-extras, pureMD5,
+ debian/changelog view
@@ -0,0 +1,185 @@+haskell-debian (3.66) unstable; urgency=low++ * Eliminate the use of the tiny pretty-class package, use the Pretty+ class from ansi-wl-pprint instead.+ * Improve the pretty printing of control files in terms of terminating+ newlines and the newlines between paragraphs.+ * Add some control file unit tests.++ -- David Fox <dsf@seereason.com> Sun, 11 Nov 2012 08:21:07 -0800++haskell-debian (3.65) unstable; urgency=low++ * Replace the Show instances for control files with Pretty instances.++ -- David Fox <dsf@seereason.com> Thu, 18 Oct 2012 12:26:37 -0700++haskell-debian (3.64.1) unstable; urgency=low++ * Fix typo in maintainer name.++ -- David Fox <dsf@seereason.com> Mon, 01 Oct 2012 09:19:45 -0700++haskell-debian (3.64) unstable; urgency=low++ * Eliminate dependency on progress, eliminate most of the Unixutils+ dependency. We still need the ByteString versions of the functions+ from System.Process, and a couple of other process functions.++ -- David Fox <dsf@seereason.com> Mon, 26 Mar 2012 17:25:17 -0700++haskell-debian (3.63) unstable; urgency=low++ * Use distinct types for Debian source package names and binary package+ names everywhere, instead of strings.++ -- David Fox <dsf@seereason.com> Thu, 15 Mar 2012 12:33:05 -0700++haskell-debian (3.62.2) unstable; urgency=low++ * When parsing a list of package version relations, strip any lines+ that begin with a '#' - they are comments.++ -- David Fox <dsf@seereason.com> Thu, 08 Mar 2012 10:22:13 -0800++haskell-debian (3.62.1) unstable; urgency=low++ * Export old relaxinfo functions and data structures for diagnosing+ performance problems.++ -- David Fox <dsf@seereason.com> Thu, 01 Mar 2012 13:14:53 -0800++haskell-debian (3.62) unstable; urgency=low++ * New type for RelaxInfo, was RelaxInfo [(BinPkgName, Maybe SrcPkgName)]+ now (SrcPkgName -> BinPkgName -> Bool).++ -- David Fox <dsf@seereason.com> Sat, 25 Feb 2012 18:07:16 -0800++haskell-debian (3.61.1) unstable; urgency=low++ * Add some Data and Typeable instances.++ -- David Fox <dsf@seereason.com> Thu, 12 Jan 2012 10:18:58 -0800++haskell-debian (3.61) unstable; urgency=low++ * Uploading to hackage.+ * Remove crypto++ dependency (it was a mistake.)+ * Add optimization flag to ghc-options+ * Reference seereason darcs repo++ -- David Fox <dsf@seereason.com> Thu, 06 Oct 2011 09:04:38 -0700++haskell-debian (3.60) unstable; urgency=low++ * Replace bogus Show instances in Debian.Relation.Common with pretty+ printing functions.+ * Change cabal category from System to Debian (to join the dpkg package)+ * Fix some of the compiler warnings.+ * Change the Show instances in Debian.Version into pretty printing+ functions too.++ -- David Fox <dsf@seereason.com> Sun, 25 Sep 2011 07:33:25 -0700++haskell-debian (3.59) unstable; urgency=low++ * Move the cabal-debian program into a separate pacakge.++ -- David Fox <dsf@seereason.com> Sun, 18 Sep 2011 06:43:36 -0700++haskell-debian (3.58-0.2) unstable; urgency=low++ * Remove the --deb-name option, all the package name special cases need+ to be encoded in the Distribution.Package.Debian.Bundled.debianName function+ so that we can fix both the names for the package we are building and+ the names of its dependencies.++ -- David Fox <dsf@seereason.com> Thu, 25 Aug 2011 10:58:11 -0700++haskell-debian (3.58-0.1) unstable; urgency=low++ * Add --deb-name option, which sets the part of the package name between+ the prefix libghc- and the suffix -dev.+ * Add --epoch+ * Add --deb-version++ -- David Fox <dsf@seereason.com> Wed, 24 Aug 2011 20:45:33 -0700++haskell-debian (3.58) unstable; urgency=low++ * Add a --ghc-version option to specify what the ghc version is in the+ build environment, in case it is different from the one where the+ autobuilder is being run. This affects what packages cabal-debian+ thinks are built into the compiler. I have non-working code to actually+ look in the environment for this information, but it depends on having+ the compiler already installed there.+ * Greatly sped-up cabal-debian.+ * Add --build-dep to specify extra build dependencies.+ * Generate a haskell-packagename-utils deb with all the executables, rather+ than one deb per executable.++ -- David Fox <dsf@seereason.com> Fri, 19 Aug 2011 08:34:36 -0700++haskell-debian (3.57) unstable; urgency=low++ * Re-order generated dependencies so we are more likely to build+ with newer packages installed.++ -- David Fox <dsf@seereason.com> Tue, 16 Aug 2011 19:04:29 -0700++haskell-debian (3.56-1) unstable; urgency=low++ * I created a new repository by importing the sid version of+ haskell-debian-3.55 and then applying my patches. This is because+ I don't understand why Marco's repository is so different from the+ code in sid. At some point we will get this all sorted out.++ -- David Fox <dsf@seereason.com> Tue, 16 Aug 2011 13:00:15 -0700++haskell-debian (3.55-2) unstable; urgency=low++ * Build against parsec 3++ -- Joachim Breitner <nomeata@debian.org> Mon, 13 Jun 2011 18:13:10 +0200++haskell-debian (3.55-1) unstable; urgency=low++ * Use ghc instead of ghc6+ * control: Standards-Version: Bump, no changes needed.+ * control: haskell-debian-utils: Adds Recommends: apt-file.+ * New upstream version.+ * patches/dont-build-teste.patch: Update patch to new upstream+ version.+ * control: Update dependency on haxml to 1.20.*.+ * control: Depends on utf8-string.++ -- Marco Túlio Gontijo e Silva <marcot@debian.org> Fri, 03 Jun 2011 22:49:23 -0300++haskell-debian (3.47-3) unstable; urgency=low++ * Re-add dont-build-tests.patch, lost in the previous upload ++ -- Joachim Breitner <nomeata@debian.org> Thu, 24 Jun 2010 19:33:30 +0200++haskell-debian (3.47-2) unstable; urgency=low++ [ Erik de Castro Lopo ]+ * debian/control: Fix lintian warnings.+ * Add man pages for apt-get-build-depends, cabal-debian, debian-report and+ fakechanges.+ * Add libghc6-debian-doc.doc-base.+ * Move installation of binaries and man pages from rules file to new file+ haskell-debian-utils.install.++ [ Joachim Breitner ]+ * Adjust copyright file per FTP master request. + * Bump haskell-regex-tdfa dependency++ -- Joachim Breitner <nomeata@debian.org> Thu, 24 Jun 2010 09:47:55 +0200++haskell-debian (3.47-1) unstable; urgency=low++ * Initial release.++ -- Joachim Breitner <nomeata@debian.org> Sun, 09 May 2010 19:08:20 +0200
utils/Report.hs view
@@ -51,11 +51,11 @@ helpText :: String -> Doc helpText progName =- (text "Usage:" <+> text progName <+> text "<old sources.list>" <+> text "<new sources.list>"$+$ - text [] $+$ + (text "Usage:" <+> text progName <+> text "<old sources.list>" <+> text "<new sources.list>"$+$+ text [] $+$ (fsep $ map text $ words $ "Find all the packages referenced by the second sources.list which trump packages find in the first sources.list.") )- + parseArgs :: IO (String, String) parseArgs = do args <- getArgs@@ -71,7 +71,7 @@ hPutStrLn stderr =<< renderWidth (helpText progName) exitFailure -- |render a Doc using the current terminal width- renderWidth :: Doc -> IO String + renderWidth :: Doc -> IO String renderWidth doc = do columns <- return . fromMaybe 80 =<< getWidth return $ renderStyle (Style PageMode columns 1.0) doc