Package: unoconv
Version: 0.4-1
Tags: patch
Followup-For: Bug #640771
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hello,
The attached patch should fix the deprecated warnings (three
lines ;-)). It works fine for me.
Regards,
Simon
- -- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.1.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages unoconv depends on:
ii python 2.7.2-9
ii python-uno 1:3.4.5-1
Versions of packages unoconv recommends:
ii libreoffice-core 1:3.4.5-1
ii libreoffice-java-common 1:3.4.5-1
Versions of packages unoconv suggests:
ii libreoffice 1:3.4.5-1
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPFZDPAAoJEJL+/bfkTDL53x0QAIJmDr1rVMnNaRxzyYlVLgxr
DI07RZsANVwjwN+znNg0SDryPxDXFizet9/ZEAJuoqkjyqBGZH/vzegs+fhX4wLB
tVEW2RvsOwf0iO0rv9QCWO3sPb+0TbYnt/Dd4REes17qly7RBoPr/ft53utuZNAO
qM2AedoXmHtH+XeoyTgJfH3V3qeDYtUMK4xi9XlhurZQhCpn2DYA0bK/NBSI3+yz
p9o6694gI56HMFjNsHTd9/u+Vi+EoCyRDVO0D58Oy7N95dZlUlkefEJwKy3VVRKb
IqRc99Q3dMhVjzuUPKSeK26L6et8T1d2C++iy+CRAlzjJIoJZdJFLzuWBv1XcIc2
2s5KTSXP6qJ1lv0hftChUCDRo1iiiC+XVZQtiNLPbu4bFTaFeb/Ca4jJp5FhwapT
dnmVNvqGKYG//IU9T5QAXuqZkEnJH4SV55Ind/HkyX/NHFqB6/3JmS7vD3/z7oM1
e//oqBkmnW/F3CKFedGADYrHW9wAhbVA8IHilEmXFiQM4yAzVh2z7gEXEMxDJQ8Z
FuK1ct4fPRRpZ3uxXweCVqXS0xU5213mRNZnUrMf64+AKHBNb+Ky4nj6W0FeQ6La
xswOpS4CNqws6fp3TwcDH5puuqcjcSNGPv5Tbs/Y2xw6ADVdxCjkDA25KCOh8e8D
O7IQFTn+2y/3JeBgdHf0
=MXfe
-----END PGP SIGNATURE-----
diff -Nru unoconv-0.4/debian/patches/fix-deprecated-options.patch unoconv-0.4/debian/patches/fix-deprecated-options.patch
--- unoconv-0.4/debian/patches/fix-deprecated-options.patch 1970-01-01 01:00:00.000000000 +0100
+++ unoconv-0.4/debian/patches/fix-deprecated-options.patch 2012-01-10 16:00:47.000000000 +0100
@@ -0,0 +1,34 @@
+Description: Fix deprecated LibreOffice options.
+Author: Simon Ruderich <si...@ruderich.org>
+
+Index: unoconv-0.4/unoconv
+===================================================================
+--- unoconv-0.4.orig/unoconv 2011-03-05 11:59:39.000000000 +0100
++++ unoconv-0.4/unoconv 2012-01-10 15:59:24.000000000 +0100
+@@ -505,7 +505,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", "--nocrashreport", "--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)
+@@ -692,7 +692,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", "--nocrashreport", "--nodefault", "--nologo", "--nofirststartwizard", "--norestore", "--accept=%s" % op.connection])
+ except Exception, e:
+ error("Launch of %s failed.\n%s" % (oobin, e))
+ else:
+@@ -722,7 +722,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", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection])
+ info(2, 'OpenOffice listener successfully disabled.')
+ ooproc.wait()
+ except Exception, e:
diff -Nru unoconv-0.4/debian/patches/series unoconv-0.4/debian/patches/series
--- unoconv-0.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ unoconv-0.4/debian/patches/series 2012-01-17 16:11:39.000000000 +0100
@@ -0,0 +1 @@
+fix-deprecated-options.patch
