Common subdirectories: unoconv-0.4.orig/docs and unoconv-0.4/docs
Common subdirectories: unoconv-0.4.orig/tests and unoconv-0.4/tests
diff -u unoconv-0.4.orig/unoconv unoconv-0.4/unoconv
--- unoconv-0.4.orig/unoconv 2012-03-24 16:17:11.583352009 -0400
+++ unoconv-0.4/unoconv 2012-03-24 16:18:52.198649000 -0400
@@ -511,7 +511,7 @@
### Start our own OpenOffice instance
info(3, "Launching our own listener using %s." % oobin)
try:
- ooproc = subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection])
+ ooproc = subprocess.Popen([oobin, "--headless", "--invisible", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--accept=%s" % op.connection])
info(2, 'OpenOffice listener successfully started. (pid=%s)' % ooproc.pid)
### Try connection to it for op.timeout seconds (flakky OpenOffice)
@@ -703,7 +703,7 @@
def __init__(self):
info(1, "Start listener on %s:%s" % (op.server, op.port))
try:
- subprocess.call([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection])
+ subprocess.call([oobin, "--headless", "--invisible", "--nodefault", "--nologo", "--nofirststartwizard", "--norestore", "--accept=%s" % op.connection])
except Exception, e:
error("Launch of %s failed.\n%s" % (oobin, e))
else:
@@ -733,7 +733,7 @@
### If there is a GUI now attached to the instance, disable listener
if convertor.desktop.getCurrentFrame():
try:
- subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection])
+ subprocess.Popen([oobin, "--headless", "--invisible", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection])
info(2, 'OpenOffice listener successfully disabled.')
ooproc.wait()
except Exception, e: