Commit 1330ba20 authored by Ole Streicher's avatar Ole Streicher

Rediff patches

Drop Remove-module-name-extension-from-extension-modules.patch: <REASON>
parent ab32b747
From: Ole Streicher <olebole@debian.org>
Date: Wed, 20 Dec 2017 15:41:56 +0100
Subject: Remove "module" name extension from extension modules
---
setup.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index f64df66..cc23df7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,12 +25,12 @@ data_files =
pyraf/clcache = data/clcache/*
scripts = scripts/pyraf
-[extension=pyraf.sscanfmodule]
+[extension=pyraf.sscanf]
sources = src/sscanfmodule.c
optional = True
fail_message = If this is Windows, it is ok.
-[extension=pyraf.xutilmodule]
+[extension=pyraf.xutil]
sources = src/xutil.c
libraries = X11
......@@ -8,10 +8,10 @@ Subject: Use system provided iraf by default
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/lib/pyraf/clcache.py b/lib/pyraf/clcache.py
index f47a01e..087c640 100644
index ce34c71..2f025a3 100644
--- a/lib/pyraf/clcache.py
+++ b/lib/pyraf/clcache.py
@@ -322,12 +322,10 @@ def test():
@@ -285,12 +285,10 @@ class _CodeCache:
# create code cache
......@@ -21,13 +21,13 @@ index f47a01e..087c640 100644
try:
- os.mkdir(userCacheDir)
- if '-s' not in sys.argv and '--silent' not in sys.argv:
- print 'Created directory %s for cache' % userCacheDir
- print('Created directory %s for cache' % userCacheDir)
+ os.makedirs(userCacheDir)
except OSError:
print 'Could not create directory %s' % userCacheDir
print('Could not create directory %s' % userCacheDir)
diff --git a/lib/pyraf/iraffunctions.py b/lib/pyraf/iraffunctions.py
index 63ba9ec..22f8205 100644
index 9484ad8..2cbac20 100644
--- a/lib/pyraf/iraffunctions.py
+++ b/lib/pyraf/iraffunctions.py
@@ -175,9 +175,9 @@ def Init(doprint=1,hush=0,savefile=None):
......
Use-system-provided-iraf-by-default.patch
Install-pyraf-script-only-for-Python-3.patch
Remove-module-name-extension-from-extension-modules.patch
Fix-FTBFS-for-GNU-HURD.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment