[DHG_packages] 01/01: tweak RTS lib paths in threading tests of darcs, hledger, hlint

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit 005989597469fd7ce9185ec20d00aeef1b019835
Author: Clint Adams <clint at debian.org>
Date:   Wed Aug 12 14:50:38 2015 +0200

    tweak RTS lib paths in threading tests of darcs, hledger, hlint
---
 p/darcs/debian/changelog           | 8 ++++++--
 p/darcs/debian/rules               | 2 +-
 p/haskell-hledger/debian/changelog | 8 ++++++--
 p/haskell-hledger/debian/rules     | 2 +-
 p/hlint/debian/changelog           | 6 ++++++
 p/hlint/debian/rules               | 2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog
index 763d432..8e8c979 100644
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -1,8 +1,12 @@
-darcs (2.10.1-3.1) UNRELEASED; urgency=medium
+darcs (2.10.1-4) UNRELEASED; urgency=medium
 
+  [ Helmut Grohne ]
   * Mark darcs as Multi-Arch:foreign.
 
- -- Helmut Grohne <helmut at subdivi.de>  Mon, 03 Aug 2015 19:50:35 +0200
+  [ Clint Adams ]
+  * Tweak RTS lib path in threading test.
+
+ -- Clint Adams <clint at debian.org>  Wed, 12 Aug 2015 14:49:38 +0200
 
 darcs (2.10.1-3) unstable; urgency=medium
 
diff --git a/p/darcs/debian/rules b/p/darcs/debian/rules
index 762e52b..c790f0f 100755
--- a/p/darcs/debian/rules
+++ b/p/darcs/debian/rules
@@ -7,7 +7,7 @@ DEB_CABAL_PACKAGE=darcs
 
 DEB_INSTALL_CHANGELOGS_ALL=NEWS
 
-DEB_SETUP_GHC_CONFIGURE_ARGS=$(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) -fpkgconfig -fcurl -f-http -fterminfo --ghc-options="+RTS -V0 -RTS"
+DEB_SETUP_GHC_CONFIGURE_ARGS=$(if $(wildcard /usr/lib/ghc/*/libHSrts_thr.a),,-f-threaded) -fpkgconfig -fcurl -f-http -fterminfo --ghc-options="+RTS -V0 -RTS"
 
 binary-post-install/darcs::
 	dh_bash-completion
diff --git a/p/haskell-hledger/debian/changelog b/p/haskell-hledger/debian/changelog
index dec4880..6efe841 100644
--- a/p/haskell-hledger/debian/changelog
+++ b/p/haskell-hledger/debian/changelog
@@ -1,8 +1,12 @@
-haskell-hledger (0.24.1-1.1) UNRELEASED; urgency=medium
+haskell-hledger (0.24.1-2) UNRELEASED; urgency=medium
 
+  [ Helmut Grohne ]
   * Mark hledger as Multi-Arch:foreign.
 
- -- Helmut Grohne <helmut at subdivi.de>  Mon, 03 Aug 2015 19:50:07 +0200
+  [ Clint Adams ]
+  * Tweak RTS lib path in threading test.
+
+ -- Clint Adams <clint at debian.org>  Wed, 12 Aug 2015 14:50:13 +0200
 
 haskell-hledger (0.24.1-1) unstable; urgency=medium
 
diff --git a/p/haskell-hledger/debian/rules b/p/haskell-hledger/debian/rules
index 93e75eb..294d69e 100755
--- a/p/haskell-hledger/debian/rules
+++ b/p/haskell-hledger/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/libHSrts_thr.a || echo --flags=-threaded)
+DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/rts-1.0/libHSrts_thr.a || echo --flags=-threaded)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
diff --git a/p/hlint/debian/changelog b/p/hlint/debian/changelog
index 9f063e5..6b5fd05 100644
--- a/p/hlint/debian/changelog
+++ b/p/hlint/debian/changelog
@@ -1,3 +1,9 @@
+hlint (1.9.21-2) UNRELEASED; urgency=medium
+
+  * Tweak RTS lib path in threading test.
+
+ -- Clint Adams <clint at debian.org>  Wed, 12 Aug 2015 14:50:22 +0200
+
 hlint (1.9.21-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/hlint/debian/rules b/p/hlint/debian/rules
index e6d3159..a4e90c7 100755
--- a/p/hlint/debian/rules
+++ b/p/hlint/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
 # If no threaded RTS is found, disable it
-DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/libHSrts_thr.a || echo --flags=-threaded) --datasubdir=/usr/share/hlint
+DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/rts-1.0/libHSrts_thr.a || echo --flags=-threaded) --datasubdir=/usr/share/hlint
 
 build/$(CABAL_PACKAGE) :: build-ghc-stamp
 

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