[DHG_packages] 01/01: haskell-cabal-helper: Add patch to disable $libexec hacks

[Daniel Gröber]

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

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

commit 6e863e89f74cca1087bad96869efe5f4e7155c4f
Author: Daniel Gröber <dxld at darkboxed.org>
Date:   Fri Dec 29 18:58:45 2017 +0100

    haskell-cabal-helper: Add patch to disable $libexec hacks
---
 p/haskell-cabal-helper/debian/changelog            |  4 +++
 .../patches/disable-libexec-setuphs-hack.patch     | 30 ++++++++++++++++++++++
 p/haskell-cabal-helper/debian/patches/series       |  1 +
 3 files changed, 35 insertions(+)

diff --git a/p/haskell-cabal-helper/debian/changelog b/p/haskell-cabal-helper/debian/changelog
index 8ca67c1..06249b3 100644
--- a/p/haskell-cabal-helper/debian/changelog
+++ b/p/haskell-cabal-helper/debian/changelog
@@ -1,11 +1,15 @@
 haskell-cabal-helper (0.7.3.0-3) UNRELEASED; urgency=medium
 
+  [ Ilias Tsitsimpis ]
   * Change Priority to optional. Since Debian Policy version 4.0.1,
     priority extra has been deprecated.
   * Use the HTTPS form of the copyright-format URL
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
 
+  [ Daniel Gröber ]
+  * Add patch to disable $libexec hacks.  closes: #878112.
+
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 Nov 2017 12:13:46 +0200
 
 haskell-cabal-helper (0.7.3.0-2) unstable; urgency=medium
diff --git a/p/haskell-cabal-helper/debian/patches/disable-libexec-setuphs-hack.patch b/p/haskell-cabal-helper/debian/patches/disable-libexec-setuphs-hack.patch
new file mode 100644
index 0000000..fdd1d4b
--- /dev/null
+++ b/p/haskell-cabal-helper/debian/patches/disable-libexec-setuphs-hack.patch
@@ -0,0 +1,30 @@
+Description: Disable hack in Setup.hs which overrides $libexec
+ In Debian We install $libexec stuff straight in /usr/lib but for
+ distribution via Hackage/cabal-install it makes a lot of sense to
+ namespace $libexec executables to allow multiple instances of a package
+ to be installed, hence the original hack. This is not necesarry for
+ Debian so just remove it.
+ .
+ The current development version of cabal-helper (0.8) gets rid of
+ this hack for Cabal>=2.0 by using the new `scope` field. This will
+ most likely break the current *.install file.
+ .
+ Once Cabal-2.0 is in debian Dh_haskell.sh should probably add
+ --libexecsubdir='' to `configure_recipe` to fix that.
+Author: Daniel Groeber <dm at dxld.at>
+Bug-Debian: https://bugs.debian.org/878112
+
+--- haskell-cabal-helper-0.7.3.0.orig/Setup.hs
++++ haskell-cabal-helper-0.7.3.0/Setup.hs
+@@ -28,9 +28,9 @@ import System.Directory (renameFile)
+
+ main :: IO ()
+ main = defaultMainWithHooks $ simpleUserHooks {
+-   instHook = inst,
+-   copyHook = copy,
+-   buildHook = \pd lbi hooks flags -> (buildHook simpleUserHooks) pd (patchLibexecdir lbi) hooks flags,
++--   instHook = inst,
++--   copyHook = copy,
++--   buildHook = \pd lbi hooks flags -> (buildHook simpleUserHooks) pd (patchLibexecdir lbi) hooks flags,
+    hookedPrograms = [ simpleProgram "cabal" ]
+  }
diff --git a/p/haskell-cabal-helper/debian/patches/series b/p/haskell-cabal-helper/debian/patches/series
new file mode 100644
index 0000000..4d8ff8f
--- /dev/null
+++ b/p/haskell-cabal-helper/debian/patches/series
@@ -0,0 +1 @@
+disable-libexec-setuphs-hack.patch

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