[DHG_packages] 02/03: cabal-debian: fix to detect GHC built-in packages correctly.

[Kei Hibino]

This is an automated email from the git hooks/post-receive script.

khibino-guest pushed a commit to branch master
in repository DHG_packages.

commit e49cb5c7a6d8bd89ea38e21d88753b26d00d0b2d
Author: Kei Hibino <ex8k.hibino at gmail.com>
Date:   Wed Jan 11 21:37:10 2017 +0900

    cabal-debian: fix to detect GHC built-in packages correctly.
---
 p/cabal-debian/debian/patches/fix-ghc-builtin | 13 +++++++++++++
 p/cabal-debian/debian/patches/series          |  1 +
 2 files changed, 14 insertions(+)

diff --git a/p/cabal-debian/debian/patches/fix-ghc-builtin b/p/cabal-debian/debian/patches/fix-ghc-builtin
new file mode 100644
index 0000000..34888f0
--- /dev/null
+++ b/p/cabal-debian/debian/patches/fix-ghc-builtin
@@ -0,0 +1,13 @@
+Index: cabal-debian-4.33/src/Debian/Debianize/Bundled.hs
+===================================================================
+--- cabal-debian-4.33.orig/src/Debian/Debianize/Bundled.hs	2016-10-07 04:13:42.000000000 +0900
++++ cabal-debian-4.33/src/Debian/Debianize/Bundled.hs	2017-01-09 21:43:40.231080418 +0900
+@@ -105,7 +105,7 @@
+                 lns = lines $ unsafePerformIO (chroot root (readProcess "dpkg" ["-L", unBinPkgName hcname] ""))
+                 parseLib :: String -> Maybe PackageIdentifier
+                 parseLib s =
+-                    case s =~ ("(.*)-([0-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)
diff --git a/p/cabal-debian/debian/patches/series b/p/cabal-debian/debian/patches/series
index 488346d..1fb699f 100644
--- a/p/cabal-debian/debian/patches/series
+++ b/p/cabal-debian/debian/patches/series
@@ -1 +1,2 @@
 newer-cabal
+fix-ghc-builtin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git