[libreoffice] 30/36: bump to beta2, consolidate changelog
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 7afca690110bacb0070febbc1719febcc4b23384
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jun 13 19:15:02 2014 +0200
bump to beta2, consolidate changelog
---
changelog | 26 ++++++--------------------
rules | 2 +-
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/changelog b/changelog
index 144c002..3283282 100644
--- a/changelog
+++ b/changelog
@@ -1,28 +1,14 @@
-libreoffice (1:4.3.0~beta1-1ubuntu1~utopic8) utopic; urgency=medium
+libreoffice (1:4.3.0~beta2-0ubuntu1) utopic; urgency=medium
+ * merge from debian
+ * ignore libreoffice-ogltrans deps for internal libGLEW for now
+ * forward port to utopic
* disable all tests for now: works in local pbuilder, but apparently not in
the PPA one
* update and bring back lp-1296715.diff, which is not yet upstreamed
+ * bump to upstrean beta2
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 12 Jun 2014 19:33:37 +0200
-
-libreoffice (1:4.3.0~beta1-1ubuntu1~utopic1) utopic; urgency=medium
-
- * forward port to utopic
-
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 30 May 2014 15:05:12 +0200
-
-libreoffice (1:4.3.0~beta1-1ubuntu1~trusty2) trusty; urgency=medium
-
- * ignore libreoffice-ogltrans deps for internal libGLEW for now
-
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 29 May 2014 09:19:51 +0200
-
-libreoffice (1:4.3.0~beta1-1ubuntu1~trusty1) trusty; urgency=medium
-
- * merge from debian
-
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 22 May 2014 22:03:33 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 13 Jun 2014 19:12:28 +0200
libreoffice (1:4.3.0~beta1-1) experimental; urgency=low
diff --git a/rules b/rules
index 69f095e..e65eb76 100755
--- a/rules
+++ b/rules
@@ -72,7 +72,7 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
lo_sources_ver=4.2.3~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.3.0.0.beta1
+GIT_TAG=libreoffice-4.3.0.0.beta2
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: