--- Begin Message ---
Package: docvert-libreoffice
Version: 4.0-1
Severity: important
Tags: patch
Hi,
as outlined in http://lists.debian.org/debian-openoffice/2011/01/msg00120.html
OpenOffice.org extensions (and in this case packages using OpenOffice.org stuff
directly) need updates.
I propose the attached patch.
-- System Information:
Debian Release: 6.0
APT prefers stable
APT policy: (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Grüße/Regards,
Rene
diff -Nru docvert-4.0/debian/changelog docvert-4.0/debian/changelog
--- docvert-4.0/debian/changelog 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/changelog 2011-01-10 01:42:01.000000000 +0000
@@ -1,3 +1,10 @@
+docvert (4.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * update for LibreOffice
+
+ -- Rene Engelhard <[email protected]> Mon, 10 Jan 2011 02:41:54 +0100
+
docvert (4.0-1) unstable; urgency=low
* New upstream release:
diff -Nru docvert-4.0/debian/control docvert-4.0/debian/control
--- docvert-4.0/debian/control 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/control 2011-01-10 01:46:24.000000000 +0000
@@ -12,7 +12,7 @@
Architecture: all
Pre-Depends: pwgen
Depends: ${misc:Depends}, python, php5-xsl, php5-cli, php5-gd, php5-tidy, librsvg2-bin, apache2, libapache2-mod-php5, libphp-pclzip, fckeditor
-Recommends: docvert-openoffice.org, optipng, jpegoptim
+Recommends: docvert-libreoffice, optipng, jpegoptim
Description: converts word processor files to HTML
Docvert is a web application which takes word processor files
(typically .doc) and converts them to OpenDocument and clean HTML.
@@ -26,17 +26,17 @@
A command-line program which uses the web application is also included.
.
This package only supports OpenDocument. To convert other formats,
- install docvert-openoffice.org.
+ install docvert-libreoffice.
-Package: docvert-openoffice.org
+Package: docvert-libreoffice
Architecture: all
Pre-Depends: procps
-Depends: ${misc:Depends}, openoffice.org-writer, openoffice.org-core, python-uno, lsb-base (>= 3.0-6), python, pdf2svg, adduser, docvert
-Conflicts: docvert-openoffice
-Replaces: docvert-openoffice
-Description: converts word processor files to HTML using OpenOffice.org
+Depends: ${misc:Depends}, libreoffice-writer, libreoffice-core, python-uno, lsb-base (>= 3.0-6), python, pdf2svg, adduser, docvert
+Conflicts: docvert-openoffice, docvert-openoffice.org
+Replaces: docvert-openoffice, docvert-openoffice.org
+Description: converts word processor files to HTML using LibreOffice
Docvert is a web application which takes word processor files
(typically .doc) and converts them to OpenDocument and clean HTML.
.
This package adds the ability to convert Word documents using
- OpenOffice.org.
+ LibreOffice.
diff -Nru docvert-4.0/debian/docvert-libreoffice.dirs docvert-4.0/debian/docvert-libreoffice.dirs
--- docvert-4.0/debian/docvert-libreoffice.dirs 1970-01-01 00:00:00.000000000 +0000
+++ docvert-4.0/debian/docvert-libreoffice.dirs 2011-01-10 01:46:13.000000000 +0000
@@ -0,0 +1 @@
+usr/share/docvert/core/config/unix-specific/
diff -Nru docvert-4.0/debian/docvert-libreoffice.docvert-converter.init docvert-4.0/debian/docvert-libreoffice.docvert-converter.init
--- docvert-4.0/debian/docvert-libreoffice.docvert-converter.init 1970-01-01 00:00:00.000000000 +0000
+++ docvert-4.0/debian/docvert-libreoffice.docvert-converter.init 2011-01-10 01:43:06.000000000 +0000
@@ -0,0 +1,132 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: docvert-converter
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Required-Start: $remote_fs $local_fs $network $syslog
+# Required-Stop: $remote_fs $local_fs $network $syslog
+# Short-Description: LibreOffice service for Docvert
+# Description: This init.d script is used to start LibreOffice as a
+# service.
+### END INIT INFO
+
+# Author: Martyn Smith <[email protected]>
+
+# Do NOT "set -e"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="LibreOffice service for Docvert"
+NAME=docvert-converter
+USER=docvert
+GROUP=docvert
+DAEMON=/usr/share/docvert/core/config/unix-specific/openoffice.org-server.sh
+DAEMON_ARGS=""
+PIDFILE=/var/run/docvert/converter.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon -c $USER -g $GROUP --start --pidfile $PIDFILE --exec $DAEMON --test > /dev/null || return 1
+ start-stop-daemon -c $USER -g $GROUP --start --pidfile $PIDFILE --background --exec $DAEMON -- $DAEMON_ARGS || return 2
+ sleep 2
+ pgrep -U $USER -G $GROUP "soffice" > "$PIDFILE"
+ [ -s "$PIDFILE" ] || return 2
+ return 0
+ # Add code here, if necessary, that waits for the process to be ready
+ # to handle requests from services started subsequently which depend
+ # on this one. As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon -c $USER -g $GROUP --quiet --stop --pidfile $PIDFILE
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ # Many daemons don't delete their pidfiles when they exit.
+ return "$RETVAL"
+}
+
+# Make sure the /var/run directory exists and is writable
+mkdir -p `dirname $PIDFILE`
+chown docvert `dirname $PIDFILE`
+
+case "$1" in
+ status)
+ status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+ ;;
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+ exit 3
+ ;;
+esac
+
+# Do NOT remove this, it sets the return value!
+:
diff -Nru docvert-4.0/debian/docvert-libreoffice.postinst docvert-4.0/debian/docvert-libreoffice.postinst
--- docvert-4.0/debian/docvert-libreoffice.postinst 1970-01-01 00:00:00.000000000 +0000
+++ docvert-4.0/debian/docvert-libreoffice.postinst 2010-12-22 00:56:29.000000000 +0000
@@ -0,0 +1,63 @@
+#!/bin/bash
+# postinst script for docvert
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+CONFIG_FILE="/etc/docvert/docvert.conf"
+function set_config {
+ mkdir -p `dirname $CONFIG_FILE`
+ touch $CONFIG_FILE
+ chmod 644 $CONFIG_FILE
+ chown www-data:www-data $CONFIG_FILE
+
+ # Create default values if they don't exist
+ grep -q 'disallowNonOpenDocumentUploads' $CONFIG_FILE || echo 'disallowNonOpenDocumentUploads="false"' >> $CONFIG_FILE
+ grep -q 'runExternalApplicationAsUser' $CONFIG_FILE || echo 'runExternalApplicationAsUser="docvert"' >> $CONFIG_FILE
+ grep -q 'doNotUseConverterpyodconverter' $CONFIG_FILE || echo 'doNotUseConverterpyodconverter="false"' >> $CONFIG_FILE
+
+ # Change the values if they exist
+ perl -i -pe 's/doNotUseConverterpyodconverter="true"/doNotUseConverterpyodconverter="false"/i' $CONFIG_FILE
+ perl -i -pe 's/disallowNonOpenDocumentUploads="true"/disallowNonOpenDocumentUploads="false"/i' $CONFIG_FILE
+}
+
+case "$1" in
+ configure)
+ set_config
+ adduser --system --group --home /var/lib/docvert/home --gecos 'Docvert Converter,,,' docvert || true
+
+ mkdir -p /var/lib/docvert/home
+ chown docvert /var/lib/docvert/home
+
+ mkdir -p /var/run/docvert
+ chown docvert /var/run/docvert
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -Nru docvert-4.0/debian/docvert-libreoffice.postrm docvert-4.0/debian/docvert-libreoffice.postrm
--- docvert-4.0/debian/docvert-libreoffice.postrm 1970-01-01 00:00:00.000000000 +0000
+++ docvert-4.0/debian/docvert-libreoffice.postrm 2010-12-22 00:56:29.000000000 +0000
@@ -0,0 +1,55 @@
+#!/bin/bash
+# postrm script for docvert
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+CONFIG_FILE="/etc/docvert/docvert.conf"
+function set_config {
+ touch $CONFIG_FILE
+ chmod 644 $CONFIG_FILE
+ chown www-data:www-data $CONFIG_FILE
+
+ # Create default values if they don't exist
+ grep -q 'doNotUseConverterpyodconverter' $CONFIG_FILE || echo 'doNotUseConverterpyodconverter="true"' >> $CONFIG_FILE
+ grep -q 'disallowNonOpenDocumentUploads' $CONFIG_FILE || echo 'disallowNonOpenDocumentUploads="true"' >> $CONFIG_FILE
+
+ # Change the values if they exist
+ perl -i -pe 's/doNotUseConverterpyodconverter="false"/doNotUseConverterpyodconverter="true"/i' $CONFIG_FILE
+ perl -i -pe 's/disallowNonOpenDocumentUploads="false"/disallowNonOpenDocumentUploads="true"/i' $CONFIG_FILE
+}
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ if [ -e $CONFIG_FILE ] ; then set_config ; fi
+ deluser docvert || true
+ rm -rf /var/lib/docvert/home
+ rm -rf /var/run/docvert
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -Nru docvert-4.0/debian/docvert-openoffice.org.dirs docvert-4.0/debian/docvert-openoffice.org.dirs
--- docvert-4.0/debian/docvert-openoffice.org.dirs 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/docvert-openoffice.org.dirs 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/docvert/core/config/unix-specific/
diff -Nru docvert-4.0/debian/docvert-openoffice.org.docvert-converter.init docvert-4.0/debian/docvert-openoffice.org.docvert-converter.init
--- docvert-4.0/debian/docvert-openoffice.org.docvert-converter.init 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/docvert-openoffice.org.docvert-converter.init 1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: docvert-converter
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Required-Start: $remote_fs $local_fs $network $syslog
-# Required-Stop: $remote_fs $local_fs $network $syslog
-# Short-Description: OpenOffice.org service for Docvert
-# Description: This init.d script is used to start OpenOffice.org as a
-# service.
-### END INIT INFO
-
-# Author: Martyn Smith <[email protected]>
-
-# Do NOT "set -e"
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenOffice.org service for Docvert"
-NAME=docvert-converter
-USER=docvert
-GROUP=docvert
-DAEMON=/usr/share/docvert/core/config/unix-specific/openoffice.org-server.sh
-DAEMON_ARGS=""
-PIDFILE=/var/run/docvert/converter.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon -c $USER -g $GROUP --start --pidfile $PIDFILE --exec $DAEMON --test > /dev/null || return 1
- start-stop-daemon -c $USER -g $GROUP --start --pidfile $PIDFILE --background --exec $DAEMON -- $DAEMON_ARGS || return 2
- sleep 2
- pgrep -U $USER -G $GROUP "soffice" > "$PIDFILE"
- [ -s "$PIDFILE" ] || return 2
- return 0
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon -c $USER -g $GROUP --quiet --stop --pidfile $PIDFILE
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- # Many daemons don't delete their pidfiles when they exit.
- return "$RETVAL"
-}
-
-# Make sure the /var/run directory exists and is writable
-mkdir -p `dirname $PIDFILE`
-chown docvert `dirname $PIDFILE`
-
-case "$1" in
- status)
- status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
- ;;
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
- exit 3
- ;;
-esac
-
-# Do NOT remove this, it sets the return value!
-:
diff -Nru docvert-4.0/debian/docvert-openoffice.org.postinst docvert-4.0/debian/docvert-openoffice.org.postinst
--- docvert-4.0/debian/docvert-openoffice.org.postinst 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/docvert-openoffice.org.postinst 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#!/bin/bash
-# postinst script for docvert
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-CONFIG_FILE="/etc/docvert/docvert.conf"
-function set_config {
- mkdir -p `dirname $CONFIG_FILE`
- touch $CONFIG_FILE
- chmod 644 $CONFIG_FILE
- chown www-data:www-data $CONFIG_FILE
-
- # Create default values if they don't exist
- grep -q 'disallowNonOpenDocumentUploads' $CONFIG_FILE || echo 'disallowNonOpenDocumentUploads="false"' >> $CONFIG_FILE
- grep -q 'runExternalApplicationAsUser' $CONFIG_FILE || echo 'runExternalApplicationAsUser="docvert"' >> $CONFIG_FILE
- grep -q 'doNotUseConverterpyodconverter' $CONFIG_FILE || echo 'doNotUseConverterpyodconverter="false"' >> $CONFIG_FILE
-
- # Change the values if they exist
- perl -i -pe 's/doNotUseConverterpyodconverter="true"/doNotUseConverterpyodconverter="false"/i' $CONFIG_FILE
- perl -i -pe 's/disallowNonOpenDocumentUploads="true"/disallowNonOpenDocumentUploads="false"/i' $CONFIG_FILE
-}
-
-case "$1" in
- configure)
- set_config
- adduser --system --group --home /var/lib/docvert/home --gecos 'Docvert Converter,,,' docvert || true
-
- mkdir -p /var/lib/docvert/home
- chown docvert /var/lib/docvert/home
-
- mkdir -p /var/run/docvert
- chown docvert /var/run/docvert
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru docvert-4.0/debian/docvert-openoffice.org.postrm docvert-4.0/debian/docvert-openoffice.org.postrm
--- docvert-4.0/debian/docvert-openoffice.org.postrm 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/docvert-openoffice.org.postrm 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#!/bin/bash
-# postrm script for docvert
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-CONFIG_FILE="/etc/docvert/docvert.conf"
-function set_config {
- touch $CONFIG_FILE
- chmod 644 $CONFIG_FILE
- chown www-data:www-data $CONFIG_FILE
-
- # Create default values if they don't exist
- grep -q 'doNotUseConverterpyodconverter' $CONFIG_FILE || echo 'doNotUseConverterpyodconverter="true"' >> $CONFIG_FILE
- grep -q 'disallowNonOpenDocumentUploads' $CONFIG_FILE || echo 'disallowNonOpenDocumentUploads="true"' >> $CONFIG_FILE
-
- # Change the values if they exist
- perl -i -pe 's/doNotUseConverterpyodconverter="false"/doNotUseConverterpyodconverter="true"/i' $CONFIG_FILE
- perl -i -pe 's/disallowNonOpenDocumentUploads="false"/disallowNonOpenDocumentUploads="true"/i' $CONFIG_FILE
-}
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- if [ -e $CONFIG_FILE ] ; then set_config ; fi
- deluser docvert || true
- rm -rf /var/lib/docvert/home
- rm -rf /var/run/docvert
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru docvert-4.0/debian/patches/debian-changes-4.0-1.1 docvert-4.0/debian/patches/debian-changes-4.0-1.1
--- docvert-4.0/debian/patches/debian-changes-4.0-1.1 1970-01-01 00:00:00.000000000 +0000
+++ docvert-4.0/debian/patches/debian-changes-4.0-1.1 2011-02-07 19:34:34.000000000 +0000
@@ -0,0 +1,76 @@
+Description: Upstream changes introduced in version 4.0-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ docvert (4.0-1.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * update for LibreOffice
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Rene Engelhard <[email protected]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- docvert-4.0.orig/core/config/unix-specific/convert-using-openoffice.org.sh
++++ docvert-4.0/core/config/unix-specific/convert-using-openoffice.org.sh
+@@ -14,4 +14,4 @@ fi
+
+
+ cd /tmp
+-${xvfbRun} /usr/lib/openoffice/program/soffice -writer -norestore "${docvertMacrosDocumentPath}" macro://macros/Standard.convert.toOasisOpenDocumentFormat\(${inputDocumentUrl},${outputDocumentUrl}\)
++${xvfbRun} /usr/lib/libreoffice/program/soffice -writer -norestore "${docvertMacrosDocumentPath}" macro://macros/Standard.convert.toOasisOpenDocumentFormat\(${inputDocumentUrl},${outputDocumentUrl}\)
+--- docvert-4.0.orig/core/config/unix-specific/openoffice.org-server-init.sh
++++ docvert-4.0/core/config/unix-specific/openoffice.org-server-init.sh
+@@ -1,12 +1,12 @@
+ #!/bin/sh
+ ### BEGIN INIT INFO
+-# Provides: openoffice.org-server
++# Provides: libreoffice-server
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Required-Start: $local_fs $network_fs $network $syslog
+ # Required-Stop: $local_fs $network_fs $network $syslog
+-# Short-Description: OpenOffice.org Server Daemon
+-# Description: Start/stop OpenOffice.org in server mode
++# Short-Description: LibreOffice Server Daemon
++# Description: Start/stop LibreOffice in server mode
+ ### END INIT INFO
+
+ scriptDirectory=$( dirname "$0" )
+@@ -77,10 +77,10 @@ ooo_start()
+ if [ -s "$pidfile" ]
+ then
+ pid=$( $cat "$pidfile" )
+- echo "Started OpenOffice.org with process(s) #$pid"
++ echo "Started LibreOffice with process(s) #$pid"
+ sleep 0
+ else
+- echo "Unable to start OpenOffice.org (empty pid file at $pidfile)"
++ echo "Unable to start LibreOffice (empty pid file at $pidfile)"
+ fi
+ return 0
+ fi
+--- docvert-4.0.orig/doc/installing-from-debian-repo.txt
++++ docvert-4.0/doc/installing-from-debian-repo.txt
+@@ -11,7 +11,7 @@ Install
+
+ Install Docvert
+
+- apt-get install docvert docvert-openoffice.org
++ apt-get install docvert docvert-libreoffice
+
+ Note: there's a docvert-openoffice server daemon script
+ at /etc/init.d/docvert-converter if you want to stop/restart it.
diff -Nru docvert-4.0/debian/patches/series docvert-4.0/debian/patches/series
--- docvert-4.0/debian/patches/series 2010-12-22 00:56:52.000000000 +0000
+++ docvert-4.0/debian/patches/series 2011-01-10 01:47:04.000000000 +0000
@@ -1 +1,2 @@
debian-changes-4.0-1
+debian-changes-4.0-1.1
diff -Nru docvert-4.0/debian/rules docvert-4.0/debian/rules
--- docvert-4.0/debian/rules 2010-12-22 00:56:29.000000000 +0000
+++ docvert-4.0/debian/rules 2011-01-10 01:47:00.000000000 +0000
@@ -50,10 +50,10 @@
rm -rf $(CURDIR)/debian/docvert/usr/share/docvert/core/config/
# Copy external application scripts
- cp $(CURDIR)/core/config/unix-specific/convert-using-svg2png.sh $(CURDIR)/debian/docvert-openoffice.org/usr/share/docvert/core/config/unix-specific/
- cp $(CURDIR)/core/config/unix-specific/convert-using-pdf2svg.sh $(CURDIR)/debian/docvert-openoffice.org/usr/share/docvert/core/config/unix-specific/
- cp $(CURDIR)/core/config/unix-specific/convert-using-openoffice.org.sh $(CURDIR)/debian/docvert-openoffice.org/usr/share/docvert/core/config/unix-specific/
- cp $(CURDIR)/core/config/unix-specific/openoffice.org-server.sh $(CURDIR)/debian/docvert-openoffice.org/usr/share/docvert/core/config/unix-specific/
+ cp $(CURDIR)/core/config/unix-specific/convert-using-svg2png.sh $(CURDIR)/debian/docvert-libreoffice/usr/share/docvert/core/config/unix-specific/
+ cp $(CURDIR)/core/config/unix-specific/convert-using-pdf2svg.sh $(CURDIR)/debian/docvert-libreoffice/usr/share/docvert/core/config/unix-specific/
+ cp $(CURDIR)/core/config/unix-specific/convert-using-openoffice.org.sh $(CURDIR)/debian/docvert-libreoffice/usr/share/docvert/core/config/unix-specific/
+ cp $(CURDIR)/core/config/unix-specific/openoffice.org-server.sh $(CURDIR)/debian/docvert-libreoffice/usr/share/docvert/core/config/unix-specific/
# Fix permissions
chmod -x $(CURDIR)/debian/docvert/usr/share/docvert/frameset.php
--- End Message ---
