[libreoffice] 02/11: fix subsequentcheckbase
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to tag libreoffice_4.2.0_rc4-0ubuntu1
in repository libreoffice.
commit de31ffca7ebdc34f0b43230f83bb390bb8098841
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Jan 25 14:01:52 2014 +0100
fix subsequentcheckbase
---
changelog | 3 ++-
rules | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 7e30e5c..419cbf2 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:4.2.0~rc3-0ubuntu1~trusty1) trusty; urgency=low
* new upstream rc
+ * merge from debian and fix subsequentcheckbase
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 24 Jan 2014 04:15:06 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 25 Jan 2014 13:59:02 +0100
libreoffice (1:4.2.0~rc2-0ubuntu2) trusty; urgency=low
diff --git a/rules b/rules
index 8a43cd1..2026a45 100755
--- a/rules
+++ b/rules
@@ -2586,8 +2586,6 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
for jar in OOoRunner.jar OOoRunnerLight.jar test.jar test-tools.jar; do \
cp workdir/Jar/$$jar $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/; \
done
- cp instdir/program/classes/ConnectivityTools.jar \
- $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes
endif
endif
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: