[libreoffice] 01/03: uuid is only needed for crosscompile msi generation, no need for MIRs
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit 0e4452cb12a669dc81eb7e658939ae0cea540249
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Aug 26 22:06:28 2013 +0200
uuid is only needed for crosscompile msi generation, no need for MIRs
Conflicts:
changelog
---
changelog | 4 ++++
rules | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index be4594a..706da8a 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,10 @@ libreoffice (1:4.1.1~rc2-2) UNRELEASED; urgency=low
- hardcode kfreebsd-* as openjdk arch until java-common setting it as
default is uploaded
+ * merge from Ubuntu:
+ - remove uuid build-dep again, just needed for crosscompile msi
+ generation..
+
-- Rene Engelhard <rene@debian.org> Sun, 25 Aug 2013 13:30:25 +0200
libreoffice (1:4.1.1~rc2-1) experimental; urgency=low
diff --git a/rules b/rules
index 6596873..bad6ae0 100755
--- a/rules
+++ b/rules
@@ -749,9 +749,6 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
- # checking for uuidgen... no
- # configure: WARNING: uuid is needed for dev-install
- BUILD_DEPS += , uuid
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: