[Python-apps-commits] r522 - in packages/p9m4/trunk (17 files)
pcc-guest at users.alioth.debian.org
pcc-guest at users.alioth.debian.org
Tue Jan 15 02:29:53 UTC 2008
Date: Tuesday, January 15, 2008 @ 02:29:53
Author: pcc-guest
Revision: 522
[svn-inject] Applying Debian modifications to trunk
Added:
packages/p9m4/trunk/debian/
packages/p9m4/trunk/debian/changelog
packages/p9m4/trunk/debian/compat
packages/p9m4/trunk/debian/control
packages/p9m4/trunk/debian/copyright
packages/p9m4/trunk/debian/dirs
packages/p9m4/trunk/debian/install
packages/p9m4/trunk/debian/manpages
packages/p9m4/trunk/debian/patches/
packages/p9m4/trunk/debian/patches/01-modularise.patch
packages/p9m4/trunk/debian/patches/02-no-2.5isms.patch
packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch
packages/p9m4/trunk/debian/prover9-mace4.1
packages/p9m4/trunk/debian/pycompat
packages/p9m4/trunk/debian/rules
packages/p9m4/trunk/debian/setup.py
packages/p9m4/trunk/debian/watch
Property changes on: packages/p9m4/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/p9m4/trunk/debian/changelog
===================================================================
--- packages/p9m4/trunk/debian/changelog (rev 0)
+++ packages/p9m4/trunk/debian/changelog 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,12 @@
+p9m4 (0.5-1) unstable; urgency=low
+
+ * Initial release (closes: #460813)
+ * my_setup.py, partition_input.py: removed Python-2.5isms from code
+ * control.py, files.py, my_setup.py, options.py, partition_input.py,
+ prover9-mace4.py, wx_utilities.py: moved library code into separate
+ module
+ * debian/setup.py: wrote sane distutils script
+ * files.py: point to correct file locations
+
+ -- Peter Collingbourne <pcc03 at doc.ic.ac.uk> Tue, 15 Jan 2008 01:35:54 +0000
+
Added: packages/p9m4/trunk/debian/compat
===================================================================
--- packages/p9m4/trunk/debian/compat (rev 0)
+++ packages/p9m4/trunk/debian/compat 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1 @@
+5
Added: packages/p9m4/trunk/debian/control
===================================================================
--- packages/p9m4/trunk/debian/control (rev 0)
+++ packages/p9m4/trunk/debian/control 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,16 @@
+Source: p9m4
+Section: math
+Priority: optional
+Maintainer: Peter Collingbourne <pcc03 at doc.ic.ac.uk>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 5), python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3)
+Standards-Version: 3.7.2
+Homepage: http://www.cs.unm.edu/~mccune/mace4/
+
+Package: prover9-mace4
+Architecture: all
+Depends: ${python:Depends}, python-wxgtk2.6, prover9 (>= 0.0.200712-1), mace4 (>= 0.0.200712-1), ladr4-apps (>= 0.0.200712-1)
+Description: GUI for Prover9 and Mace4
+ This package provides a graphical user interface for easily running
+ the Prover9 theorem prover and the Mace4 countermodel generator
+ along with a number of sample input files.
Added: packages/p9m4/trunk/debian/copyright
===================================================================
--- packages/p9m4/trunk/debian/copyright (rev 0)
+++ packages/p9m4/trunk/debian/copyright 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,33 @@
+This package was debianized by Peter Collingbourne <pcc03 at doc.ic.ac.uk> on
+Mon, 14 Jan 2008 16:40:29 +0000.
+
+It was downloaded from <http://www.cs.unm.edu/~mccune/mace4/gui/v05.html>
+
+Upstream Author:
+
+ William McCune <mccune at cs.unm.edu>
+
+Copyright:
+
+ Copyright (C) 2006, 2007 William McCune
+
+License:
+
+ The LADR Deduction Library is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public License,
+ version 2.
+
+ The LADR Deduction Library is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with the LADR Deduction Library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Peter Collingbourne <pcc03 at doc.ic.ac.uk> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/p9m4/trunk/debian/dirs
===================================================================
--- packages/p9m4/trunk/debian/dirs (rev 0)
+++ packages/p9m4/trunk/debian/dirs 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1 @@
+usr/share/prover9-mace4
Added: packages/p9m4/trunk/debian/install
===================================================================
--- packages/p9m4/trunk/debian/install (rev 0)
+++ packages/p9m4/trunk/debian/install 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,2 @@
+Images usr/share/prover9-mace4
+Samples usr/share/prover9-mace4
Added: packages/p9m4/trunk/debian/manpages
===================================================================
--- packages/p9m4/trunk/debian/manpages (rev 0)
+++ packages/p9m4/trunk/debian/manpages 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1 @@
+debian/prover9-mace4.1
Added: packages/p9m4/trunk/debian/patches/01-modularise.patch
===================================================================
--- packages/p9m4/trunk/debian/patches/01-modularise.patch (rev 0)
+++ packages/p9m4/trunk/debian/patches/01-modularise.patch 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,121 @@
+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:
+ """
Added: packages/p9m4/trunk/debian/patches/02-no-2.5isms.patch
===================================================================
--- packages/p9m4/trunk/debian/patches/02-no-2.5isms.patch (rev 0)
+++ packages/p9m4/trunk/debian/patches/02-no-2.5isms.patch 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,44 @@
+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:35:45.000000000 +0000
+@@ -158,7 +158,9 @@
+ self.ed.SetStyle(start, end,
+ wx.TextAttr('RED',
+ wx.Colour(200,200,255)))
+- error_dialog('%s\n%s' % (message,error if error else ''))
++ error_dialog('%s\n%s' % (message,error))
++ else:
++ error_dialog(message)
+ else:
+ frame = Text_frame(self, to_top(self).box_font,
+ 'Error Output',
+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:35:45.000000000 +0000
+@@ -63,14 +63,23 @@
+ m2 = r2.search(str, m1.end())
+ while m2 and in_span(m2.start(), comments):
+ m2 = r2.search(str, m2.end())
+- match_end = m2.end() if m2 else len(str)
++ if m2:
++ match_end = m2.end()
++ else:
++ match_end = len(str)
+ other += str[other_start:m1.start()]
+ if remove_patterns:
+ keep_start = m1.end()
+- keep_end = m2.start() if m2 else len(str)
++ if m2:
++ keep_end = m2.start()
++ else:
++ keep_end = len(str)
+ else:
+ keep_start = m1.start()
+- keep_end = m2.end() if m2 else len(str)
++ if m2:
++ keep_end = m2.end()
++ else:
++ keep_end = len(str)
+ matched += str[keep_start:keep_end]
+ next = other_start = match_end
+ else:
Added: packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch
===================================================================
--- packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch (rev 0)
+++ packages/p9m4/trunk/debian/patches/03-use-inst-paths.patch 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,30 @@
+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:39:51.000000000 +0000
+@@ -51,6 +51,9 @@
+ return sys.path[0]
+ # return os.path.dirname(os.path.abspath(sys.argv[0]))
+
++def data_dir():
++ return '/usr/share/prover9-mace4'
++
+ def bin():
+ if Win32():
+ return 'bin-win32'
+@@ -63,13 +66,13 @@
+ return 'bin'
+
+ def bin_dir():
+- return os.path.join(program_dir(), bin())
++ return '/usr/bin'
+
+ def image_dir():
+- return os.path.join(program_dir(), 'Images')
++ return os.path.join(data_dir(), 'Images')
+
+ def sample_dir():
+- return os.path.join(program_dir(), 'Samples')
++ return os.path.join(data_dir(), 'Samples')
+
+ def binary_ok(fullpath):
+ if not fullpath:
Added: packages/p9m4/trunk/debian/prover9-mace4.1
===================================================================
--- packages/p9m4/trunk/debian/prover9-mace4.1 (rev 0)
+++ packages/p9m4/trunk/debian/prover9-mace4.1 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,25 @@
+.TH PROVER9-MACE4 1 "January 14, 2008"
+.SH NAME
+prover9-mace4 \- graphical theorem prover interface for Prover9 and Mace4
+.SH SYNOPSIS
+.B prover9-mace4
+.SH DESCRIPTION
+This manual page documents briefly the
+.B prover9-mace4
+command.
+.PP
+\fBprover9-mace4\fP is a graphical user interface (GUI) to the
+.BR prover9 (1)
+theorem prover and the
+.BR mace4 (1)
+countermodel generator.
+.SH USAGE
+Usage instructions can be found within the program via the \fBHelp\fP menu.
+.SH SEE ALSO
+.BR prover9 (1),
+.BR mace4 (1).
+.SH AUTHOR
+\fBprover9-mace4\fP ws written by William McCune <mccune at cs.unm.edu>
+.PP
+This manual page was written by Peter Collingbourne <pcc03 at doc.ic.ac.uk>,
+for the Debian project (but may be used by others).
Added: packages/p9m4/trunk/debian/pycompat
===================================================================
--- packages/p9m4/trunk/debian/pycompat (rev 0)
+++ packages/p9m4/trunk/debian/pycompat 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1 @@
+2
Added: packages/p9m4/trunk/debian/rules
===================================================================
--- packages/p9m4/trunk/debian/rules (rev 0)
+++ packages/p9m4/trunk/debian/rules 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM = pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_PYTHON_SETUP_CMD = debian/setup.py
+
+binary-post-install/prover9-mace4::
+ mv debian/prover9-mace4/usr/bin/prover9-mace4.py debian/prover9-mace4/usr/bin/prover9-mace4
Property changes on: packages/p9m4/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/p9m4/trunk/debian/setup.py
===================================================================
--- packages/p9m4/trunk/debian/setup.py (rev 0)
+++ packages/p9m4/trunk/debian/setup.py 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,11 @@
+from distutils.core import setup
+
+setup(name='prover9-mace4',
+ version='0.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'],
+ )
Added: packages/p9m4/trunk/debian/watch
===================================================================
--- packages/p9m4/trunk/debian/watch (rev 0)
+++ packages/p9m4/trunk/debian/watch 2008-01-15 02:29:53 UTC (rev 522)
@@ -0,0 +1,2 @@
+version=3
+opts="uversionmangle=s/^0+/0\./,downloadurlmangle=s/v([0-9]+)\.html/p9m4-v$1.tar.gz/,filenamemangle=s/gui\/v([0-9]+)\.html/p9m4-v$1.tar.gz/" http://www.cs.unm.edu/~mccune/mace4/ gui/v([0-9]+)\.html
More information about the Python-apps-commits
mailing list