The following commit has been merged in the debian-experimental-3.4.0 branch:
commit fb77d389ec534bbf7b5c6db3b9b159dde062ec53
Author: Rene Engelhard <r...@debian.org>
Date: Tue Jul 19 20:15:24 2011 +0000
PARALLEL_BUILD=n per default to not force make upgrade on the buildd
chroos. Add comment on why we need make (>= 3.82)
diff --git a/changelog b/changelog
index 6d52104..ef7ca62 100644
--- a/changelog
+++ b/changelog
@@ -13,7 +13,8 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
- update ENABLE_OPENGL configure flags, now --enable-opengl is default
upstream
- - fix build with make 3.82: remove space after, in $(call
+ - fix build with make 3.82: remove space after, in $(call; build-depend
+ on make >= 3.82 if PARALLEL_BUILD=y
- fix -javafilter.destop Exec=
* debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
* merge from ubuntu-oneiric-3.4:
@@ -27,7 +28,7 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- Fix deprecated options when calling soffice and libreoffice
(closes: #634001)
- -- Rene Engelhard <r...@debian.org> Mon, 18 Jul 2011 18:58:14 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 19 Jul 2011 18:32:55 +0000
libreoffice (1:3.4.1-1) experimental; urgency=low
diff --git a/control b/control
index d38e16f..e38964f 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3),
libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python
(>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>=
1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc
powerpcspe ppc64 s390 s390x
sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>=
1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>=
1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia
64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev
(>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>>
1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, m
ake (>= 3.82), libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3),
libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python
(>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>=
1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc
powerpcspe ppc64 s390 s390x
sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>=
1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>=
1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia
64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev
(>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>>
1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, l
ibldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386
kfreebsd-amd64], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant
(= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], base-files (= 6.0),
base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~), libstlport4.6-dev
Standards-Version: 3.9.1
diff --git a/rules b/rules
index f9f45c8..b4b172a 100755
--- a/rules
+++ b/rules
@@ -231,7 +231,7 @@ CURL_SECTYPE=gnutls
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
-PARALLEL_BUILD=y
+PARALLEL_BUILD=n
MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
@@ -1140,10 +1140,11 @@ ifeq "$(NUM_CPUS)" ""
# according to Pavel Janik, build -P<number of cores> -- -P2
# is ideal. This sets the first -P according to the number
# of CPUs (where dual-core CPUS report 2, too)
- BUILD_DEPS += , make (>= 3.82)
ifneq ($(AVAIL_CPUS),1)
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
+ # http://bugs.debian.org/622644
+ BUILD_DEPS += , make (>= 3.82)
endif
else
ifneq "$(PARALLEL_BUILD)" "y"
--
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/e1qjgj2-0001uu...@vasks.debian.org
