The following commit has been merged in the master branch:
commit 4bf0323053b4e21778f4244d111316760db008fb
Author: Rene Engelhard <r...@debian.org>
Date: Wed Apr 4 09:26:20 2012 +0200
(temporarily?) build with libneon-dev (openssl) to work around #667043
diff --git a/changelog b/changelog
index 8c1e9af..5540c4c 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
* debian/rules:
- enable Base stuff on s390x again, libebook1.2-dev available now
+ - (temporarily?) build with libneon-dev (openssl) to work around #667043
* debian/uno-libs3.lintian-overrides:
- override shlibs-declares-dependency-on-other-package and
symbols-declares-dependency-on-other-package
@@ -16,9 +17,10 @@ libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
libreoffice-common (<< 1:3.5~) to (hopefully) help unopkg be working
when called on upgrades 3.4 -> 3.5 (closes: #666523)
* debian/control{,.lang}.in:
- - suggest libreoffice-grammarcheck{,-@LCODE@} (e.g. provided by
lightproof)
+ - suggest libreoffice-grammarcheck{,-@LCODE@} (e.g. provided by
+ lightproof)
- -- Rene Engelhard <r...@debian.org> Tue, 03 Apr 2012 14:44:22 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 04 Apr 2012 09:25:32 +0200
libreoffice (1:3.5.2~rc2-1) unstable; urgency=low
diff --git a/control b/control
index cd3310e..06d0137 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, gcc-4.7 [hppa kfreebsd-i386
kfreebsd-amd64], g++-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], 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), 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 !kfreeb
sd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4)
[!armel !armhf !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.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, gcc-4.7 [hppa kfreebsd-i386
kfreebsd-amd64], g++-4.7 [hppa kfreebsd-i386 kfreebsd-amd64], 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), 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 !kfreeb
sd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4)
[!armel !armhf !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.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-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], 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), 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 faf1810..c415216 100755
--- a/rules
+++ b/rules
@@ -184,7 +184,7 @@ LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
USE_DBUS=y
USE_GSTREAMER=y
SYSTEM_STUFF += neon
-NEON_SECTYPE=gnutls
+NEON_SECTYPE=openssl
NEONSONR=27
SYSTEM_STUFF += redland
PACKAGE_SDK=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/e1sflue-0004zr...@vasks.debian.org
