[Git][haskell-team/DHG_packages][master] 2 commits: hslua: downgrade back to lua5.1

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
98baf538 by Clint Adams at 2018-04-26T10:26:48-04:00
hslua: downgrade back to lua5.1

- - - - -
de0b929d by Clint Adams at 2018-04-26T10:37:37-04:00
hslua: turn pkgconfig flag back on

- - - - -


5 changed files:

- p/haskell-hslua/debian/changelog
- p/haskell-hslua/debian/control
- p/haskell-hslua/debian/patches/series
- − p/haskell-hslua/debian/patches/system-lua.diff
- p/haskell-hslua/debian/rules


Changes:

=====================================
p/haskell-hslua/debian/changelog
=====================================
--- a/p/haskell-hslua/debian/changelog
+++ b/p/haskell-hslua/debian/changelog
@@ -1,3 +1,15 @@
+haskell-hslua (0.9.5.1-5) unstable; urgency=medium
+
+  * Turn pkgconfig flag back on.
+
+ -- Clint Adams <clint at debian.org>  Thu, 26 Apr 2018 10:32:15 -0400
+
+haskell-hslua (0.9.5.1-4) unstable; urgency=medium
+
+  * Downgrade back to lua5.1.
+
+ -- Clint Adams <clint at debian.org>  Thu, 26 Apr 2018 10:26:33 -0400
+
 haskell-hslua (0.9.5.1-3) unstable; urgency=medium
 
   * Fix Build-Depends-Indep.


=====================================
p/haskell-hslua/debian/control
=====================================
--- a/p/haskell-hslua/debian/control
+++ b/p/haskell-hslua/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  ghc (>= 8),
  ghc-prof,
  haskell-devscripts (>= 0.13),
- liblua5.3-dev,
+ liblua5.1-dev,
  pkg-config,
  libghc-exceptions-dev (>= 0.8),
  libghc-exceptions-dev (<< 0.10),
@@ -42,7 +42,7 @@ X-Description: Lua language interpreter embedding in Haskell
 Package: libghc-hslua-dev
 Architecture: any
 Depends:
- liblua5.3-dev,
+ liblua5.1-dev,
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},


=====================================
p/haskell-hslua/debian/patches/series
=====================================
--- a/p/haskell-hslua/debian/patches/series
+++ b/p/haskell-hslua/debian/patches/series
@@ -1,2 +1 @@
-system-lua.diff
 no-fail


=====================================
p/haskell-hslua/debian/patches/system-lua.diff deleted
=====================================
--- a/p/haskell-hslua/debian/patches/system-lua.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/hslua.cabal
-+++ b/hslua.cabal
-@@ -35,7 +35,7 @@
- 
- flag system-lua
-   description:          Use the system-wide Lua instead of the bundled copy.
--  default:              False
-+  default:              True
- 
- flag apicheck
-   description:          Compile Lua with -DLUA_USE_APICHECK.
-@@ -59,7 +59,7 @@
- 
- flag luajit
-   description:          Link with LuaJIT.  This implies flag system-lua as well.
--  default:              False
-+  default:              True
- 
- flag lua501
-   description:          Build against lua 5.1.
-@@ -71,7 +71,7 @@
- 
- flag use-pkgconfig
-   description:          Build using pkg-config to discover library and include paths. This is only used with system-lua and luajit.
--  default:              False
-+  default:              True
- 
- library
-   build-depends:        base       >= 4.7    && < 5
-@@ -104,7 +104,7 @@
-     include-dirs:       safer-api
-     if flag(luajit)
-       if flag(use-pkgconfig)
--        pkgconfig-depends: luajit
-+        pkgconfig-depends: luajit, lua5.1
-       else
-         Extra-libraries:  luajit-5.1
-     else


=====================================
p/haskell-hslua/debian/rules
=====================================
--- a/p/haskell-hslua/debian/rules
+++ b/p/haskell-hslua/debian/rules
@@ -1,19 +1,6 @@
 #!/usr/bin/make -f
 
-#ifeq (,$(filter $(DEB_BUILD_ARCH),amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
-#else
-#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit
-#endif
-
-# To avoid duplicating the architecture data from debian/control, check for
-# existence of luajit here. But this would do the wrong thing in a hypothetical
-# unclean environment. So we do duplicate :-(
-#ifeq (0,$(shell pkg-config --exists luajit; echo $$?))
-#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit
-#else
-#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
-#endif
+DEB_SETUP_GHC_CONFIGURE_ARGS += --flags="system-lua lua501 use-pkgconfig"
 
 DEB_ENABLE_TESTS = yes
 



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/c2bc25751ef69c385594783e936a8c88d84dcddf...de0b929d64091d01290bb655b1b790689901b903

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/c2bc25751ef69c385594783e936a8c88d84dcddf...de0b929d64091d01290bb655b1b790689901b903
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180426/0440489b/attachment-0001.html>