[libreoffice] 01/01: use @builddeps@ instead of our manual extra hackery for tests/control Depends:

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit aeaccc8f64332e3ed4d247dcbcac5ce3f5b504b5
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jul 2 18:08:36 2017 +0200

    use @builddeps@ instead of our manual extra hackery for tests/control Depends:
---
 changelog        |  4 ++++
 rules            | 16 +---------------
 tests/control    |  2 +-
 tests/control.in |  8 --------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/changelog b/changelog
index ae4c4a1..228bb8a 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,10 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
       let's remove the Java5 alternatives
   * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
     needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
+  * debian/rules, debian/tests/control: remove extra hackery to add our
+    Build-Depends-(Indep-): to debian/tests/control.in; misses some packages
+    (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
+    use @builddeps@ instead
 
  -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 19:25:59 +0200
 
diff --git a/rules b/rules
index b9efcaf..32b815a 100755
--- a/rules
+++ b/rules
@@ -1633,11 +1633,7 @@ endif
 
 # Generate control file, because we have so many different languages
 # Based on script by Martin Quinson <Martin.Quinson at tuxfamily.org>
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
-control: debian/control debian/tests/control
-else
 control: debian/control
-endif
 debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang  debian/rules
 	chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
 	sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
@@ -1859,17 +1855,7 @@ ifneq "$(DICT_DIR)" "/usr/share/hunspell"
 	perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
 endif
 
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
-debian/tests/control: debian/tests/control.in debian/control
-	# we want the build deps as dep on subsequentcheckbase, but strip the arch
-	# specifics as we are arch-all
-	# 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 openjdk-6-jdk| grep -v gcc-7 | grep -v g++-7 | 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
+.DELETE_ON_ERROR: debian/control
 
 # All 'important' targets have 2 lines.  The one that is run by
 # dpkg-buildpackage or the user, and the one that does the actual work.  This
diff --git a/tests/control b/tests/control
index 285c3a4..db4ca52 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, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, 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.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: @builddeps@, libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb
 
 Tests: pyuno-import
 Depends: python3-uno
diff --git a/tests/control.in b/tests/control.in
deleted file mode 100644
index 2233c44..0000000
--- a/tests/control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, %BUILD_DEPS_ARCH_ALL%, build-essential, default-jdk
-
-Tests: pyuno-import
-Depends: python3-uno
-
-Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git