[Rapier-commits] r221 - in trunk: . data debian src

[This list send mail when a change occurs on the subversion repository]

Author: pamadio
Date: 2009-10-25 18:54:48 +0200 (Sun, 25 Oct 2009)
New Revision: 221

Removed:
   trunk/data/rapier.schemas
Modified:
   trunk/debian/control
   trunk/setup.py
   trunk/src/swordutils.py
Log:
better

Deleted: trunk/data/rapier.schemas
===================================================================
--- trunk/data/rapier.schemas	2009-10-25 15:59:19 UTC (rev 220)
+++ trunk/data/rapier.schemas	2009-10-25 16:54:48 UTC (rev 221)
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/modules/default</key>
-      <applyto>/apps/osso/rapier/modules/default</applyto>
-      <owner>rapier</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Default Sword module</short>
-        <long>This key stores the default module name that rapier should select upon starting.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/debug/enabled</key>
-      <applyto>/apps/osso/rapier/debug/enabled</applyto>
-      <owner>rapier</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Debug mode</short>
-        <long>This key stores the debug mode.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/bookmarks/start</key>
-      <applyto>/apps/osso/rapier/bookmarks/start</applyto>
-      <owner>rapier</owner>
-      <type>string</type>
-      <default>"Gen 1:1"</default>
-      <locale name="C">
-        <short>Starting place</short>
-        <long>This key stores wich verse to display at starting time.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/data_path</key>
-      <applyto>/apps/osso/rapier/data_path</applyto>
-      <owner>rapier</owner>
-      <type>string</type>
-      <default>"/usr/share/sword"</default>
-      <locale name="C">
-        <short>Sword DataPath</short>
-        <long>Directory where the Sword API is looking for modules.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/strong_db</key>
-      <applyto>/apps/osso/rapier/strong_db</applyto>
-      <owner>rapier</owner>
-      <type>string</type>
-      <default>""</default>
-      <locale name="C">
-        <short>Strong Number Database</short>
-        <long>Location of the sqlite database that host the Strong Number information.
-        </long>
-      </locale>
-    </schema>
-
-
-
-    <schema>
-      <key>/schemas/apps/osso/rapier/modules/carriage_return</key>
-      <applyto>/apps/osso/rapier/modules/carriage_return</applyto>
-      <owner>rapier</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Append carriage return at the end of all verse.</short>
-        <long>If true, all verse end with a carriage return.
-        </long>
-      </locale>
-    </schema>
-
-
-
-
-  </schemalist>
-</gconfschemafile>

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-10-25 15:59:19 UTC (rev 220)
+++ trunk/debian/control	2009-10-25 16:54:48 UTC (rev 221)
@@ -7,7 +7,7 @@
 
 Package: rapier
 Architecture: all 
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-sword16, python2.5, libsqlite3-0,python-gnome2,python-hildon,pyhton-osso
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-sword16, python2.5, libsqlite3-0,python-gnome2,python-hildon,python-osso
 Description: A sword based Bible reader for maemo.
  A sword based Bible reader for maemo.
 XB-Maemo-Icon-26:

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2009-10-25 15:59:19 UTC (rev 220)
+++ trunk/setup.py	2009-10-25 16:54:48 UTC (rev 221)
@@ -16,7 +16,6 @@
     ('share/pixmaps',             ['data/rapier_icon_26x26.png']),
     ('share/applications/hildon', ['data/rapier.desktop']),
     ('share/dbus-1/services',['data/org.maemo.rapier.service']),
-    ('share/rapier',['COPYING','CREDITS','README','TODO','src/swordutils.py']),
-    ('share/gconf/schemas', ['data/rapier.schemas'])
+    ('share/rapier',['COPYING','CREDITS','README','TODO','src/swordutils.py'])
     ]
       ) 

Modified: trunk/src/swordutils.py
===================================================================
--- trunk/src/swordutils.py	2009-10-25 15:59:19 UTC (rev 220)
+++ trunk/src/swordutils.py	2009-10-25 16:54:48 UTC (rev 221)
@@ -49,7 +49,8 @@
     
 def get_manager(*args):
     data_path = get_data_path()
-    os.environ["SWORD_PATH"]=data_path
+    if data_path:
+        os.environ["SWORD_PATH"]=data_path
     mgr = Sword.SWMgr(*args)
     if data_path:
         mgr.prefixPath = data_path