summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2016-06-30 20:27:42 (GMT)
committerRico Tzschichholz <ricotz@ubuntu.com>2016-06-30 20:27:42 (GMT)
commit97262150e06b39605a4a63b6921a4010371da6ad (patch)
tree092547773fbf31880851daaf65b1a4e7a7df1b50
parent23b3a1b4aca1285d6b7208e6bb51835f2df32848 (diff)
bump to 5.2.0.1
-rw-r--r--changelog12
-rwxr-xr-xrules4
2 files changed, 14 insertions, 2 deletions
diff --git a/changelog b/changelog
index 479bb1d..dede31d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.0~rc1-0ubuntu1~yakkety1) yakkety; urgency=medium
+
+ * New upstream rc release
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com> Thu, 30 Jun 2016 13:10:49 +0200
+
+libreoffice (1:5.2.0~beta2-0ubuntu1~yakkety1) yakkety; urgency=medium
+
+ * New upstream beta release
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com> Wed, 08 Jun 2016 10:00:09 +0200
+
libreoffice (1:5.2.0~beta1-1ubuntu2) yakkety; urgency=medium
* for now stay with plain libreoffice-dbg
diff --git a/rules b/rules
index abb8e06..1253b0b 100755
--- a/rules
+++ b/rules
@@ -70,10 +70,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=5.2.0.0.beta1
+lo_sources_ver=5.2.0.1
# 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)-hotfix1
+GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-5-2
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"