Commit e12041db authored by Hugo Lefeuvre's avatar Hugo Lefeuvre

Refresh configobj & directories patch

parent 1836978c
......@@ -2,24 +2,24 @@ Description: Remove configobj from package;
use python-configobj package instead
Author: Bernhard Reiter <ockham@raz.or.at>
--- a/setup.py
+++ b/setup.py
--- a/setup.py 2018-07-31 12:11:50.860404817 +0800
+++ b/setup.py 2018-07-31 12:12:07.796171593 +0800
@@ -72,7 +72,6 @@
'license' : 'GPL',
'scripts' : ['pysol.py'],
'packages' : ['pysollib',
- 'pysollib.configobj',
'pysollib.macosx',
'pysollib.winsystems',
'pysollib.tk',
--- a/pysollib/options.py
+++ b/pysollib/options.py
@@ -28,7 +28,7 @@
'license': 'GPL',
'scripts': ['pysol.py'],
'packages': ['pysollib',
- 'pysollib.configobj',
'pysollib.macosx',
'pysollib.winsystems',
'pysollib.tk',
--- a/pysollib/options.py 2018-07-31 12:11:50.860404817 +0800
+++ b/pysollib/options.py 2018-07-31 12:12:39.095810855 +0800
@@ -29,7 +29,7 @@
# PySol imports
from mfxutil import print_err
from resource import CSI
-from configobj import configobj, validate
from pysollib.mfxutil import print_err
from pysollib.resource import CSI
-from pysollib.configobj import configobj, validate
+import configobj, validate
import settings
import pysollib.settings
# Toolkit imports
Description: Change some data and doc locations
Author: Bernhard Reiter <ockham@raz.or.at>
Index: pysolfc-2.0/setup.py
===================================================================
--- pysolfc-2.0.orig/setup.py 2010-01-30 22:05:07.000000000 +0100
+++ pysolfc-2.0/setup.py 2010-01-30 22:05:29.000000000 +0100
--- a/setup.py 2018-07-31 12:15:02.798935537 +0800
+++ b/setup.py 2018-07-31 12:15:02.794935550 +0800
@@ -9,14 +9,13 @@
import py2exe
eval('import py2exe')
if os.name == 'posix':
- data_dir = 'share/PySolFC'
......@@ -21,11 +19,9 @@ Index: pysolfc-2.0/setup.py
'images',
'sound',
'tiles',
Index: pysolfc-2.0/pysollib/settings.py
===================================================================
--- pysolfc-2.0.orig/pysollib/settings.py 2010-01-30 22:05:07.000000000 +0100
+++ pysolfc-2.0/pysollib/settings.py 2010-01-30 22:05:29.000000000 +0100
@@ -59,10 +59,7 @@
--- a/pysollib/settings.py 2018-07-31 12:15:02.798935537 +0800
+++ b/pysollib/settings.py 2018-07-31 12:15:02.794935550 +0800
@@ -61,10 +61,7 @@
# you can add your extra directories here
if os.name == 'posix':
DATA_DIRS = [
......@@ -37,11 +33,9 @@ Index: pysolfc-2.0/pysollib/settings.py
]
if os.name == 'nt':
pass
Index: pysolfc-2.0/pysollib/mfxutil.py
===================================================================
--- pysolfc-2.0.orig/pysollib/mfxutil.py 2010-01-30 22:05:07.000000000 +0100
+++ pysolfc-2.0/pysollib/mfxutil.py 2010-01-30 22:05:29.000000000 +0100
@@ -119,7 +119,7 @@
--- a/pysollib/mfxutil.py 2018-07-31 12:15:02.798935537 +0800
+++ b/pysollib/mfxutil.py 2018-07-31 12:15:02.794935550 +0800
@@ -127,7 +127,7 @@
home = os.environ.get("HOME", "").strip()
if not home or not os.path.isdir(home):
home = os.curdir
......
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