--- jodconverter-cli-2.2.2.orig/src/main/java/com/artofsolving/jodconverter/cli/ConvertDocument.java +++ jodconverter-cli-2.2.2/src/main/java/com/artofsolving/jodconverter/cli/ConvertDocument.java @@ -54,7 +54,7 @@ public class ConvertDocument { private static final Option OPTION_OUTPUT_FORMAT = new Option("f", "output-format", true, "output format (e.g. pdf)"); - private static final Option OPTION_PORT = new Option("p", "port", true, "OpenOffice.org port"); + private static final Option OPTION_PORT = new Option("p", "port", true, "LibreOffice port"); private static final Option OPTION_VERBOSE = new Option("v", "verbose", false, "verbose"); private static final Option OPTION_XML_REGISTRY = new Option("x", "xml-registry", true, "XML document format registry"); private static final Options OPTIONS = initOptions(); @@ -118,11 +118,11 @@ OpenOfficeConnection connection = new SocketOpenOfficeConnection(port); try { if (verbose) { - System.out.println("-- connecting to OpenOffice.org on port " + port); + System.out.println("-- connecting to LibreOffice on port " + port); } connection.connect(); } catch (ConnectException officeNotRunning) { - System.err.println("ERROR: connection failed. Please make sure OpenOffice.org is running and listening on port " + port + "."); + System.err.println("ERROR: connection failed. Please make sure LibreOffice is running and listening on port " + port + "."); System.exit(EXIT_CODE_CONNECTION_FAILED); } try { --- jodconverter-cli-2.2.2.orig/debian/jodconverter.manpages +++ jodconverter-cli-2.2.2/debian/jodconverter.manpages @@ -0,0 +1 @@ +debian/jodconverter.1 --- jodconverter-cli-2.2.2.orig/debian/changelog +++ jodconverter-cli-2.2.2/debian/changelog @@ -0,0 +1,63 @@ +jodconverter-cli (2.2.2-8) unstable; urgency=low + + * control: + - Bump Standards-Version to 3.9.3 (no changes). + - Depend on LibreOffice without basis-link. + + -- Samuel Thibault Sat, 25 Feb 2012 17:49:36 +0100 + +jodconverter-cli (2.2.2-7) unstable; urgency=low + + * Bump Standards-Version to 3.9.2 (no change needed) + * bin/jodconverter: Fix libreoffice jar path. + * jodconverter.1: Fix deprecated options. + + -- Samuel Thibault Sun, 09 Oct 2011 21:00:16 +0200 + +jodconverter-cli (2.2.2-6) unstable; urgency=low + + * debian/bin/jodconverter: fix ridl.jar and unoil.jar paths + (Closes: Bug#618750). + * debian/control: Depend on jodconverter with fixed path. + * src/main/java/com/artofsolving/jodconverter/cli/ConvertDocument.java, + debian/jodconverter.1: Rename OpenOffice.org to LibreOffice. + + -- Samuel Thibault Tue, 22 Mar 2011 01:06:36 +0100 + +jodconverter-cli (2.2.2-5) unstable; urgency=low + + * debian/control: + - Make jodconverter depend on headless java. + - Bump Standards-Version to 3.9.1 (no change needed). + + -- Samuel Thibault Tue, 24 Aug 2010 21:24:38 +0200 + +jodconverter-cli (2.2.2-4) unstable; urgency=low + + * debian/control: + - Bump Standards-Version to 3.8.4 (no change needed). + - Remove Remove git | java-virtual-machine Dependency from jodconverter + (Closes: Bug#573382). + + -- Samuel Thibault Thu, 28 Jan 2010 00:02:20 +0100 + +jodconverter-cli (2.2.2-3) unstable; urgency=low + + * debian/control: Remove duplicate Section: utils field. + * debian/jodconverter.1: Fix hyphens vs minus signs. + * debian/watch: Add. + + -- Samuel Thibault Tue, 12 Jan 2010 23:23:36 +0100 + +jodconverter-cli (2.2.2-2) unstable; urgency=low + + * debian/control: add Vcs-Browser and Vcs-Git fields + * debian/jodconverter.1: warn that concurrent execution may make OOo crash. + + -- Samuel Thibault Tue, 08 Sep 2009 01:37:02 +0200 + +jodconverter-cli (2.2.2-1) unstable; urgency=low + + * Initial release (Closes: #544612) + + -- Samuel Thibault Tue, 01 Sep 2009 15:53:03 +0200 --- jodconverter-cli-2.2.2.orig/debian/rules +++ jodconverter-cli-2.2.2/debian/rules @@ -0,0 +1,50 @@ +#!/usr/bin/make -f + +JAVAC=javac +JAR=jar + +JAVACLASSES=/usr/share/java +SRCDIR=src/main/java + +JAVAFLAGS=-classpath $(JAVACLASSES)/commons-cli.jar:$(JAVACLASSES)/commons-io.jar:$(JAVACLASSES)/jodconverter.jar + +JARFILE=jodconverter-cli-2.2.2.jar + +build: build-stamp +build-stamp: + dh_testdir + + ( \ + cd $(SRCDIR) && \ + $(JAVAC) $(JAVAFLAGS) `find . -name \*.java` && \ + $(JAR) c `find . -name \*.class -o -name \*.xml -o -name \*.MF` > $(JARFILE) ; \ + ) + + touch $@ + +clean: + dh_testdir + dh_testroot + + rm -f `find $(SRCDIR) -name \*.class` + rm -f $(SRCDIR)/$(JARFILE) + + dh_clean + +binary-indep: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_install + dh_link /usr/share/java/$(JARFILE) /usr/share/java/jodconverter-cli.jar + dh_installman + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- jodconverter-cli-2.2.2.orig/debian/control +++ jodconverter-cli-2.2.2/debian/control @@ -0,0 +1,20 @@ +Source: jodconverter-cli +Priority: extra +Maintainer: Samuel Thibault +Build-Depends: debhelper (>= 7) +Build-Depends-Indep: default-jdk, libcommons-cli-java, libcommons-io-java, libjodconverter-java +Standards-Version: 3.9.3 +Section: utils +Homepage: http://www.artofsolving.com/opensource/jodconverter +Vcs-Browser: http://git.debian.org/?p=collab-maint/jodconverter/jodconverter-cli.git;a=summary +Vcs-Git: git://git.debian.org/git/collab-maint/jodconverter/jodconverter-cli.git + +Package: jodconverter +Architecture: all +Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-cli-java, libcommons-io-java, libjodconverter-java (>= 2.2.2-5), libreoffice-java-common (>= 1:3.5.0~) +Description: Office formats converter + JODConverter, the Java OpenDocument Converter, leverages OpenOffice.org to + provide import/export filters for various office formats including OpenDocument + and Microsoft Office. + . + This package provides a command-line frontend. --- jodconverter-cli-2.2.2.orig/debian/jodconverter.install +++ jodconverter-cli-2.2.2/debian/jodconverter.install @@ -0,0 +1,2 @@ +src/main/java/jodconverter-cli-*.jar /usr/share/java +debian/bin/jodconverter /usr/bin --- jodconverter-cli-2.2.2.orig/debian/copyright +++ jodconverter-cli-2.2.2/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Samuel Thibault on +Tue, 01 Sep 2009 15:53:03 +0200. + +It was downloaded from http://www.artofsolving.com/opensource/jodconverter + +Upstream Author: + + Mirko Nasato + Laurent Godard + +Copyright: + + Copyright (C) 2004-2007 - Mirko Nasato + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + http://www.gnu.org/copyleft/lesser.html + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2'. + +The Debian packaging is: + + Copyright (C) 2009 Samuel Thibault + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. --- jodconverter-cli-2.2.2.orig/debian/jodconverter.1 +++ jodconverter-cli-2.2.2/debian/jodconverter.1 @@ -0,0 +1,20 @@ +.TH JODCONVERTER "1" "September 2009" "JODConverter" "User Commands" +.SH NAME +jodconverter \- Office documents converter +.SH SYNOPSIS +\fBjodconverter\fR \fIinput\-document\fR \fIoutput\-document\fR +.SH DESCRIPTION +.B jodconverter +converts \fIinput\-document\fR into \fIoutput\-document\fR by using the LibreOffice +import/export filters. +.PP +Before you can perform any conversions you need to start LibreOffice +in listening mode on port 8100 as described in the JODConverter Guide. +.PP +As a quick start you can type from a command line +.TP +soffice \-\-headless \-\-accept="socket,port=8100;urp;" +.PP +.SH BUGS +Do not start concurrent executions of jodconverter, as LibreOffice doesn't +handle multi\(hythreading reliably and would crash. --- jodconverter-cli-2.2.2.orig/debian/compat +++ jodconverter-cli-2.2.2/debian/compat @@ -0,0 +1 @@ +7 --- jodconverter-cli-2.2.2.orig/debian/watch +++ jodconverter-cli-2.2.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/jodconverter/jodconverter-([\d.]+)\.zip --- jodconverter-cli-2.2.2.orig/debian/README.Debian +++ jodconverter-cli-2.2.2/debian/README.Debian @@ -0,0 +1,13 @@ +jodconverter for Debian +----------------------- + +See http://www.artofsolving.com/opensource/jodconverter for the latest documentation. + +Before you can perform any conversions you need to start OpenOffice.org +in listening mode on port 8100 as described in the JODConverter Guide. + +As a quick start you can type from a command line + + soffice -headless -accept="socket,port=8100;urp;" + + -- Samuel Thibault Tue, 01 Sep 2009 15:53:03 +0200 --- jodconverter-cli-2.2.2.orig/debian/bin/jodconverter +++ jodconverter-cli-2.2.2/debian/bin/jodconverter @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ "$1" = "-classpath" ] +then + CLASSPATH="$2" + shift 2 +fi + +JAVACLASSES=/usr/share/java +CLASSPATH="${CLASSPATH:-.}:$JAVACLASSES/jodconverter-cli.jar" + +# jodconverter-cli deps +CLASSPATH="$CLASSPATH:$JAVACLASSES/commons-cli.jar:$JAVACLASSES/commons-io.jar:$JAVACLASSES/jodconverter.jar" + +# libjodconverter-java deps +CLASSPATH="$CLASSPATH:$JAVACLASSES/ridl.jar:/usr/lib/libreoffice/program/classes/unoil.jar:$JAVACLASSES/juh.jar:$JAVACLASSES/slf4j-api.jar:$JAVACLASSES/commons-io.jar:$JAVACLASSES/xstream.jar" + +# slf4j-api deps +CLASSPATH="$CLASSPATH:$JAVACLASSES/slf4j-jdk14.jar" +export CLASSPATH + +exec java com.artofsolving.jodconverter.cli.ConvertDocument "$@"