[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 201658caa157fca5b91515e84a7c338fb21b0a5c
Merge: 261b4a8 fcaea1f
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 28 19:18:16 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
rules
changelog | 5 ++++-
control | 2 +-
control.ure.in | 2 +-
rules | 6 +++---
4 files changed, 9 insertions(+), 6 deletions(-)
diff --cc changelog
index 9dcff17,87e2c8a..19a7987
--- a/changelog
+++ b/changelog
@@@ -4,18 -4,22 +4,21 @@@ libreoffice (1:5.0.0~rc2-1) UNRELEASED
* 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
+ * debian/rules:
+ - move gnome-open-url (back) to -gnome
+
- -- Rene Engelhard <rene@debian.org> Sat, 27 Jun 2015 12:31:14 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 27 Jun 2015 22:33:36 +0200
-libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
+libreoffice (1:5.0.0~rc1-1) experimental; urgency=medium
* New upstream release candidate
+ - fixes "Can't use a hash as a reference" deprecation warning/error in
+ lo-xlate-lang (closes: #788613)
- * debian/patches/rsc-no-error-about-unknown-switch.diff: *really* don't
- error out on unknown CPPFLAGS
- * debian/patches/fix-perl-deprecation-in-lo-xlate-lang.diff: fix
- "Can't use a hash as a reference" deprecation warning/error in
- lo-xlate-lang (closes: #788613)
- * debian/patches/libwps-0.4.diff: adapt for libwps 0.4
* debian/patches/liborcus.diff: backport build fixes for using liborcus
0.9.1 from master
diff --cc control.ure.in
index 2e054c4,0207c00..d6f37eb
--- a/control.ure.in
+++ b/control.ure.in
@@@ -2,7 -2,7 +2,7 @@@ Package: uno-libs
Section: libs
Architecture: %OOO_ARCHS%
Depends: ${misc:Depends}, ${shlibs:Depends}
- Replaces: ure (<< 4.0.3-2)
-Replaces: ure (<< 1:4.4.4~rc3-1)
++Replaces: ure (<< 1:5.0.0~rc2-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 --cc rules
index c525a58,fd10cc3..853dbbf
--- a/rules
+++ b/rules
@@@ -2399,17 -2399,19 +2399,17 @@@ ifeq "$(ENABLE_JAVA)" "y
$(CURDIR)/debian/ure/usr/share/java/jurt.jar
endif
# and the public libs to uno-libs3
- mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
- for i in debian/ure/$(OOUREDIR)/lib/libuno_*so.3; do \
- mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
- ln -sf /$(OOUREDIR)/lib/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
+ mkdir -p debian/uno-libs3/$(OODIR)/program
+ for i in debian/ure/$(OODIR)/program/libuno_*so.3; do \
+ mv $$i debian/uno-libs3/$(OODIR)/program; \
+ ln -sf /$(OODIR)/program/`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; \
+ mv debian/ure/$(OODIR)/program/$$i \
+ debian/uno-libs3/$(OODIR)/program; \
done
- cd debian/ure/$(OODIR) && \
- ln -sf /$(OOUREDIR) ure
ifeq "$(BUILD_KDE)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: