The following commit has been merged in the debian-experimental-3.7 branch:
commit f95c5ef765ef10e6d1bca8283abb57e1c231824c
Merge: 22f694226faa2c51971e98b4549939e5d04510c3
b3266da90a00d140fc5e8dad094754575e7a9099
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 14 10:33:26 2012 +0200
Merge remote-tracking branch 'origin/debian-experimental-3.6' into
debian-experimental-3.7
diff --combined changelog
index c9ccef4,bf4f6c1..995bb6d
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,21 +1,27 @@@
+libreoffice (1:3.7.0~git201207202-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ -- Rene Engelhard <r...@rene-engelhard.de> Fri, 20 Jul 2012 11:16:51 +0200
+
- libreoffice (1:3.6.0~rc4-1) UNRELEASED; urgency=low
+ libreoffice (1:3.6.0-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * new upstream release candidate
+ * new upstream release
- fixes splashscreen location in multi-monitor setups
(closes: #657444, #431473)
- caches fontconfig font substitutions (closes: #631308)
* debian/patches/build-dont-run-checks.diff: as name says
+ * debian/patches/dont-let-autoextension-interfere-with-kfiledialog.diff:
+ backport upstream fix from libreoffice-3-6 to fix dot handling in
+ KDE File Picker (closes: #645946)
* debian/rules:
- new conditionals for: doxygen, libcdr, liblcms2
- remove liblucene2-java stuff; now clucene is used
- build-depend on libxml2-utils, xmllint now needed
- build-depend on liboost-date-time-date, we now link to boost...
- - disable binfilter for now (checkdll segfaults...)
- build-depend against libpng-dev instead of libpng12-dev
(closes: #662411)
- remove squeeze-backports stuff, add wheezy-backports
@@@ -35,13 -31,25 +37,25 @@@
add the new --disable-extensions and --disable-database-connectivity to
their respective places
- split build into build-{arch,indep}
+ - use generic python3.pc instead of pythonX.Y(mu).pc
* debian/uno-libs3.symbols: update
[Björn Michaelsen]
- * force disable HAVE_CXX0X for ABI incompatibilty
+ * backport patch to evade fdo#51324 (LP: #1017125)
-- Rene Engelhard <r...@debian.org> Thu, 03 May 2012 13:44:05 +0200
+ libreoffice (1:3.5.4-8) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix python3-dev builddep to >= 3.2; 3.1 had a different naming of
+ the .pc (without "mu")
+ * debian/libreoffice-common.links.in:
+ - s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
+ (closes: #683784)
+
+ -- Rene Engelhard <r...@debian.org> Mon, 13 Aug 2012 22:23:49 +0200
+
libreoffice (1:3.5.4-7) unstable; urgency=high
* debian/patches/CVE-2012-2665*.diff: fix CVE-2012-2665
diff --combined control
index 0f751fa,d57015f..93e1ed2
--- a/control
+++ b/control
@@@ -3,9 -3,9 +3,9 @@@ Section: editor
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.4 [mips mipsel], g++-4.4 [mips
mipsel], 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, libxml2-utils,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng-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), default-jdk, default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686 [i386 amd64],
javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), 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), libboost-date-time-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), libvisio-dev,
libcdr-dev, libcmis-dev (>= 0.2.1), liblcms2-dev, libldap2-dev,
libtelepathy-glib-dev (>= 0.18), libicu-dev (>= 4.0), libcairo2-dev,
kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev
(>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), 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)
-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.4 [mips mipsel], g++-4.4 [mips
mipsel], 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, libxml2-utils,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>=
2.6), python3-dev (>= 3.2), debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12),
gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686
[i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), 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),
libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev,
libclucene-dev (>= 2.3.3.4), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2),
libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev,
libcmis-dev (>= 0.2.1), liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev,
kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0
-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~),
libxrandr-dev, libhsqldb-java (>> 1.8.0.10), 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: 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.4 [mips mipsel], g++-4.4 [mips
mipsel], 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, libxml2-utils,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng-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), default-jdk, default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686 [i386 amd64],
javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), 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), libboost-date-time-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libclucene-dev (>= 2.3.3.4),
libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0),
libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev (>= 0.2.1),
liblcms2-dev, libldap2-dev, libtelepathy-glib-dev (>= 0.18), libicu-dev (>=
4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8),
libmysqlclient-dev, libmysql
cppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~),
libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>>
1.8.0.10), 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)
Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64
!kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64
!kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh
(>= 2.0
b4), 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 (= 7.0), libhsqldb-java (>= 1.8.1~)
+ 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], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), libhsqldb-java (>=
1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -18,7 -18,7 +18,7 @@@ Architecture: alpha amd64 armel armhf h
Section: metapackages
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64
!kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
-Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck,
libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
+Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck,
libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -60,6 -60,8 +60,6 @@@
* gstreamer0.10-plugins-*: GStreamer plugins for use with LibreOffices
media backend
* libpaper-utils: papersize detection support via paperconf
- * libldap-2.4-2: LDAP client library; needed for LibreOffice getting its
- profiles from LDAP
* libreoffice-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
Package: libreoffice-l10n-za
@@@ -3374,3 -3376,20 +3374,20 @@@ Description: office productivity suite
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
+ Package: libreoffice-filter-binfilter
+ Section: misc
+ Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x
sparc kfreebsd-amd64 kfreebsd-i386
+ Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>=
1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
+ Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+ Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "binfilters", legacy filters for
+ - the old StarOffice 5.2 formats
+ - StarWriter 1.0/2.0
+ - StarWriter/DOS
+ - *Writer* filters for
+ + Excel
+ + Lotus
+
diff --combined control.in
index e4fce63,f07c111..ccb8aad
--- a/control.in
+++ b/control.in
@@@ -39,7 -39,7 +39,7 @@@ Build-Depends: dpkg-dev (>= 1.16.1)
wget | curl
%BUILD_DEPS%
Build-Depends-Indep: fdupes, xml-core, imagemagick %BUILD_DEPS_INDEP%
- 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)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3)
[%OOO_GCJ_JDK_ARCHS%], 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]
+ 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)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3)
[%OOO_GCJ_JDK_ARCHS%], 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], g++-4.7 (<< 4.7.1-3)
Standards-Version: 3.9.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -84,6 -84,7 +84,6 @@@ Suggests: hunspell-dictionary
pstoedit,
imagemagick | graphicsmagick-imagemagick-compat,
${gstreamer-plugins-suggests},
- ${libldap-suggests},
${ooo-binfilter-dep},
${ooo-officebean-dep}
Description: office productivity suite
diff --combined rules
index 138ec98,bef87f5..68480e4
--- a/rules
+++ b/rules
@@@ -121,7 -121,7 +121,7 @@@ ifeq "$(ENABLE_PYTHON3)" "y
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
- BUILD_BINFILTERS=n
+ BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_HELP=y
ENABLE_JAVA=y
@@@ -157,7 -157,6 +157,7 @@@ ICU_MINVER= (>= 4.0
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
+#SYSTEM_STUFF += libmspub
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -196,7 -195,6 +196,7 @@@ USE_SHARED_LPSOLVE=
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
USE_DBUS=y
USE_GSTREAMER=y
+GSTREAMER_VERSION=0.10
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@@ -303,16 -301,13 +303,15 @@@ SYSTEM_STUFF += d
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661703
- #SYSTEM_STUFF += clucene
+ SYSTEM_STUFF += clucene
SYSTEM_STUFF += lcms2
+SYSTEM_STUFF += openldap
PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
endif
FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ENABLE_TELEPATHY=y
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -496,7 -491,7 +495,7 @@@ endi
# Debian Squeeze
ifeq "$(WHEEZY_BACKPORT)" "y"
BUGS=mailto:debian-backpo...@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub,
$(SYSTEM_STUFF))
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -937,7 -932,7 +936,7 @@@ ifneq (,$(filter vigra, $(SYSTEM_STUFF)
endif
ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libclucene-dev
+ BUILD_DEPS += , libclucene-dev (>= 2.3.3.4)
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
@@@ -962,9 -957,6 +961,9 @@@
ifneq (,$(filter libcdr, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcdr-dev
endif
+ ifneq (,$(filter libmspub, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmspub-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= 0.2.1)
endif
@@@ -975,14 -967,6 +974,14 @@@ ifneq (,$(filter lcms2, $(SYSTEM_STUFF)
BUILD_DEPS += , liblcms2-dev
endif
+ifneq (,$(filter openldap, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libldap2-dev
+endif
+
+ifeq ($(ENABLE_TELEPATHY),y)
+ BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18)
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
@@@ -1129,15 -1113,11 +1128,15 @@@ ifeq "$(USE_DBUS)" "y
endif
ifeq "$(USE_GSTREAMER)" "y"
- BUILD_DEPS += , libgstreamer-plugins-base0.10-dev
- GSTREAMER_PLUGINS_SUGGESTS += , gstreamer0.10-plugins-base,
gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly,
gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
- DBG_DBG_SUGGESTS+= , libgstreamer0.10-0-dbg
+ ifeq "$(GSTREAMER_VERSION)" "1.0"
+ BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
+ CONFIGURE_FLAGS += --enable-gstreamer
+ endif
+ BUILD_DEPS += , libgstreamer-plugins-base$(GSTREAMER_VERSION)-dev
+ GSTREAMER_PLUGINS_SUGGESTS += ,
gstreamer$(GSTREAMER_VERSION)-plugins-base,
gstreamer$(GSTREAMER_VERSION)-plugins-good,
gstreamer$(GSTREAMER_VERSION)-plugins-ugly,
gstreamer$(GSTREAMER_VERSION)-plugins-bad, gstreamer$(GSTREAMER_VERSION)-ffmpeg
+ DBG_DBG_SUGGESTS+= , libgstreamer$(GSTREAMER_VERSION)-0-dbg
else
- CONFIGURE_FLAGS += --disable-gstreamer
+ CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
@@@ -1217,6 -1197,16 +1216,6 @@@ endi
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
-ifeq "$(ENABLE_LDAP)" "y"
- ifeq "$(USE_OPENLDAP)" "y"
- BUILD_DEPS += , libldap2-dev
- LDAP_LIB := $(shell echo libldap-`grep LDAP_VENDOR_VERSION_M
/usr/include/ldap_features.h | cut -d: -f2 | awk '{ print $$3 }' | xargs | sed
-e "s/ /\./"`-`grep LDAP_VENDOR_VERSION_MAJOR /usr/include/ldap_features.h |
cut -d: -f2 | awk '{ print $$3 }'`)
- CONFIGURE_FLAGS += --with-openldap
- endif
-else
- CONFIGURE_FLAGS += --disable-ldap
-endif
-
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
@@@ -1255,6 -1245,7 +1254,7 @@@ clean
fi
find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
rm -rf */*.pro.obsolete
+ rm -f solenv/bin/concat-deps
rm -rf $(SOURCE_TREE)/file-lists
rm -rf $(SOURCE_TREE)/pyuno-py3
@@@ -1305,6 -1296,16 +1305,6 @@@ debian/control: $(wildcard debian/contr
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
-ifeq "$(ENABLE_LDAP)" "y"
- # build-depends might not be satified when running debian/rules
control. prevent bad subsitition with
- # nothing (libldap--)
- if [ ! -f /usr/include/ldap_features.h ]; then \
- echo "/usr/include/ldap_features.h not found. Is libldap2-dev
installed?"; \
- echo 'Needed for properly setting $$(LDAP_LIB). Stopping,'; \
- exit 1; \
- fi
-endif
-
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print
ucfirst(<STDIN>);'`; \
LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
@@@ -1523,6 -1524,10 +1523,6 @@@ ifeq "$(BUILD_KDE)" "y
perl -pi -e 's/GConf backend$$/GConf backend\n *
libreoffice$(VER)-kde: KDE UI Plugin and KDE File Picker support/'
debian/control
endif
-ifeq "$(ENABLE_LDAP)" "y"
- perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client
library; needed for LibreOffice getting its\n profiles from LDAP/'
debian/control
-endif
-
ifneq "$(DICT_DIR)" "/usr/share/hunspell"
perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
endif
@@@ -1597,7 -1602,7 +1597,7 @@@ ifeq "$(BUILD_PYUNO)" "y
. $(SOURCE_TREE)/config_host.mk.source; \
cd pyuno-py3 && \
rm -rf $$OUTPATH$$PROEXT; \
- PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags
python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs
python-$(PY3MAJOR).$(PY3MINOR)mu) ../solenv/bin/build.pl
+ PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags
python$(PY3MAJOR)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR))
../solenv/bin/build.pl
endif
endif
@@@ -2905,6 -2910,7 +2905,6 @@@ endi
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
- -V'libldap-suggests=$(LDAP_LIB)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "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/e1t1pf0-0003qp...@vasks.debian.org
