[Pkg-ganeti-devel] [ganeti] 02/06: use-proper-cabal-dev.patch: match newer cabal output

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Tue Dec 13 15:59:42 UTC 2016


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

apoikos pushed a commit to branch master
in repository ganeti.

commit 87a34754e772893955d66d45af3394f5fe3984cb
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Nov 21 12:44:35 2016 +0200

    use-proper-cabal-dev.patch: match newer cabal output
---
 debian/patches/use-proper-cabal-dev.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/use-proper-cabal-dev.patch b/debian/patches/use-proper-cabal-dev.patch
index 13622d3..5b0d3be 100644
--- a/debian/patches/use-proper-cabal-dev.patch
+++ b/debian/patches/use-proper-cabal-dev.patch
@@ -25,7 +25,7 @@ Forwarded: not-needed (debian-specific)
 +# dist/setup-config with the same library as that used by the cabal binary that
 +# created the file.
 +DEBIAN_CABAL_DEV_VERSION = \
-+	$(shell $(CABAL) -V | $(AWK) '/^using version .* of the Cabal library/ { print $$3 }')
++	$(shell $(CABAL) -V | $(AWK) '/^(compiled )?using version .* of the Cabal library/ { gsub(/^compiled/, ""); print $$3 }')
 +
  $(HASKELL_PACKAGE_VERSIONS_FILE): Makefile ganeti.cabal \
                                    cabal/CabalDependenciesMacros.hs

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



More information about the Pkg-ganeti-devel mailing list