diff -Nru libreoffice-3.5.1/debian/changelog libreoffice-3.5.1/debian/changelog --- libreoffice-3.5.1/debian/changelog 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/changelog 2012-04-03 09:05:17.000000000 +0000 @@ -1,4 +1,28 @@ -libreoffice (1:3.5.1-1ubuntu2~ppa1) precise; urgency=low +libreoffice (1:3.5.1-1ubuntu5~ppa1) precise; urgency=low + + * do not use libreoffice-cores unopkg in preinst (LP: #969707) + * backport dtardons fix for single job collation (LP: #925836) + * actually install the Ubuntu presentation templates + * cherry-picked a163c978 from master: + - make extensions conflicts against libreoffice-core (<< 1:3.5~), + libreoffice-common (<< 1:3.5~) to (hopefully) help unopkg be working + when called on upgrades 3.4 -> 3.5 (closes: #666523) + + -- Bjoern Michaelsen Tue, 03 Apr 2012 11:00:59 +0200 + +libreoffice (1:3.5.1-1ubuntu4) precise; urgency=low + + * version bump for bug 930217 + + -- Bjoern Michaelsen Fri, 30 Mar 2012 14:34:41 +0200 + +libreoffice (1:3.5.1-1ubuntu3) precise-proposed; urgency=low + + * fix typo in control.in + + -- Bjoern Michaelsen Thu, 29 Mar 2012 12:40:56 +0200 + +libreoffice (1:3.5.1-1ubuntu2) precise-proposed; urgency=low * call fsync on write (LP: #817326) * add a few conflicts for defusing the old -common dpkg-trigger diff -Nru libreoffice-3.5.1/debian/control libreoffice-3.5.1/debian/control --- libreoffice-3.5.1/debian/control 2012-03-27 15:30:04.000000000 +0000 +++ libreoffice-3.5.1/debian/control 2012-04-03 09:08:45.000000000 +0000 @@ -373,8 +373,8 @@ Section: python Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 Enhances: libreoffice -Depends: libreofficeu-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python3-uno, libreoffice-common (<< 1:3.5.0) +Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: Python-UNO bridge The Python-UNO bridge allows use of the standard LibreOffice API with the Python scripting language. It additionally allows @@ -3198,7 +3198,7 @@ Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends} Enhances: libreoffice-writer Recommends: ${lucene-depends} -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Suggests: mediawiki Description: LibreOffice extension for working with MediaWiki articles LibreOffice is a full-featured office productivity suite that provides @@ -3213,7 +3213,7 @@ Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386 Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends} Enhances: libreoffice-impress -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: LibreOffice extension for size-efficient presentations LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -3230,7 +3230,7 @@ Package: libreoffice-presenter-console Section: misc Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386 -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends} Enhances: libreoffice-impress Description: LibreOffice Impress extension for a separate presenter's console @@ -3256,7 +3256,7 @@ Priority: extra Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386 Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends} -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: LibreOffice extension for importing PDF documents LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -3372,7 +3372,7 @@ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386 Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends} Suggests: mysql-server (>= 5.1) -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector Description: MySQL Connector extension for LibreOffice LibreOffice is a full-featured office productivity suite that provides diff -Nru libreoffice-3.5.1/debian/control.in libreoffice-3.5.1/debian/control.in --- libreoffice-3.5.1/debian/control.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.in 2012-04-03 09:05:17.000000000 +0000 @@ -515,11 +515,11 @@ Section: python Architecture: %OOO_ARCHS% Enhances: libreofficeVER -Depends: libreofficeu-core (= ${binary:Version}), +Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python3-uno, libreoffice-common (<< 1:3.5.0) +Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: Python-UNO bridge The Python-UNO bridge allows use of the standard LibreOffice API with the Python scripting language. It additionally allows diff -Nru libreoffice-3.5.1/debian/control.mediawiki.in libreoffice-3.5.1/debian/control.mediawiki.in --- libreoffice-3.5.1/debian/control.mediawiki.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.mediawiki.in 2012-04-03 09:05:17.000000000 +0000 @@ -7,7 +7,7 @@ ${misc:Depends} Enhances: libreofficeVER-writer Recommends: ${lucene-depends} -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Suggests: mediawiki Description: LibreOffice extension for working with MediaWiki articles LibreOffice is a full-featured office productivity suite that provides diff -Nru libreoffice-3.5.1/debian/control.minimizer.in libreoffice-3.5.1/debian/control.minimizer.in --- libreoffice-3.5.1/debian/control.minimizer.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.minimizer.in 2012-04-03 09:05:17.000000000 +0000 @@ -4,7 +4,7 @@ Depends: ${shlibs:Depends}, libreofficeVER-core, libreofficeVER-impress, ${misc:Depends} Enhances: libreofficeVER-impress -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: LibreOffice extension for size-efficient presentations LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. diff -Nru libreoffice-3.5.1/debian/control.mysql.in libreoffice-3.5.1/debian/control.mysql.in --- libreoffice-3.5.1/debian/control.mysql.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.mysql.in 2012-04-03 09:05:17.000000000 +0000 @@ -4,7 +4,7 @@ Depends: ${shlibs:Depends}, libreofficeVER-core, ${misc:Depends} Suggests: mysql-server (>= 5.1) -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector Description: MySQL Connector extension for LibreOffice LibreOffice is a full-featured office productivity suite that provides diff -Nru libreoffice-3.5.1/debian/control.pdfimport.in libreoffice-3.5.1/debian/control.pdfimport.in --- libreoffice-3.5.1/debian/control.pdfimport.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.pdfimport.in 2012-04-03 09:05:17.000000000 +0000 @@ -4,7 +4,7 @@ Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS% Depends: ${shlibs:Depends}, libreofficeVER-core, ${misc:Depends} -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Description: LibreOffice extension for importing PDF documents LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. diff -Nru libreoffice-3.5.1/debian/control.presenter.in libreoffice-3.5.1/debian/control.presenter.in --- libreoffice-3.5.1/debian/control.presenter.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.presenter.in 2012-04-03 09:05:17.000000000 +0000 @@ -1,7 +1,7 @@ Package: libreofficeVER-presenter-console Section: misc Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS% -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Depends: ${shlibs:Depends}, libreofficeVER-core, libreofficeVER-impress, ${misc:Depends} Enhances: libreofficeVER-impress diff -Nru libreoffice-3.5.1/debian/control.reportdesign.in libreoffice-3.5.1/debian/control.reportdesign.in --- libreoffice-3.5.1/debian/control.reportdesign.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/control.reportdesign.in 2012-04-03 09:05:17.000000000 +0000 @@ -5,7 +5,7 @@ Depends: ${report-builder-jar-depends}, libreofficeVER-report-builder-bin (>= ${base-version}), libreoffice-core, libreoffice-java-common, ${java:Depends}, ${misc:Depends} -Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~) Provides: libreoffice-reportdesigner Enhances: libreofficeVER-base Description: LibreOffice extension for building database reports diff -Nru libreoffice-3.5.1/debian/libreoffice-mysql-connector.preinst.in libreoffice-3.5.1/debian/libreoffice-mysql-connector.preinst.in --- libreoffice-3.5.1/debian/libreoffice-mysql-connector.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-mysql-connector.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/mysql-connector-ooo - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-pdfimport.preinst.in libreoffice-3.5.1/debian/libreoffice-pdfimport.preinst.in --- libreoffice-3.5.1/debian/libreoffice-pdfimport.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-pdfimport.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/pdfimport - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-presentation-minimizer.preinst.in libreoffice-3.5.1/debian/libreoffice-presentation-minimizer.preinst.in --- libreoffice-3.5.1/debian/libreoffice-presentation-minimizer.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-presentation-minimizer.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/presentation-minimizer - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-presenter-console.preinst.in libreoffice-3.5.1/debian/libreoffice-presenter-console.preinst.in --- libreoffice-3.5.1/debian/libreoffice-presenter-console.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-presenter-console.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/presenter-screen - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-report-builder.preinst.in libreoffice-3.5.1/debian/libreoffice-report-builder.preinst.in --- libreoffice-3.5.1/debian/libreoffice-report-builder.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-report-builder.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/report-builder - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-script-provider-bsh.preinst.in libreoffice-3.5.1/debian/libreoffice-script-provider-bsh.preinst.in --- libreoffice-3.5.1/debian/libreoffice-script-provider-bsh.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-script-provider-bsh.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-beanshell - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-script-provider-js.preinst.in libreoffice-3.5.1/debian/libreoffice-script-provider-js.preinst.in --- libreoffice-3.5.1/debian/libreoffice-script-provider-js.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-script-provider-js.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-javascript - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/libreoffice-wiki-publisher.preinst.in libreoffice-3.5.1/debian/libreoffice-wiki-publisher.preinst.in --- libreoffice-3.5.1/debian/libreoffice-wiki-publisher.preinst.in 2012-03-27 15:25:51.000000000 +0000 +++ libreoffice-3.5.1/debian/libreoffice-wiki-publisher.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/wiki-publisher - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff libreoffice-3.5.1/debian/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff --- libreoffice-3.5.1/debian/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-3.5.1/debian/patches/bypass-GtkSalPrinter-when-it-is-not-enabled.diff 2012-04-03 09:05:17.000000000 +0000 @@ -0,0 +1,25 @@ +From fa87093686614d75d63664722de103e47f91c7db Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 28 Mar 2012 13:25:25 +0200 +Subject: [PATCH] bypass GtkSalPrinter when it is not enabled + +--- + vcl/unx/gtk/gdi/salprn-gtk.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx +index ffa584c..4ea5f7b 100644 +--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx ++++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx +@@ -239,7 +239,7 @@ GtkSalPrinter::StartJob( + vcl::PrinterController& io_rController) + { + if (!lcl_useSystemPrintDialog()) +- return impl_doJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, 1, false, io_rController); ++ return PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, io_rController); + + assert(!m_pImpl); + +-- +1.7.9.1 + diff -Nru libreoffice-3.5.1/debian/patches/series libreoffice-3.5.1/debian/patches/series --- libreoffice-3.5.1/debian/patches/series 2012-03-27 15:25:52.000000000 +0000 +++ libreoffice-3.5.1/debian/patches/series 2012-04-03 09:05:17.000000000 +0000 @@ -38,3 +38,4 @@ fix-for-kdelibs-enum.diff fdo-40607-osl_syncFile-having-written-and-avoid-doin.diff fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff +bypass-GtkSalPrinter-when-it-is-not-enabled.diff diff -Nru libreoffice-3.5.1/debian/python3-uno.preinst.in libreoffice-3.5.1/debian/python3-uno.preinst.in --- libreoffice-3.5.1/debian/python3-uno.preinst.in 2012-03-27 15:25:52.000000000 +0000 +++ libreoffice-3.5.1/debian/python3-uno.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/python-uno.preinst.in libreoffice-3.5.1/debian/python-uno.preinst.in --- libreoffice-3.5.1/debian/python-uno.preinst.in 2012-03-27 15:25:52.000000000 +0000 +++ libreoffice-3.5.1/debian/python-uno.preinst.in 2012-04-03 09:05:17.000000000 +0000 @@ -6,7 +6,6 @@ if [ "$1" = "upgrade" ]; then rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python - sync_extensions fi #DEBHELPER# diff -Nru libreoffice-3.5.1/debian/rules libreoffice-3.5.1/debian/rules --- libreoffice-3.5.1/debian/rules 2012-03-27 15:25:52.000000000 +0000 +++ libreoffice-3.5.1/debian/rules 2012-04-03 09:05:17.000000000 +0000 @@ -2597,10 +2597,10 @@ mkdir -p $(OODIR)/share/dtd && \ cd $(OODIR)/share/dtd && ln -s /$(shell echo $(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd/officedocument -ifeq "$(DEB_VENDOR)" "Debian" +ifneq "$(VENDOR_PRESENTATION_TEMPLATES)" "" # install Debian presentation template mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt - install -m644 debian/templates/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/ + install -m644 debian/$(VENDOR_PRESENTATION_TEMPLATES)/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/ endif ifeq "$(PACKAGE_SDK)" "y"