[libreoffice] 01/03: update to libreoffice-5-0 branch; libetonyek is a .so now, too...
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 9a673625abfb6aa989d0e53a168c992f9c219d17
Author: Rene Engelhard <rene@debian.org>
Date: Wed May 20 14:22:29 2015 +0200
update to libreoffice-5-0 branch; libetonyek is a .so now, too...
---
changelog | 4 ++--
rules | 5 ++++-
shlibs.override.libetonyek | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index c4c9d45..bdf5ace 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.0.0~beta1~git20150519-1) UNRELEASED; urgency=medium
+libreoffice (1:5.0.0~beta1~git20150520-1) UNRELEASED; urgency=medium
* New upstream snapshot
@@ -13,7 +13,7 @@ libreoffice (1:5.0.0~beta1~git20150519-1) UNRELEASED; urgency=medium
- oops, also add old openoffice(.org) changelogs to fonts-opensymbol, it
already existed in OOO 3.2.1 times (squeeze)
- -- Rene Engelhard <rene@debian.org> Sat, 09 May 2015 14:47:42 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 20 May 2015 13:15:54 +0200
libreoffice (1:5.0.0~alpha1-1) experimental; urgency=medium
diff --git a/rules b/rules
index 0fcded5..60d12cd 100755
--- a/rules
+++ b/rules
@@ -71,7 +71,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=master
+GIT_BRANCH=libreoffice-5-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -3121,6 +3121,9 @@ endif
ifeq (,$(filter librevenge, $(SYSTEM_STUFF)))
cat debian/shlibs.override.librevenge >> debian/shlibs.local
endif
+ifeq (,$(filter libetonyek, $(SYSTEM_STUFF)))
+ cat debian/shlibs.override.libetonyek >> debian/shlibs.local
+endif
ifeq (,$(filter glew, $(SYSTEM_STUFF)))
cat debian/shlibs.override.glew >> debian/shlibs.local
endif
diff --git a/shlibs.override.libetonyek b/shlibs.override.libetonyek
new file mode 100644
index 0000000..15717ef
--- /dev/null
+++ b/shlibs.override.libetonyek
@@ -0,0 +1 @@
+libetonyek-0.1 1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: