openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fixes from Fedora packaging.
-- 
https://code.launchpad.net/~trb143/openlp/bugs1/+merge/23137
Your team OpenLP Core is subscribed to branch lp:openlp.

=== removed file 'documentation/pyqt-sql-py2exe.txt'
--- documentation/pyqt-sql-py2exe.txt	2009-09-13 15:14:45 +0000
+++ documentation/pyqt-sql-py2exe.txt	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-This content can be found at this URL:
-http://netsuperbrain.com/Postmodern%20PostgreSQL%20Application%20Development.pdf
-
-Page 11-15: QtDesigner
-Page 18-20: SQLAlchemy
-Page 21-23: PyQt - widget
-Page 24   : main
-Page 28   : py2exe and release
-
-
-==============================
-This is the destilled content.
-==============================
-
-----------------
-** sqlalchemy **
-----------------
-from sqlalchemy import create_engine, MetaData, Table
-from sqlalchemy.orm import sessionmaker, mapper
-engine = create_engine( 'postgres://postgres@localhost/customers' )
-metadata = MetaData( bind=engine, reflect=True)
-Session = sessionmaker(bind=engine, autoflush=True,
-    transactional=True)
-
-class Customer(object): pass
-mapper( Customer, Table('customers', metadata ) )
-
-session = Session()
-customer = Customer( businessName=“Jamb Safety”,
-    website=“www.jamb.com” )
-session.save( customer )
-for customer in Session.query(Customer).filter(
-    Customer.businessName.like(“Jamb%”)):
-    print customer.businessName
-session.commit()
-
-------------------------
-** release and py2exe **
-------------------------
-
-from distutils.core import setup
-import py2exe
-import glob
-setup(
-    name="Customers",
-    author="Sankel Software",
-    author_email="david@xxxxxxxxxxxxxxxxxx",
-    url="http://sankelsoftware.com";,
-    license=“GPL",
-    version=“1.0.0",
-    windows=[ { "script":"main.py“,}],
-    options={"py2exe":{"includes":["sip”]}},
-    data_files=[
-       ("forms",glob.glob("forms/*.ui")),
-    ] )
-
-release:
-python setup.py py2exe --quiet --dist-dir=dist

=== renamed file 'openlp/plugins/remotes/remoteclient.py' => 'scripts/openlp-remoteclient.py'
--- openlp/plugins/remotes/remoteclient.py	2010-03-21 23:58:01 +0000
+++ scripts/openlp-remoteclient.py	2010-04-09 19:21:23 +0000
@@ -38,7 +38,7 @@
         print u'Errow thrown ', sys.exc_info()[1]
 
 def format_message(options):
-    return u'%s:%s' % (options.event, options.message)
+    return u'%s:%s' % (u'alert', options.message)
 
 def main():
     usage = "usage: %prog [options] arg1 arg2"

=== modified file 'setup.py'
--- setup.py	2010-03-21 23:58:01 +0000
+++ setup.py	2010-04-09 19:21:23 +0000
@@ -68,7 +68,8 @@
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py',
+    'scripts/bible-1to2-converter.py','scripts/openlp-remoteclient.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[