cabal-debian 4.32.4 → 4.32.5

raw patch · 5 files changed

+16/−3 lines, 5 files

Files

• cabal-debian.cabal +1/−1
• debian/changelog +9/−0
• src/Debian/Debianize/BuildDependencies.hs +1/−1
• src/Debian/Debianize/Bundled.hs +1/−1
• src/Debian/Orphans.hs +4/−0

@@ -1,5 +1,5 @@ Name:           cabal-debian-Version:        4.32.4+Version:        4.32.5 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw License:        BSD3 License-File:   LICENSE

@@ -1,3 +1,12 @@+haskell-cabal-debian (4.32.4) unstable; urgency=low++  * Merge pull request #55 from neongreen/master+  * Bump standards version to 3.9.8 (Dmitry Bogatov)+  * Use secure (https) URI in Vcs-Git field in debian/control (Dmitry Bogatov)+  * Fix misleading error message (Dmitry Bogatov)++ -- David Fox <dsf@seereason.com>  Wed, 18 May 2016 11:46:45 -0700+ haskell-cabal-debian (4.32.2) unstable; urgency=low    * Ifdef a use of GHCJS

@@ -236,7 +236,7 @@                   (ExitSuccess, out, _) ->                       case takeWhile (not . isSpace) out of                         "" -> error $ "Unable to locate a debian package containing the build tool " ++ pkg ++-                                      ", try using --exec-map " ++ pkg ++ "=<debname> or execMap " ++ show pkg +++                                      ", try using --exec-map " ++ pkg ++ ":<debname> or execMap " ++ show pkg ++                                       " [[Rel (BinPkgName \"<debname>\") Nothing Nothing]]"                         s -> [[[D.Rel (D.BinPkgName s) Nothing Nothing]]]                   _ -> []

@@ -106,7 +106,7 @@                 lns = lines $ unsafePerformIO (chroot root (readProcess "dpkg" ["-L", unBinPkgName hcname] ""))                 parseLib :: String -> Maybe PackageIdentifier                 parseLib s =-                    case s =~ ("(.*)-([0-9.]*)-([a-f0-9]*).conf$") :: (String, String, String, [String]) of+                    case s =~ ("(.*)-([0-9.]*)-(.*).conf$") :: (String, String, String, [String]) of                       (_, _, _, [cabalName, ver, _sum]) ->                           case parseVersion' ver of                             Just v -> Just (PackageIdentifier (PackageName cabalName) v)

@@ -36,7 +36,9 @@ #if MIN_VERSION_Cabal(1,22,0) deriving instance Typeable AbiTag deriving instance Data AbiTag+#if !MIN_VERSION_Cabal(1,24,0) deriving instance Eq AbiTag+#endif deriving instance Ord AbiTag #endif @@ -44,7 +46,9 @@ deriving instance Data CompilerId  deriving instance Ord Language+#if !MIN_VERSION_Cabal(1,24,0) deriving instance Eq Compiler+#endif deriving instance Ord Compiler deriving instance Ord NameAddr deriving instance Ord License