[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 6.0 rc2

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
8ebf88ce by Rene Engelhard at 2018-01-11T23:06:36+01:00
6.0 rc2

- - - - -


2 changed files:

- changelog
- rules


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:6.0.0~rc2~git20180110-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
 
-  * New upstream snapshot
+  * New upstream release candidate
 
   * debian/patches/poppler-0.62.diff: backport from master to fix build with
     poppler 0.62
@@ -8,7 +8,7 @@ libreoffice (1:6.0.0~rc2~git20180110-1) UNRELEASED; urgency=medium
   * debian/rules:
     - rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
 
- -- Rene Engelhard <rene at debian.org>  Mon, 08 Jan 2018 22:44:59 +0100
+ -- Rene Engelhard <rene at debian.org>  Thu, 11 Jan 2018 23:05:44 +0100
 
 libreoffice (1:6.0.0~rc1-1) experimental; urgency=medium
 


=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -73,8 +73,8 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
 # 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=libreoffice-6-0
+GIT_TAG=libreoffice-$(lo_sources_ver)-buildfix1
+GIT_BRANCH=libreoffice-6-0-0
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/8ebf88ceb7917b824d38a90fdf73ef4e9b79004b

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/8ebf88ceb7917b824d38a90fdf73ef4e9b79004b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180111/62b9432b/attachment-0001.html>