[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-58-g7a208db
The following commit has been merged in the debian-experimental-3.6 branch:
commit 8bc7bf9b84bb3ff1eed54a9831de11e37fd160fc
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 25 02:40:31 2012 +0200
readd move of libdbalo.so to -base-core
diff --git a/changelog b/changelog
index aa229ef..4492747 100644
--- a/changelog
+++ b/changelog
@@ -23,12 +23,13 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
on other archs and it saves us the g++-mingw-w64-i686 build-dep there
- use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
ball, too
+ - readd move of libdbalo.so to -base-core (closes: #670350)
* debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
(as -env=UserInstallation doesn't work (anymore) - closes: #669271
* debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
/var/lib/libreoffice/share/prereg
- -- Rene Engelhard <rene@debian.org> Wed, 25 Apr 2012 00:15:25 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 25 Apr 2012 02:37:45 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --git a/control b/control
index 3ab1fcb..6c35c8b 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 31cbf04..5b00448 100644
--- a/control.in
+++ b/control.in
@@ -315,6 +315,7 @@ Architecture: %OOO_BASE_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
+Replaces: libreofficeVER-base (<< 1:3.5.3~rc2-2)
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 8834cce..0ee147e 100755
--- a/rules
+++ b/rules
@@ -2107,6 +2107,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: