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 7cf8a9d7ddb6d1814a1ed7937e4103eff6b398cf Author: Rene Engelhard <[email protected]> Date: Sat Dec 19 01:51:18 2015 +0100 git update; remove etonyek workaround, the test file is gone --- changelog | 6 ++++++ rules | 18 ------------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/changelog b/changelog index d8fe2c1..15102f6 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +libreoffice (1:5.0.5~rc1~git20151219-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + -- Rene Engelhard <[email protected]> Sat, 19 Dec 2015 01:50:15 +0100 + libreoffice (1:5.0.4~rc2-2) unstable; urgency=medium * reupload with correct 1:5.0.4~rc1-1 base... diff --git a/rules b/rules index b148b0a..95ba2eb 100755 --- a/rules +++ b/rules @@ -1599,15 +1599,6 @@ endif # obsolete lock file not cleaned up.... rm -f dbaccess/qa/extras/testdocuments/fdo84315.odb.lck -ifneq (,$(filter libetonyek, $(SYSTEM_STUFF))) - ifeq "$(shell dpkg --compare-versions `pkg-config --modversion libetonyek-0.1` ge 0.1.4 && echo true)" "true" - if [ -e writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip ]; then \ - mv writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip \ - writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip; \ - fi - endif -endif - # Files created in debian directory $(MAKE) -f debian/rules clean-debdir @@ -1979,15 +1970,6 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff endif -ifneq (,$(filter libetonyek, $(SYSTEM_STUFF))) - ifeq "$(shell dpkg --compare-versions `pkg-config --modversion libetonyek-0.1` ge 0.1.4 && echo true)" "true" - if [ -e writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip ]; then \ - mv writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip \ - writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip; \ - fi - endif -endif - $(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \ cd $(SOURCE_TREE) && \ export PATH=$(BUILD_PATH); \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
