The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 4000c546e0defb8114bca2ddf602a5651c752bf9
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Mar 20 12:42:08 2013 +0100
move build deps from ./debian/tests/control to -subsequenttestbase
- here we can use generated build deps an evade deb#693540
diff --git a/changelog b/changelog
index 52d7e18..087d600 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa2) raring; urgency=low
+
+ * move build dependencies from ./debian/tests/control to -subsequentcheckbase
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 20 Mar 2013
12:40:22 +0100
+
libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa1) raring; urgency=low
* merge from Debian at a2aaf1c26fa02e8e0e186d8d1b255628e6f11a3d
diff --git a/control.in b/control.in
index 91e47f9..f4f687c 100644
--- a/control.in
+++ b/control.in
@@ -5,37 +5,7 @@ Maintainer: Ubuntu Developers
<ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers
<debian-openoffice@lists.debian.org>
XS-Testsuite: autopkgtest
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: autoconf,
- automake,
- bc,
- bison,
- bzip2,
- dpkg-dev (>= 1.16.1),
- fastjar,
- flex | flex-old,
- gperf,
- libarchive-zip-perl,
- libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
- libcups2-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libice-dev,
- libsm-dev,
- libx11-dev,
- libxaw7-dev,
- libxext-dev,
- libxinerama-dev,
- libxkbfile-dev,
- libxml-parser-perl,
- libxt-dev,
- libxtst-dev,
- pkg-config,
- unzip,
- x11proto-render-dev,
- xsltproc,
- zip,
- zlib1g-dev,
- %BUILD_DEPS%
+Build-Depends: %BUILD_DEPS%
Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index d875cf7..7151f3b 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreofficeVER-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: libreofficeVER, ${misc:Depends}, ${shlibs:Depends}
+Depends: libreofficeVER, %BUILD_DEPS%, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/rules b/rules
index db47763..13ef6ad 100755
--- a/rules
+++ b/rules
@@ -84,7 +84,37 @@ endif
#
OOO_ARCHS = amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc
PATCHSET=$(DEB_VENDOR)
-BUILD_DEPS=
+BUILD_DEPS=\
+ autoconf,\
+ automake,\
+ bc,\
+ bison,\
+ bzip2,\
+ dpkg-dev (>= 1.16.1),\
+ fastjar,\
+ flex | flex-old,\
+ gperf,\
+ libarchive-zip-perl,\
+ libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],\
+ libcups2-dev,\
+ libfontconfig1-dev,\
+ libfreetype6-dev,\
+ libice-dev,\
+ libsm-dev,\
+ libx11-dev,\
+ libxaw7-dev,\
+ libxext-dev,\
+ libxinerama-dev,\
+ libxkbfile-dev,\
+ libxml-parser-perl,\
+ libxt-dev,\
+ libxtst-dev,\
+ pkg-config,\
+ unzip,\
+ x11proto-render-dev,\
+ xsltproc,\
+ zip,\
+ zlib1g-dev\
# These are components which can be built from internal copies, or used from
the
# distribution. See configure --help for valid values (--with-system-<value>).
@@ -1359,7 +1389,6 @@ debian/control: $(wildcard debian/control*in)
$(SOURCE_TREE)/bin/lo-xlate-lang
chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
- -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
-e "s#@PYTHON_VERSION_CONTROL@#$(PYTHON_VERSION_CONTROL)#g" \
-e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
@@ -1515,6 +1544,7 @@ endif
perl -pi -e
"s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g"
debian/control
perl -pi -e
"s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
+ perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/ libreoffice-gnome,/ libreoffice-gnome |
libreoffice-kde,/' debian/control
endif
diff --git a/tests/control b/tests/control
index 64307bf..8480fa0 100644
--- a/tests/control
+++ b/tests/control
@@ -1,115 +1,2 @@
Tests: junit-subsequentcheck
-Depends: ant,
- ant-optional,
- autoconf,
- automake,
- bc,
- bison,
- bsh,
- bzip2,
- cpp-4.7,
- debhelper,
- default-jdk,
- dmake,
- doxygen,
- dpkg-dev,
- fastjar,
- fdupes,
- firefox-dev,
- flex,
- fontforge,
- gcj-jdk,
- gcj-native-helper,
- gdb,
- gettext,
- gperf,
- imagemagick,
- javahelper,
- junit4,
- kdelibs5-dev,
- libarchive-zip-perl,
- libbluetooth-dev,
- libboost-date-time-dev,
- libboost-dev,
- libcairo2-dev,
- libcdr-dev,
- libclucene-dev,
- libcmis-dev,
- libcommons-codec-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libcppunit-dev,
- libcups2-dev,
- libdbus-glib-1-dev,
- libexpat1-dev,
- libexttextcat-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
- libgcj-common,
- libgconf2-dev,
- libgl1-mesa-dev,
- libglib2.0-dev,
- libglu1-mesa-dev,
- libgstreamer-plugins-base1.0-dev,
- libgstreamer1.0-dev,
- libgtk-3-dev,
- libgtk2.0-dev,
- libhsqldb-java,
- libhunspell-dev,
- libhyphen-dev,
- libice-dev,
- libicu-dev,
- libjpeg-dev,
- liblcms2-dev,
- libldap2-dev,
- libmdds-dev,
- libmspub-dev,
- libmysqlclient-dev,
- libmysqlcppconn-dev,
- libmythes-dev,
- libneon27-gnutls-dev,
- libnss3-dev,
- liborbit2-dev,
- libpng12-dev,
- libpoppler-cpp-dev,
- libpoppler-dev,
- libpoppler-private-dev,
- libpq-dev,
- libqt4-dev,
- librdf0-dev,
- libreoffice-subsequentcheckbase,
- libsane-dev,
- libservlet3.0-java,
- libsm-dev,
- libssl-dev,
- libvigraimpex-dev,
- libvisio-dev,
- libwpd-dev,
- libwpg-dev,
- libwps-dev,
- libx11-dev,
- libxaw7-dev,
- libxext-dev,
- libxinerama-dev,
- libxkbfile-dev,
- libxml-parser-perl,
- libxml2-dev,
- libxml2-utils,
- libxrandr-dev,
- libxrender-dev,
- libxslt1-dev,
- libxt-dev,
- libxtst-dev,
- make,
- pkg-config,
- python,
- python-dev,
- python3-dev,
- unixodbc-dev,
- unzip,
- x11proto-render-dev,
- xml-core,
- xsltproc,
- zip,
- zlib1g-dev
+Depends: libreoffice-subsequentcheckbase, gdb
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uiqvx-000158...@vasks.debian.org
