[Python-apps-commits] r620 - in packages/p9m4/trunk/debian (5 files)

[pcc-guest at users.alioth.debian.org]

    Date: Sunday, February 10, 2008 @ 23:00:46
  Author: pcc-guest
Revision: 620

debian/dirs, debian/install, debian/patches/01-modularise.patch, debian/patches/03-use-inst-paths.patch, debian/setup.py: privatised the p9m4 modules to /usr/share/prover9-mace4/lib

Modified:
  packages/p9m4/trunk/debian/dirs
  packages/p9m4/trunk/debian/install
  packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch
  packages/p9m4/trunk/debian/setup.py
Deleted:
  packages/p9m4/trunk/debian/patches/01-modularise.patch

Modified: packages/p9m4/trunk/debian/dirs
===================================================================
--- packages/p9m4/trunk/debian/dirs	2008-02-10 14:45:07 UTC (rev 619)
+++ packages/p9m4/trunk/debian/dirs	2008-02-10 23:00:46 UTC (rev 620)
@@ -1 +1 @@
-usr/share/prover9-mace4
+usr/share/prover9-mace4/lib

Modified: packages/p9m4/trunk/debian/install
===================================================================
--- packages/p9m4/trunk/debian/install	2008-02-10 14:45:07 UTC (rev 619)
+++ packages/p9m4/trunk/debian/install	2008-02-10 23:00:46 UTC (rev 620)
@@ -1,2 +1,3 @@
 Images usr/share/prover9-mace4
 Samples usr/share/prover9-mace4
+{utilities,wx_utilities,files,options,partition_input,my_setup,control,platforms}.py usr/share/prover9-mace4/lib

Deleted: packages/p9m4/trunk/debian/patches/01-modularise.patch
===================================================================
--- packages/p9m4/trunk/debian/patches/01-modularise.patch	2008-02-10 14:45:07 UTC (rev 619)
+++ packages/p9m4/trunk/debian/patches/01-modularise.patch	2008-02-10 23:00:46 UTC (rev 620)
@@ -1,121 +0,0 @@
-diff -Nur p9m4-0.5/control.py p9m4-0.5.new/control.py
---- p9m4-0.5/control.py	2008-01-14 23:30:50.000000000 +0000
-+++ p9m4-0.5.new/control.py	2008-01-14 23:38:03.000000000 +0000
-@@ -24,11 +24,11 @@
- 
- # local imports
- 
--import utilities
--from files import *
--from platforms import *
--from wx_utilities import *
--from my_setup import *
-+from p9m4 import utilities
-+from p9m4.files import *
-+from p9m4.platforms import *
-+from p9m4.wx_utilities import *
-+from p9m4.my_setup import *
- from options import *
- 
- def run_and_wait(command, input = '', fin = None):
-diff -Nur p9m4-0.5/files.py p9m4-0.5.new/files.py
---- p9m4-0.5/files.py	2008-01-14 23:31:00.000000000 +0000
-+++ p9m4-0.5.new/files.py	2008-01-14 23:38:03.000000000 +0000
-@@ -23,7 +23,7 @@
- 
- # local imports
- 
--from platforms import *
-+from p9m4.platforms import *
- 
- def path_info():
-     info = ('os.getcwd(): %s\n'
-diff -Nur p9m4-0.5/__init__.py p9m4-0.5.new/__init__.py
---- p9m4-0.5/__init__.py	2008-01-14 23:30:49.000000000 +0000
-+++ p9m4-0.5.new/__init__.py	2008-01-14 23:38:03.000000000 +0000
-@@ -0,0 +1 @@
-+# This file left intentionally blank
-diff -Nur p9m4-0.5/my_setup.py p9m4-0.5.new/my_setup.py
---- p9m4-0.5/my_setup.py	2008-01-14 23:30:55.000000000 +0000
-+++ p9m4-0.5.new/my_setup.py	2008-01-14 23:38:03.000000000 +0000
-@@ -25,12 +25,12 @@
- 
- # local imports
- 
--import partition_input
--import utilities
--from files import *
--from control import *
--from platforms import *
--from wx_utilities import *
-+from p9m4 import partition_input
-+from p9m4 import utilities
-+from p9m4.files import *
-+from p9m4.control import *
-+from p9m4.platforms import *
-+from p9m4.wx_utilities import *
- from options import *
- 
- # When saving an input file, a few comments are added; when
-diff -Nur p9m4-0.5/options.py p9m4-0.5.new/options.py
---- p9m4-0.5/options.py	2008-01-14 23:30:50.000000000 +0000
-+++ p9m4-0.5.new/options.py	2008-01-14 23:38:03.000000000 +0000
-@@ -25,8 +25,8 @@
- 
- # local imports
- 
--import utilities
--from wx_utilities import *
-+from p9m4 import utilities
-+from p9m4.wx_utilities import *
- 
- # Types of Option record:
- 
-diff -Nur p9m4-0.5/partition_input.py p9m4-0.5.new/partition_input.py
---- p9m4-0.5/partition_input.py	2008-01-14 23:30:55.000000000 +0000
-+++ p9m4-0.5.new/partition_input.py	2008-01-14 23:38:03.000000000 +0000
-@@ -21,7 +21,7 @@
- 
- import re, sys
- 
--import utilities
-+from p9m4 import utilities
- 
- def in_span(i, spans):
-     for (start,end) in spans:
-diff -Nur p9m4-0.5/prover9-mace4.py p9m4-0.5.new/prover9-mace4.py
---- p9m4-0.5/prover9-mace4.py	2008-01-14 23:30:50.000000000 +0000
-+++ p9m4-0.5.new/prover9-mace4.py	2008-01-14 23:38:03.000000000 +0000
-@@ -27,13 +27,13 @@
- 
- # local imports
- 
--import partition_input
--import utilities
--from files import *
--from platforms import *
--from wx_utilities import *
--from my_setup import *
--from control import *
-+from p9m4 import partition_input
-+from p9m4 import utilities
-+from p9m4.files import *
-+from p9m4.platforms import *
-+from p9m4.wx_utilities import *
-+from p9m4.my_setup import *
-+from p9m4.control import *
- 
- Program_name = 'Prover9-Mace4'
- Program_version = '0.5'
-diff -Nur p9m4-0.5/wx_utilities.py p9m4-0.5.new/wx_utilities.py
---- p9m4-0.5/wx_utilities.py	2008-01-14 23:30:49.000000000 +0000
-+++ p9m4-0.5.new/wx_utilities.py	2008-01-14 23:38:03.000000000 +0000
-@@ -23,7 +23,7 @@
- 
- # local imports
- 
--from platforms import *
-+from p9m4.platforms import *
- 
- class State:
-     """

Modified: packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch
===================================================================
--- packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch	2008-02-10 14:45:07 UTC (rev 619)
+++ packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch	2008-02-10 23:00:46 UTC (rev 620)
@@ -28,3 +28,15 @@
  
  def binary_ok(fullpath):
      if not fullpath:
+diff -Nur p9m4-0.5/prover9-mace4.py p9m4-0.5.new/prover9-mace4.py
+--- p9m4-0.5/prover9-mace4.py	2007-12-07 16:27:13.000000000 +0000
++++ p9m4-0.5.new/prover9-mace4.py	2008-02-10 22:45:45.000000000 +0000
+@@ -27,6 +27,8 @@
+ 
+ # local imports
+ 
++sys.path.append('/usr/share/prover9-mace4/lib')
++
+ import partition_input
+ import utilities
+ from files import *

Modified: packages/p9m4/trunk/debian/setup.py
===================================================================
--- packages/p9m4/trunk/debian/setup.py	2008-02-10 14:45:07 UTC (rev 619)
+++ packages/p9m4/trunk/debian/setup.py	2008-02-10 23:00:46 UTC (rev 620)
@@ -5,7 +5,5 @@
       description = 'Graphical User Interface (GUI) to prover9 and mace4',
       author = 'William McCune',
       author_email = 'mccune at cs.unm.edu',
-      package_dir = { 'p9m4' : '.' },
-      py_modules = ['p9m4.utilities', 'p9m4.wx_utilities', 'p9m4.files', 'p9m4.options', 'p9m4.partition_input', 'p9m4.my_setup', 'p9m4.control', 'p9m4.platforms'],
       scripts = ['prover9-mace4.py'],
  )