[plplot] 03/03: Remove Add-Tcl-multiarch 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 7ba1f49cb592042be6792638ed771ea5e068b01c
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jul 12 17:49:39 2017 +0200

    Remove Add-Tcl-multiarch patch
---
 debian/patches/Add-Tcl-multiarch.patch | 51 ----------------------------------
 debian/patches/series                  |  1 -
 2 files changed, 52 deletions(-)

diff --git a/debian/patches/Add-Tcl-multiarch.patch b/debian/patches/Add-Tcl-multiarch.patch
deleted file mode 100644
index 1f4328b..0000000
--- a/debian/patches/Add-Tcl-multiarch.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Tue, 9 Sep 2014 18:17:43 +0200
-Subject: Add Tcl multiarch
-
-Change the location of tcl binaries to make the packages multiarch compliant.
----
- 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
---- a/plplot_config.h.in
-+++ b/plplot_config.h.in
-@@ -20,6 +20,9 @@
- // Location of executables
- #define BIN_DIR                  "@BIN_DIR@"
- 
-+// Location of library executables
-+#define LIBEXEC_DIR              "@LIBEXEC_DIR@"
-+
- // Location of Build tree
- #define BUILD_DIR                "@BUILD_DIR@"
- 
-diff --git a/src/plctrl.c b/src/plctrl.c
-index e2f8321..5f032f1 100644
---- a/src/plctrl.c
-+++ b/src/plctrl.c
-@@ -2123,6 +2123,7 @@ pl_cmd( PLINT op, void *ptr )
- //!	current directory
- //!	PLPLOT_HOME_ENV/bin = $(PLPLOT_HOME)/bin
- //!	BIN_DIR
-+//!	LIBEXEC_DIR
- //!
- //! The caller must free the returned pointer (points to malloc'ed memory)
- //! when finished with it.
-@@ -2189,6 +2190,14 @@ plFindCommand( PLCHAR_VECTOR fn )
-         return fs;
- #endif
- 
-+// LIBEXEC_DIR
-+
-+#if defined ( LIBEXEC_DIR )
-+    plGetName( LIBEXEC_DIR, "", fn, &fs );
-+    if ( !plFindName( fs ) )
-+        return fs;
-+#endif
-+
- // Crapped out
- 
-     free_mem( fs );
diff --git a/debian/patches/series b/debian/patches/series
index 5f516ff..cc66266 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 Unset-python-path.patch
 Proper-use-of-the-rmpath-function.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