debian/cabal-wrapper: Removed this hack which should not be needed anymore.
This commit is contained in:
parent
a6c56fb459
commit
9b38c14165
5 changed files with 4 additions and 23 deletions
20
debian/cabal-wrapper
vendored
20
debian/cabal-wrapper
vendored
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
# It would be more usual to use:
|
||||
# export CABAL=./Setup
|
||||
# But Setup currently has a very bad dependency resolver, and very bad
|
||||
# debugging output, and tends to eat all memory and die on small buildds.
|
||||
#
|
||||
# This should be revisited once Debian has a newer ghc than 7.6.3,
|
||||
# and hopefully gets the improved dependency resolver from cabal.
|
||||
set -e
|
||||
|
||||
# Avoid cabal writing to HOME, and avoid local cabal settings
|
||||
# influencing the build.
|
||||
HOME=$(mktemp -d)
|
||||
export HOME
|
||||
|
||||
# Temporary workaround for #763078
|
||||
PATH=/usr/lib/llvm-3.4/bin:$PATH
|
||||
export PATH
|
||||
|
||||
cabal "$@"
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -30,6 +30,7 @@ git-annex (5.20150529) UNRELEASED; urgency=medium
|
|||
Fixes: unused, object count in info, unannex.
|
||||
* Improve url parsing to handle some urls containing illegal []
|
||||
characters in their paths.
|
||||
* debian/cabal-wrapper: Removed this hack which should not be needed anymore.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Sat, 30 May 2015 02:07:18 -0400
|
||||
|
||||
|
|
1
debian/control
vendored
1
debian/control
vendored
|
@ -4,7 +4,6 @@ Priority: optional
|
|||
Build-Depends:
|
||||
debhelper (>= 9),
|
||||
ghc (>= 7.4),
|
||||
cabal-install,
|
||||
libghc-mtl-dev (>= 2.1.1),
|
||||
libghc-missingh-dev,
|
||||
libghc-data-default-dev,
|
||||
|
|
3
debian/rules
vendored
3
debian/rules
vendored
|
@ -1,6 +1,7 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
export CABAL=debian/cabal-wrapper
|
||||
# Avoid using cabal, as it writes to $HOME
|
||||
export CABAL=./Setup
|
||||
|
||||
STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \
|
||||
&& echo 1 || echo 0)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Name: git-annex
|
||||
Version: 5.20150528
|
||||
Version: 5.20150529
|
||||
Cabal-Version: >= 1.8
|
||||
License: GPL-3
|
||||
Maintainer: Joey Hess <id@joeyh.name>
|
||||
|
|
Loading…
Reference in a new issue