This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.
commit d9b1caa9c10a3c0c48e433a1bde394717b64558d
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu May 29 09:21:36 2014 +0200
add shlibs override for internal glew
---
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 152be3f..da1a377 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.0~beta1-1ubuntu1~trusty2) UNRELEASED; urgency=medium
+
+ * ignore libreoffice-ogltrans deps for internal libGLEW for now
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 29 May 2014
09:19:51 +0200
+
libreoffice (1:4.3.0~beta1-1ubuntu1~trusty1) trusty; urgency=medium
* merge from debian
diff --git a/rules b/rules
index d2551db..63f0968 100755
--- a/rules
+++ b/rules
@@ -3104,7 +3104,7 @@ endif
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program"
\
- dh_shlibdeps -s -Nlibreoffice-officebean \
+ dh_shlibdeps -s -Nlibreoffice-officebean -Nlibreoffice-ogltrans
\
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell
dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep
_bc)) \
$(SHLIBS_OVERRIDE)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wxcpp-0001o3...@moszumanska.debian.org
