The following commit has been merged in the debian-experimental-3.5 branch:
commit b5d0b72464efd296f1380376685b671c0de37e47
Author: Rene Engelhard <r...@debian.org>
Date: Fri Feb 3 06:14:54 2012 +0000
build with default boost again but add build-dep on g++-4.6 (>= 4.6.2-12)
diff --git a/changelog b/changelog
index d58656a..471a664 100644
--- a/changelog
+++ b/changelog
@@ -12,8 +12,9 @@ libreoffice (1:3.5.0~rc3-1) UNRELEASED; urgency=low
- give gb_FULLDEPS= to actual make check call, not debian/rules
check
- simplify -dbg/--enable-symbols conditionals
+ - build with default boost again but add build-dep on g++-4.6 (>= 4.6.2-12)
- -- Rene Engelhard <r...@debian.org> Wed, 01 Feb 2012 19:17:30 +0000
+ -- Rene Engelhard <r...@debian.org> Fri, 03 Feb 2012 00:22:33 +0100
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
diff --git a/control b/control
index 49c9d9c..7bc66a4 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: 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-cpp-dev, libgraphite2-dev (>= 0.9.3) [!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), junit4 (>= 4.8.2-2), op
enjdk-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, libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd
-i386], libformula-java (>= 1.1.7) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9),
javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>=
1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost1.46-dev, 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.5), libmysqlclient-dev, libmysqlcppconn-dev (>=
1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev
[!armel !powerpc !power
pcspe !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-cpp-dev, libgraphite2-dev (>= 0.9.3) [!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), junit4 (>= 4.8.2-2), op
enjdk-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, libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd
-i386], libformula-java (>= 1.1.7) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9),
javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, 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.5), libmysqlclient-dev, libmysqlcppconn-dev (>=
1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev
[!armel !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-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], 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 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),
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 91cc31a..da4e092 100755
--- a/rules
+++ b/rules
@@ -135,7 +135,7 @@ LIBHYPHEN_MINVER= (>= 2.4)
USE_AGG=n
# SYSTEM_STUFF += agg
SYSTEM_STUFF += boost
-BOOST_VERSION=1.46
+BOOST_VERSION=default
ifeq "$(BOOST_VERSION)" "default"
BOOST_MINVER= (>= 1.38)
endif
@@ -898,6 +898,9 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
else
BUILD_DEPS += , libboost-dev
endif
+ ifeq "$(SYSTEM_GCC_VERSION)" "4.6"
+ BUILD_DEPS += , g++-4.6 (>= 4.6.2-12)
+ endif
else
ifneq "$(BOOST_VERSION)" "default"
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER)
--
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/e1rtcsp-0004s0...@vasks.debian.org
