diff options
| author | Clint Adams <clint@debian.org> | 2017-06-18 02:40:56 -0400 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2017-06-18 11:59:40 -0400 |
| commit | aa6d84848f2ed23642ec2fb31d1d4de559a42603 (patch) | |
| tree | 200e3350c6ff2afee72d812eaa0356bcc286f397 /p/hdevtools/debian | |
| parent | 05bc1a937e958efa4f37bdbfd9809da970e51802 (diff) | |
| download | DHG_packages-aa6d84848f2ed23642ec2fb31d1d4de559a42603.tar.gz | |
hdevtools: Upgrading from 0.1.4.1 to 0.1.5.0
Diffstat (limited to 'p/hdevtools/debian')
| -rw-r--r-- | p/hdevtools/debian/changelog | 6 | ||||
| -rw-r--r-- | p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch | 22 | ||||
| -rw-r--r-- | p/hdevtools/debian/patches/series | 1 |
3 files changed, 6 insertions, 23 deletions
diff --git a/p/hdevtools/debian/changelog b/p/hdevtools/debian/changelog index 8916f73be..c4ef22f6f 100644 --- a/p/hdevtools/debian/changelog +++ b/p/hdevtools/debian/changelog @@ -1,3 +1,9 @@ +hdevtools (0.1.5.0-1) unstable; urgency=medium + + * New upstream release + + -- Clint Adams <clint@debian.org> Sun, 18 Jun 2017 02:40:56 -0400 + hdevtools (0.1.4.1-2) unstable; urgency=medium * Apply upstream patch that fixes ghc library directory lookup diff --git a/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch b/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch deleted file mode 100644 index fd39e64a4..000000000 --- a/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Fixed ghc lib dir lookup via stack for system installed ghc -Author: Tomas Janousek <tomi@nomi.cz> -Origin: upstream, https://github.com/hdevtools/hdevtools/commit/a436699b8587a -Bug-Debian: https://bugs.debian.org/846023 - -Index: b/src/Stack.hs -=================================================================== ---- a/src/Stack.hs -+++ b/src/Stack.hs -@@ -52,7 +52,11 @@ getStackGhcBinDir :: FilePath -> IO (May - getStackGhcBinDir = fmap (fmap trim) . execStackInPath "path --compiler-bin" - - getStackGhcLibDir :: FilePath -> IO (Maybe FilePath) --getStackGhcLibDir = fmap (fmap takeDirectory) . execStackInPath "path --global-pkg-db" -+getStackGhcLibDir p = do -+ ghc <- (trim <$>) <$> execStackInPath "path --compiler-exe" p -+ case ghc of -+ Just exe -> (trim <$>) <$> execInPath (exe ++ " --print-libdir") p -+ Nothing -> return Nothing - - getStackDist :: FilePath -> IO (Maybe FilePath) - getStackDist p = (trim <$>) <$> execStackInPath "path --dist-dir" p diff --git a/p/hdevtools/debian/patches/series b/p/hdevtools/debian/patches/series deleted file mode 100644 index 636222235..000000000 --- a/p/hdevtools/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix_getStackGhcLibDir.patch |