[libreoffice] 03/03: 5.3.5 rc1

Rene Engelhard rene at moszumanska.debian.org
Tue Jul 18 06:21:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit c55cc28bb6facfe70dddce1481275d9a19ff39d8
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 18 08:13:35 2017 +0200

    5.3.5 rc1
---
 changelog                              | 6 ++++++
 control                                | 2 +-
 control.in                             | 2 +-
 patches/change-from-glew-to-epoxy.diff | 4 ++--
 rules                                  | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 5e52304..fc2c959 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.3.5~rc1-1) unstable; urgency=medium
+
+  * New upstream release candidate
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 18 Jul 2017 08:10:51 +0200
+
 libreoffice (1:5.3.4-4) unstable; urgency=medium
 
   * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
diff --git a/control b/control
index 56c3254..9054233 100644
--- a/control
+++ b/control
@@ -184,7 +184,7 @@ Build-Conflicts: amd-libopencl1,
                  nvidia-libopencl1,
                  qt3-dev-tools
 Standards-Version: 3.9.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Bugs: 
 Homepage: http://www.libreoffice.org
diff --git a/control.in b/control.in
index 7be16b6..15ec93f 100644
--- a/control.in
+++ b/control.in
@@ -23,7 +23,7 @@ Build-Conflicts: flex (= 2.5.34-1) [amd64],
                  amd-libopencl1,
                  nvidia-libopencl1
 Standards-Version: 3.9.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Bugs: @BUGS@
 Homepage: http://www.libreoffice.org
diff --git a/patches/change-from-glew-to-epoxy.diff b/patches/change-from-glew-to-epoxy.diff
index 50d93f7..31dc025 100644
--- a/patches/change-from-glew-to-epoxy.diff
+++ b/patches/change-from-glew-to-epoxy.diff
@@ -549,8 +549,8 @@ index 3e3313b..9d7af4f 100644
  export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
 -export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
  export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
- export GRAPHITE_TARBALL := 3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
- export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
+ export GRAPHITE_MD5SUM := 9c499b8ec9f1b81fd0bb6a3b986f4b0f
+ export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
 @@ -88,8 +89,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
  export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
  export LIBEOT_TARBALL := libeot-0.01.tar.bz2
diff --git a/rules b/rules
index 920e654..dd0de2e 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=libreoffice-5-3-4
+GIT_BRANCH=libreoffice-5-3-5
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list