[plplot] 02/03: Remove obsolete Fix-lua-includes patch

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit e4dfa5070530fa6a7ef30d4acbef0d0064fafd46
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jul 12 17:41:23 2017 +0200

    Remove obsolete Fix-lua-includes patch
---
 debian/patches/Add-Tcl-multiarch.patch |  7 +++----
 debian/patches/Fix-lua-includes.patch  | 26 --------------------------
 debian/patches/series                  |  1 -
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/debian/patches/Add-Tcl-multiarch.patch b/debian/patches/Add-Tcl-multiarch.patch
index 8e509b5..1f4328b 100644
--- a/debian/patches/Add-Tcl-multiarch.patch
+++ b/debian/patches/Add-Tcl-multiarch.patch
@@ -4,10 +4,9 @@ Subject: Add Tcl multiarch
 
 Change the location of tcl binaries to make the packages multiarch compliant.
 ---
- bindings/tk/CMakeLists.txt | 2 +-
- plplot_config.h.in         | 3 +++
- src/plctrl.c               | 9 +++++++++
- 3 files changed, 13 insertions(+), 1 deletion(-)
+ plplot_config.h.in | 3 +++
+ src/plctrl.c       | 9 +++++++++
+ 2 files changed, 12 insertions(+)
 
 diff --git a/plplot_config.h.in b/plplot_config.h.in
 index 78fafdd..90ec6b9 100644
diff --git a/debian/patches/Fix-lua-includes.patch b/debian/patches/Fix-lua-includes.patch
deleted file mode 100644
index b9b9d24..0000000
--- a/debian/patches/Fix-lua-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Fix lua includes
-
-Fix for cmake lua support to work around problem that lua needs multiple
-include directories on Debian
----
- cmake/modules/lua.cmake | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/cmake/modules/lua.cmake b/cmake/modules/lua.cmake
-index 6a910a3..162d920 100644
---- a/cmake/modules/lua.cmake
-+++ b/cmake/modules/lua.cmake
-@@ -84,3 +84,11 @@ if(ENABLE_lua)
-     set(LUA_DIR ${LIB_DIR}/lua/${LUA_VERSION}/plplot)
-   endif(LUA_VERSION MATCHES "5\\.0")
- endif(ENABLE_lua)
-+
-+if(ENABLE_lua AND LUA51_FOUND)
-+  pkg_check_pkgconfig(lua5.1 includedir libdir linkflags1 cflags1 version1 _LUA)
-+  if(linkflags1)
-+    set(LUA_INCLUDE_DIR ${includedir})
-+  endif(linkflags1)
-+endif(ENABLE_lua AND LUA51_FOUND)
-+
diff --git a/debian/patches/series b/debian/patches/series
index c136ec4..5f516ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 Unset-python-path.patch
 Proper-use-of-the-rmpath-function.patch
-Fix-lua-includes.patch
 Add-Tcl-multiarch.patch
 Dont-check-for-hdf5.h.patch
 Remove-nondfsg-dirs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git