The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 103f30f9506b6732c6541f99e362b07f0c69c516
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Jun 23 01:53:29 2011 +0200
updating control file
diff --git a/control b/control
index 0618cca..90e8d98 100644
--- a/control
+++ b/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-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, libpq-dev, po-debconf, bc, wget | curl, g++ (>>
4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev
[!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev
(>= 0.8.0), libgraphite-dev, 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
po
werpc 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), 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, xulrunner-dev | firefox-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 ia64 kf
reebsd-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, 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), libxrandr-dev,
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, 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, libpq-dev, 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), libgraphite-dev, 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 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),
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, xulrunner-dev | firefox-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 ia64
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, 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,
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, 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~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (=
6.0), base-files (= 6.0squeeze1), 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], 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
mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips
mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
libmdds-dev (>= 0.4.0), base-files (= 6.0), base-files (= 6.0squeeze1),
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
@@ -94,6 +94,7 @@ Depends: libreoffice-common (>> ${base-version}),
ttf-opensymbol (>= 1:3.0), ${s
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<<
${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}), libreoffice-base (<<
${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome
(<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<<
${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (=
3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1)
Provides: libreoffice-bundled
+Replaces: libreoffice-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -144,6 +145,7 @@ Package: libreoffice-writer
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel], ${shlibs:Depends}, ${misc:Depends}
Recommends: libreoffice-emailmerge, libreoffice-math
+Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-gcj, ${java-runtime-depends}, ${java-common-depends},
${ooo-binfilter-dep}, libreoffice-base
Description: office productivity suite -- word processor
LibreOffice is a full-featured office productivity suite that provides
@@ -535,6 +537,7 @@ Description: LibreOffice UNO runtime environment -- debug
symbols
Package: libreoffice-gcj
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x
sparc kfreebsd-amd64 kfreebsd-i386
+Section: java
Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}),
libreoffice-java-common (= ${source:Version}), ${java-gcj-depends},
${misc:Depends}
Enhances: libreoffice-writer, libreoffice-base
Description: office productivity suite -- Java libraries for GIJ
@@ -834,30 +837,31 @@ Description: office productivity suite -- KDE integration
* konqueror / kmail
* libreoffice-kab: KDE Addressbook support
-Package: libreoffice-sdbc-postgresql
+Package: libreoffice-mysql-connector
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+Suggests: mysql-server (>= 5.1)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Suggests: postgresql
-Description: LibreOffice extension for PostgreSQL SDBC driver
+Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
+Description: MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- The PostgreSQL SDBC Driver allows to use the PostgreSQL database from
+ The MySQL Connector extension allows one to use the MySQL database from
LibreOffice without any wrapper layer such as ODBC or JDBC.
-Homepage: http://dba.openoffice.org/drivers/postgresql/
Package: libreoffice-evolution
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
-Suggests: mysql-server (>= 5.1)
+Section: gnome
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
+Recommends: evolution
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
-Description: MySQL Connector extension for LibreOffice
+Replaces: libreoffice-common (<< 1:3.3.3-2~)
+Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- The MySQL Connector extension allows to use the MySQL database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
+ This package allows LibreOffice to access Evolution address books.
+ You need to install evolution separately.
--
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/e1qzhps-0001di...@vasks.debian.org
