[DHG_packages] 127/128: Refresh lua patches (untested)

Joachim Breitner nomeata at moszumanska.debian.org
Sat Aug 15 12:46:32 UTC 2015


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

nomeata pushed a commit to branch st3
in repository DHG_packages.

commit 78ed0683c3d50e8ed297fb8cd4e32a6b4fa56213
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 15 14:40:36 2015 +0200

    Refresh lua patches (untested)
---
 p/haskell-hslua/debian/control                 |  2 ++
 p/haskell-hslua/debian/patches/system-lua.diff | 30 +++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/p/haskell-hslua/debian/control b/p/haskell-hslua/debian/control
index ade26d9..eea1652 100644
--- a/p/haskell-hslua/debian/control
+++ b/p/haskell-hslua/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9),
  ghc-prof,
  pkg-config,
  liblua5.1-0-dev,
+ libluajit-5.1-dev,
 Build-Depends-Indep: ghc-doc,
 Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/hslua
@@ -25,6 +26,7 @@ Depends: ${haskell:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
  liblua5.1-0-dev,
+ libluajit-5.1-dev,
 Recommends: ${haskell:Recommends},
 Suggests: ${haskell:Suggests},
 Provides: ${haskell:Provides},
diff --git a/p/haskell-hslua/debian/patches/system-lua.diff b/p/haskell-hslua/debian/patches/system-lua.diff
index 9d8e795..41a6353 100644
--- a/p/haskell-hslua/debian/patches/system-lua.diff
+++ b/p/haskell-hslua/debian/patches/system-lua.diff
@@ -1,22 +1,22 @@
-Index: hslua-0.3.13/hslua.cabal
+Index: haskell-hslua/hslua.cabal
 ===================================================================
---- hslua-0.3.13.orig/hslua.cabal	2015-04-06 12:29:13.105252831 +0200
-+++ hslua-0.3.13/hslua.cabal	2015-04-06 12:30:15.828744759 +0200
-@@ -25,7 +25,7 @@
-
+--- haskell-hslua.orig/hslua.cabal	2015-08-15 14:37:56.512810553 +0200
++++ haskell-hslua/hslua.cabal	2015-08-15 14:39:58.063289762 +0200
+@@ -30,7 +30,7 @@
+ 
  flag system-lua
-   description:          Use the system-wide lua instead of the bundled copy
+   description:          Use the system-wide Lua instead of the bundled copy
 -  default:              False
 +  default:              True
-
+ 
  flag apicheck
    description:          Compile Lua with -DLUA_USE_APICHECK.
-@@ -36,7 +36,7 @@
-   Exposed-modules:      Scripting.Lua, Scripting.Lua.ConfigFile
-   Hs-source-dirs:       src
-   if flag(system-lua)
--    Pkgconfig-depends:  lua
-+    Pkgconfig-depends:  lua5.1
-     C-sources:          cbits/ntrljmp.c
-     Include-dirs:       cbits
+@@ -49,7 +49,7 @@
+     if flag(luajit)
+       Extra-libraries:  luajit-5.1
+     else
+-      Extra-libraries:  lua
++      Extra-libraries:  lua5
+     includes:           lua.h
    else
+     c-sources:          lua-5.1.5/lobject.c, lua-5.1.5/ltm.c, lua-5.1.5/ldblib.c,

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



More information about the Pkg-haskell-commits mailing list