The following commit has been merged in the master branch:
commit 6947704dab4d1f976933e9eea119b2f827bf1fda
Author: Rene Engelhard <[email protected]>
Date: Sat Apr 14 21:34:48 2012 +0200
build-depend on make >= 3.81-8.2 instead of 3.82 now that sid is also
fixed; PARALLEL_BUILD=y again
diff --git a/changelog b/changelog
index 57a5b8b..3e9e736 100644
--- a/changelog
+++ b/changelog
@@ -19,6 +19,8 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
GCC_VERSION != ""....
- actually add epoch to libqt4-dev builddeps...
- revert JDK7 test workaround from last upload again
+ - build-depend on make >= 3.81-8.2 instead of 3.82 now that sid is also
fixed;
+ PARALLEL_BUILD=y again
* debian/python{,3}-uno.preinst.in: only run extension stuff when upgrading
from version where the extension was here ...
* debian/libreoffice-script-provider-python.preinst.in: ... and copy
@@ -32,7 +34,7 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
to sync; hopefully catches cases where unopkg doesn't (yet) work
(closes: #668193)
- -- Rene Engelhard <[email protected]> Thu, 12 Apr 2012 21:55:44 +0200
+ -- Rene Engelhard <[email protected]> Sat, 14 Apr 2012 21:27:11 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --git a/control b/control
index fcd4461..b8d51f7 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel],
libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha
!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>=
1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64
armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc],
openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa
!powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>=
1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !a
rmhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386],
liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64
!kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa
!powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java
(>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3),
xulrunner-dev [!s390x], dmake (>= 1:4.11), 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, libsampleicc-dev,
libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>=
4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>=
2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc
!powerpcspe !ppc64], libpq-dev (>= 9.0~), 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.70), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0),
libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel],
libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha
!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>=
1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64
armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc],
openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa
!powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>=
1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !a
rmhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386],
liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64
!kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa
!powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java
(>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3),
xulrunner-dev [!s390x], dmake (>= 1:4.11), 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, libsampleicc-dev,
libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>=
4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>=
2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc
!powerpcspe !ppc64], libpq-dev (>= 9.0~), 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.70), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0),
libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
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], libc0.1-dev (= 2.13-26)
[kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386
kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6
(= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64
!kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1),
libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index 4428d63..f02688e 100755
--- a/rules
+++ b/rules
@@ -219,7 +219,7 @@ CURL_SECTYPE=gnutls
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
-PARALLEL_BUILD=n
+PARALLEL_BUILD=y
ENABLE_LDAP=y
USE_OPENLDAP=y
ENABLE_OPENGL=y
@@ -1140,7 +1140,7 @@ NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^\(.* \)\?parallel=\([
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
- BUILD_DEPS += , make (>= 3.82)
+ BUILD_DEPS += , make (>= 3.81-8.2)
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
