[libreoffice] 02/03: add initial build profile support: nodoc and nocheck
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 771fc5e83bb50fdff01aecd190682465a9d8b6ec
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 28 19:57:58 2016 +0200
add initial build profile support: nodoc and nocheck
---
changelog | 7 +++++++
control | 12 ++++++------
rules | 23 +++++++++++++++--------
tests/control | 2 +-
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/changelog b/changelog
index 567ef21..c817703 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.0~alpha1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - add initial build profile support: nodoc and nocheck
+
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Apr 2016 21:33:47 +0200
+
libreoffice (1:5.2.0~alpha1-1) experimental; urgency=medium
* New upstream alpha release
diff --git a/control b/control
index efd8c3c..8687bee 100644
--- a/control
+++ b/control
@@ -23,20 +23,20 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
flex (>= 2.3.35),
- fontconfig,
- fonts-crosextra-carlito,
- fonts-liberation,
+ fontconfig <!nocheck>,
+ fonts-crosextra-carlito <!nocheck>,
+ fonts-liberation <!nocheck>,
g++-5 [hppa ia64 s390 sparc],
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
- gdb,
+ gdb <!nocheck>,
gettext,
gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2),
+ junit4 (>= 4.8.2-2) <!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
@@ -147,7 +147,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
xsltproc,
zip,
zlib1g-dev
-Build-Depends-Indep: doxygen (>= 1.8.4),
+Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
fdupes,
g++-mingw-w64-i686,
libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
diff --git a/rules b/rules
index e9012ca..f17f456 100755
--- a/rules
+++ b/rules
@@ -202,6 +202,9 @@ endif
ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
$(error only either DDEBS or -dbg allowed)
endif
+# this changes the packages' built/contents of packages (-subsequentcheckbase)
+# This is not exactly allowed in policy but it doesn't have real practical difference,
+# does it?
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
endif
@@ -258,7 +261,11 @@ WEBDAV_LIB=neon
endif
SYSTEM_STUFF += redland
PACKAGE_SDK=y
+ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+PACKAGE_SDK_DOCS=n
+else
PACKAGE_SDK_DOCS=y
+endif
PACKAGE_LOKIT=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
@@ -786,7 +793,7 @@ ifneq "$(PACKAGE_SDK)" "y"
endif
else
ifeq "$(PACKAGE_SDK_DOCS)" "y"
- BUILD_DEPS_INDEP += , doxygen (>= 1.8.4)
+ BUILD_DEPS_INDEP += , doxygen (>= 1.8.4) <!nodoc>
else
CONFIGURE_FLAGS += --without-doxygen --without-javadoc
endif
@@ -902,7 +909,7 @@ ifeq "$(BUILD_DDEBS)" "y"
BUILD_DEPS += , dpkg-dev (>= 1.18.2~)
else
BUILD_DEPS += , debhelper (>= 7.2.3~)
- BUILD_DEPS += , dpkg-dev (>= 1.16.1)
+ BUILD_DEPS += , dpkg-dev (>= 1.17.14)
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -919,12 +926,12 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb
- BUILD_DEPS += , fontconfig
- BUILD_DEPS += , fonts-liberation
- BUILD_DEPS += , fonts-crosextra-carlito
+ BUILD_DEPS += , gdb <!nocheck>
+ BUILD_DEPS += , fontconfig <!nocheck>
+ BUILD_DEPS += , fonts-liberation <!nocheck>
+ BUILD_DEPS += , fonts-crosextra-carlito <!nocheck>
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) <!nocheck>
else
CONFIGURE_FLAGS += --without-junit
endif
@@ -1872,7 +1879,7 @@ debian/tests/control: debian/tests/control.in debian/control
# for now we filter out the arch-specific libc* and ia64, which is ugly,
# but better than manual bookkeeping. Also filter out the mips(el)-only
# binutils build-dep...
- sed -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|sed -e 's/\[[^]]*\]//g'))#g" < debian/tests/control.in > debian/tests/control
+ sed -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|sed -e 's/\[[^]]*\]//g'|sed -e s,\<.*\>,,g))#g" < debian/tests/control.in > debian/tests/control
endif
.DELETE_ON_ERROR: debian/control debian/tests/control
diff --git a/tests/control b/tests/control
index a1e8ecb..197b8b8 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: