[libreoffice] 04/06: adding build-essential to subsequentcheckbase should fix autopkgtest issues

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch master
in repository libreoffice.

commit d69555d2a3a34e7f2a91460eb24e888571f5dc19
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Sep 11 01:44:42 2014 +0200

    adding build-essential to subsequentcheckbase should fix autopkgtest issues
    
    Conflicts:
    	changelog
    	control.subsequentcheckbase.in
---
 changelog                      | 6 +++++-
 control                        | 2 +-
 control.subsequentcheckbase.in | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 64183f3..724884f 100644
--- a/changelog
+++ b/changelog
@@ -8,7 +8,11 @@ libreoffice (1:4.3.2-1) unstable; urgency=medium
     - remove arm64 internal vigra workaround again; now built
     - remove obsolete libxml-parser-perl build-dep
 
- -- Rene Engelhard <rene@debian.org>  Sat, 27 Sep 2014 22:04:17 +0200
+  * merge from Ubuntu:
+    - adding build-essential to subsequentcheckbase should fix autopkgtest
+      issues 
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 28 Sep 2014 00:32:49 +0200
 
 libreoffice (1:4.3.2~rc2-1) experimental; urgency=low
 
diff --git a/control b/control
index 724b112..dafd2b7 100644
--- a/control
+++ b/control
@@ -4476,6 +4476,7 @@ Depends: ant (>= 1.7.0),
          automake,
          bc,
          bison,
+         build-essential,
          bzip2,
          debhelper (>= 7.2.3~),
          default-jdk,
@@ -4582,7 +4583,6 @@ Depends: ant (>= 1.7.0),
          libxext-dev,
          libxinerama-dev,
          libxkbfile-dev,
-         libxml-parser-perl,
          libxml2-dev,
          libxml2-utils,
          libxrandr-dev,
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index 6c677f0..a63ceb8 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreoffice-subsequentcheckbase
 Section: libs
 Priority: extra
 Architecture: all
-Depends: libreoffice, openjdk-7-jdk, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}                
+Depends: libreoffice, openjdk-7-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}                
 Description: LibreOffice java test libraries
  LibreOffice subsequentchecks integration test suite
 

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