[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 15/21: build-depend on uuid when running make check



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-testing-4.0
in repository libreoffice.

commit b7d2dfdaa874f1beddd55084a2270e733efd8958
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Aug 16 12:05:59 2013 +0200

    build-depend on uuid when running make check
---
 changelog |    1 +
 control   |    2 ++
 rules     |    3 +++
 3 files changed, 6 insertions(+)

diff --git a/changelog b/changelog
index 221f80a..b361cb3 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low
   * debian/rules:
     - don't try to package up -subsequentcheckbase on gcj-using archs
       as needed stuff isn't built there 
+    - build-depend on uuid when running make check
   * debian/libreoffice-dev-doc.links: add api -> docs symlink as Javadocs
     should be in api/
 
diff --git a/control b/control
index b622b59..4384a35 100644
--- a/control
+++ b/control
@@ -115,6 +115,7 @@ Build-Depends: ant (>= 1.7.0),
                python3-dev (>= 3.3),
                unixodbc-dev (>= 2.2.11),
                unzip,
+               uuid,
                x11proto-render-dev,
                xsltproc,
                xulrunner-dev,
@@ -4572,6 +4573,7 @@ Depends: ant (>= 1.7.0),
          python3-dev (>= 3.3),
          unixodbc-dev (>= 2.2.11),
          unzip,
+         uuid,
          x11proto-render-dev,
          xsltproc,
          xulrunner-dev,
diff --git a/rules b/rules
index 4aeea4e..994c259 100755
--- a/rules
+++ b/rules
@@ -731,6 +731,9 @@ 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: