[libreoffice] 01/01: move libunoidllo.so from ure to uno-libs3...
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit fcaea1fcfba671fd399ae8b88b774519b64d709e
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 27 22:38:51 2015 +0200
move libunoidllo.so from ure to uno-libs3...
---
changelog | 5 ++++-
control | 2 +-
control.ure.in | 2 +-
rules | 6 +++---
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 0555285..87e2c8a 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,11 @@ libreoffice (1:4.4.4~rc3-1) UNRELEASED; urgency=medium
* debian/control.in:
- s/cliipart/clipart/ (closes: #787660 again)
+ * debian/rules:
+ - move libunoidllo.so from ure into uno-libs3, too, as libcppuhelpergcc3.so.3
+ is (now) linked to it
- -- Rene Engelhard <rene@debian.org> Wed, 24 Jun 2015 08:24:30 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 27 Jun 2015 22:33:36 +0200
libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
diff --git a/control b/control
index 506c62a..c74e048 100644
--- a/control
+++ b/control
@@ -4032,7 +4032,7 @@ Package: uno-libs3
Section: libs
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 4.0.3-2)
+Replaces: ure (<< 1:4.4.4~rc3-1)
Breaks: libreoffice-core (<< 1:4.3.0~), ure (<< 4.1.2~)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
diff --git a/control.ure.in b/control.ure.in
index bf884f5..0207c00 100644
--- a/control.ure.in
+++ b/control.ure.in
@@ -2,7 +2,7 @@ Package: uno-libs3
Section: libs
Architecture: %OOO_ARCHS%
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 4.0.3-2)
+Replaces: ure (<< 1:4.4.4~rc3-1)
Breaks: ure (<< 4.1.2~), libreoffice-core (<< 1:4.3.0~)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
diff --git a/rules b/rules
index bdc0881..fd10cc3 100755
--- a/rules
+++ b/rules
@@ -2404,9 +2404,9 @@ endif
mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
ln -sf /$(OOUREDIR)/lib/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
done
- # we also need libxmlreaderlo.so and libreglo.so (libuno_cppuhelpergcc3.so.3 needs it)
- # and libstorelo.so (libreglo.so needs it)
- for i in libxmlreaderlo.so libreglo.so libstorelo.so; do \
+ # we also need libxmlreaderlo.so, libreglo.so and libunoidllo.so (libuno_cppuhelpergcc3.so.3
+ # needs it) and libstorelo.so (libreglo.so needs it)
+ for i in libxmlreaderlo.so libreglo.so libstorelo.so libunoidllo.so; do \
mv debian/ure/$(OOUREDIR)/lib/$$i \
debian/uno-libs3/$(OOUREDIR)/lib; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: