[libreoffice] 06/08: bump to upstream 4.2.6~rc2
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.
commit 82705497574bce464a9db1f1256e6c6e4e712f1c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jul 24 10:24:52 2014 +0200
bump to upstream 4.2.6~rc2
---
changelog | 6 ++++++
rules | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 6c267f3..9cc2ad7 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.2.6~rc2-0ubuntu1) trusty; urgency=medium
+
+ * new upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Jul 2014 10:23:21 +0200
+
libreoffice (1:4.2.5~rc2-0ubuntu2) trusty; urgency=medium
* uae internal mdds, external dependency was bumped
diff --git a/rules b/rules
index 0a1d726..03de3b7 100755
--- a/rules
+++ b/rules
@@ -68,10 +68,10 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# bootstraping this from the source tree is breaking get-orig-source
#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
-lo_sources_ver=4.2.5~rc2
+lo_sources_ver=4.2.6~rc2
# 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-4.2.5.2
+GIT_TAG=libreoffice-4.2.6.2
GIT_BRANCH=master
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: