[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-120-g7598d51
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 43749787c522eacbca4e587e877e3e31d6eb5475
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 25 02:40:31 2012 +0200
readd move of libdbalo.so to -base-core
Conflicts:
changelog
diff --git a/changelog b/changelog
index a369c62..65653eb 100644
--- a/changelog
+++ b/changelog
@@ -22,6 +22,8 @@ libreoffice (1:3.5.2-2ubuntu2) precise-proposed; urgency=low
* cherry-pick c6e83cc1711e5d4f1025316e0824640e73c1da2d from debian:
- debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
/var/lib/libreoffice/share/prereg
+ * cherry-pick 01fbc48a560cdc32a32b044c7fa290462a034479 from debian:
+ - readd move of libdbalo.so to -base-core (closes: #670350)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 26 Apr 2012 02:50:34 +0200
diff --git a/control b/control
index 24e28f5..d7ec38a 100644
--- a/control
+++ b/control
@@ -193,6 +193,7 @@ Description: office productivity suite -- equation editor
Package: libreoffice-base-core
Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libreoffice-base (<< 1:3.5.3~rc2-2)
Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index d6772e9..327cbe0 100644
--- a/control.in
+++ b/control.in
@@ -318,6 +318,7 @@ Architecture: %OOO_BASE_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
+Replaces: libreofficeVER-base (<< 1:3.5.2-2ubuntu3)
Suggests: libreofficeVER-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 49a48b4..159473d 100755
--- a/rules
+++ b/rules
@@ -2105,6 +2105,10 @@ ifeq "$(PACKAGE_NSPLUGIN)" "y"
usr/lib/mozilla/plugins/libnpsoplugin.so
endif
+ mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
+ mv $(PKGDIR)-base/$(OODIR)/program/libdbalo.so \
+ $(PKGDIR)-base-core/$(OODIR)/program
+
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# link to system hsqldb
--
LibreOffice packaging repository
Reply to: