[libreoffice] 01/01: git update; disable disable-tiledrendering-test.diff again
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 2638c0720d02de63068e685a4ba1ca61681649c4
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 7 06:56:10 2015 +0200
git update; disable disable-tiledrendering-test.diff again
---
changelog | 6 +++---
patches/series | 2 +-
rules | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 955a50e..07a05ee 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:5.0.0-1) UNRELEASED; urgency=medium
+libreoffice (1:5.0.1~rc1~git20150806-1) UNRELEASED; urgency=medium
- * LibreOffice 5.0.0 final release (identical to rc5)
+ * New upstream snapshot
* debian/patches/disable-tiledrendering-test.diff: temporarily disable test
* debian/rules:
@@ -13,7 +13,7 @@ libreoffice (1:5.0.0-1) UNRELEASED; urgency=medium
* debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
other ones do for oxygen/tango)
- -- Rene Engelhard <rene@debian.org> Tue, 04 Aug 2015 09:35:18 +0000
+ -- Rene Engelhard <rene@debian.org> Thu, 06 Aug 2015 19:36:13 +0200
libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
diff --git a/patches/series b/patches/series
index 8d6e17e..0d8626b 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,4 @@ hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
-disable-tiledrendering-test.diff
+#disable-tiledrendering-test.diff
diff --git a/rules b/rules
index a69e65e..129a3c0 100755
--- a/rules
+++ b/rules
@@ -73,7 +73,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-0-0
+GIT_BRANCH=libreoffice-5-0
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
Reply to: