[pyferret] 98/110: minor fixes to patches

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 86d6696d5ac8732ce6d350b2677c6003c80d8f53
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 26 12:48:19 2017 +0100

    minor fixes to patches
---
 debian/patches/reproducible.patch | 14 --------------
 debian/patches/set-envvars.patch  | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 7be1480..1fb5055 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -21,17 +21,3 @@ Index: pyferret-7.1.1.beta/fer/Makefile
  
  #
  # Macros
-Index: pyferret-7.1.1.beta/fer/grdel/window.c
-===================================================================
---- pyferret-7.1.1.beta.orig/fer/grdel/window.c
-+++ pyferret-7.1.1.beta/fer/grdel/window.c
-@@ -50,6 +50,9 @@ static void openlogfile(void)
- }
- #endif /* VERBOSEDEBUG */
- 
-+#if PY_MAJOR_VERSION >=3
-+#define PyString_FromString(x) PyUnicode_FromString(x)
-+#endif
- 
- static const char *grdelwindowid = "GRDEL_WINDOW";
- 
diff --git a/debian/patches/set-envvars.patch b/debian/patches/set-envvars.patch
index 8e2d92c..0da8901 100644
--- a/debian/patches/set-envvars.patch
+++ b/debian/patches/set-envvars.patch
@@ -7,10 +7,18 @@ Index: pyferret-7.1.1.beta/pyfermod/__init__.py
 ===================================================================
 --- pyferret-7.1.1.beta.orig/pyfermod/__init__.py
 +++ pyferret-7.1.1.beta/pyfermod/__init__.py
-@@ -32,6 +32,21 @@ and syntax.
+@@ -32,6 +32,7 @@ and syntax.
  
  from __future__ import print_function
  
++
+ import sys
+ import os
+ import atexit
+@@ -41,6 +42,21 @@ except ImportError:
+     pass
+ import readline
+ 
 +# In Debian, an application should be able to start without environmental
 +# variables needing to be set. So set them here.
 +if os.environ.get('FER_GO') is None:
@@ -26,6 +34,6 @@ Index: pyferret-7.1.1.beta/pyfermod/__init__.py
 +if os.environ.get('FER_LIBS') is None:
 +    os.environ['FER_LIBS'] = '/usr/lib/ferret-vis/efmem:/usr/lib/ferret-vis/external_functions'
 +
- import sys
- import os
- import atexit
+ from pyferret import libpyferret
+ # also import everything (not starting with an underscore) from libpyferret
+ # so constants in that module are seen as part of this module

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