[libreoffice] 01/03: fix version
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit e846862996aa06ccb17caa99e030823d934e358e
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 8 20:21:37 2014 +0200
fix version
---
changelog | 2 +-
rules | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index ff8c2b2..7c70a91 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.5~rc1~git20140620-1) UNRELEASED; urgency=medium
+libreoffice (1:4.2.6~rc1~git20140708-1) UNRELEASED; urgency=medium
* new upstream snapshot
diff --git a/rules b/rules
index eedcc36..a2a206a 100755
--- a/rules
+++ b/rules
@@ -1006,7 +1006,6 @@ endif
ifeq "$(USE_UCPP)" "y"
ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
IDLC_CPP_DEPENDS := ucpp
- BUILD_DEPS += , $(UCPP_DEPENDS)
endif
else
# hardcode 4.7 as 4.8 fails:
@@ -1014,8 +1013,8 @@ else
# -P, but then idlc produces empty urd files"
IDLC_CPP_DEPENDS := cpp-4.7
CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.7
- BUILD_DEPS += , cpp-4.7
endif
+ BUILD_DEPS += , $(IDLC_CPP_DEPENDS)
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: