[svn] r6258 - trunk/tools/unoconv

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-04-10 11:01:15 +0100 (Thu, 10 Apr 2008)
New Revision: 6258

Modified:
   trunk/tools/unoconv/ChangeLog
   trunk/tools/unoconv/unoconv
Log:
Added official OpenOffice path '/opt/openoffice*/program'

Modified: trunk/tools/unoconv/ChangeLog
===================================================================
--- trunk/tools/unoconv/ChangeLog	2008-04-09 23:49:23 UTC (rev 6257)
+++ trunk/tools/unoconv/ChangeLog	2008-04-10 10:01:15 UTC (rev 6258)
@@ -1,12 +1,13 @@
-* 0.3svn - released 01/09/2007
+* 0.3svn - released 10/04/2008
 - Now properly check if there is a GUI attached and terminate() or -unaccept instance
+- Added official OpenOffice path '/opt/openoffice*/program'
 
 * 0.3 - released 31/08/2007
 - Determine doctype from input filename (if not specified)
 - Created a seperate class and allow to use as a library (like DocumentConverter.py)
 - Makefile now adds symlinks for different ODF formats like eg, odt2pdf or odp2pdf
-- Added MacOSX NeoOffice path '/Applications/NeoOffice.app/Contents/program/' (Peter Stevens)
-- Added OpenSUSE 10 OpenOffice path '/usr/lib*/ooo*/program/' (Leo Eraly)
+- Added MacOSX NeoOffice path '/Applications/NeoOffice.app/Contents/program' (Peter Stevens)
+- Added OpenSUSE 10 OpenOffice path '/usr/lib*/ooo*/program' (Leo Eraly)
 - Start and stop OpenOffice automatically when needed (Matthieu Moy)
 - Added --listener option to make OpenOffice accept client requests (Matthieu Moy)
 - Changed -b option to -f option to match a2x options
@@ -16,7 +17,7 @@
 - Added support for almost 100 graphics, presentation and spreadsheet documents
 - Added -d/--doctype option to specify the document type
 - Added -v/--verbose to show more information
-- Added Gentoo oofice path '/usr/lib/openoffice/program/' (Peter Draho)
+- Added Gentoo oofice path '/usr/lib/openoffice/program' (Peter Draho)
 - Show proper error when file does not exist (Peter Draho)
 - Make long options work :)
 - If format is not recognized, scan by extension

Modified: trunk/tools/unoconv/unoconv
===================================================================
--- trunk/tools/unoconv/unoconv	2008-04-09 23:49:23 UTC (rev 6257)
+++ trunk/tools/unoconv/unoconv	2008-04-10 10:01:15 UTC (rev 6258)
@@ -17,10 +17,10 @@
 import getopt, sys, os, glob, time
 
 #extrapaths = ('/usr/lib/openoffice/program/', '/usr/lib/openoffice.org2.0/program/')
-extrapaths = glob.glob('/usr/lib*/openoffice*/program/') + glob.glob('/usr/lib*/ooo*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
+extrapaths = glob.glob('/usr/lib*/openoffice*/program') + glob.glob('/usr/lib*/ooo*/program') + glob.glob('/opt/openoffice*/program') + [ '/Applications/NeoOffice.app/Contents/program', ]
 for path in extrapaths:
     try:
-        sys.path.append(path)   
+        sys.path.append(path)
         import uno, unohelper
         os.environ['PATH'] = '%s:' % path + os.environ['PATH']
         break