[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-124-g08b0b01
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 54fad08f65784283b3a390a659e4cf7cba51deaf
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 27 09:22:22 2012 +0200
guard libdbalo.so mv with feq PACKAGE_BASE=y
Conflicts:
changelog
diff --git a/changelog b/changelog
index b556457..57a71eb 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,12 @@
+libreoffice (1:3.5.3-0ubuntu1) precise-proposed; urgency=low
+ * cherry-pick 496346c9e692b7ba8ec0aa78c78cac7b71d830a5 from
+ debian (LP: #986205)
+ - guard libdbalo.so mv with feq PACKAGE_BASE=y...
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sun, 29 Apr 2012 02:43:32 +0200
+
libreoffice (1:3.5.2-2ubuntu3) precise-proposed; urgency=low
+
* add missing mimetypes to impress.desktop (LP: #904212)
* Remove SalDisplay::GetKeyboardName (LP: #818761)
* cherry-pick c6e83cc1711e5d4f1025316e0824640e73c1da2d from debian:
diff --git a/control b/control
index d7ec38a..8c9e501 100644
--- a/control
+++ b/control
@@ -166,6 +166,7 @@ Description: office productivity suite -- spreadsheet
Package: libreoffice-impress
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libcairo2 (= 1.12.0-1), libcairo2 (= 1.12.0-2)
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index 159473d..e127c2f 100755
--- a/rules
+++ b/rules
@@ -2105,9 +2105,11 @@ ifeq "$(PACKAGE_NSPLUGIN)" "y"
usr/lib/mozilla/plugins/libnpsoplugin.so
endif
+ifeq "$(PACKAGE_BASE)" "y"
mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
$(PKGDIR)-base-core/$(OODIR)/program
+endif
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: