[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta2-2-40-g5372d55
The following commit has been merged in the debian-experimental-4.1 branch:
commit 5372d5540d3e366a3f685267a41769fb30a08c74
Merge: bdca61f0dbf3002b04270adaceb31972f896b1fe d522eed383102567f550c523c36aa1060c712142
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 18 15:04:50 2013 +0200
Merge branch 'master' into debian-experimental-4.1
diff --combined control
index f90f664,cf4654f..cea8b12
--- a/control
+++ b/control
@@@ -8,11 -8,11 +8,11 @@@ Build-Depends: ant (>= 1.7.0)
autoconf,
automake,
bc,
+ binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- dmake (>= 1:4.11),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
@@@ -34,7 -34,6 +34,7 @@@
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
@@@ -54,7 -53,6 +54,7 @@@
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
@@@ -65,17 -63,15 +65,17 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.6.0),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
+ libmwaw-dev,
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
- liborcus-dev,
+ liborcus-dev (>= 0.5.0),
libpng12-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.8.0),
@@@ -147,7 -143,6 +147,6 @@@ Build-Conflicts: ant (= 1.8.0-1) [hppa
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
- g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
@@@ -159,7 -154,6 +158,7 @@@
libc6-dev (= 2.6.1-3) [i386 amd64],
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
+ libmariadbclient-dev,
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
@@@ -181,6 -175,7 +180,6 @@@ Depends: fonts-sil-gentium-basic
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
- libreoffice-filter-mobiledev,
libreoffice-impress,
libreoffice-math,
libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
@@@ -221,6 -216,7 +220,6 @@@ Description: office productivity suite
* libreoffice-draw: Drawing
* libreoffice-base: Database
* libreoffice-math: Equation editor
- * libreoffice-filter-mobiledev: Mobile Devices filters
.
You can extend the functionality of LibreOffice by installing these
packages:
@@@ -412,10 -408,7 +411,10 @@@ Suggests: libreoffice-style-crystal
libreoffice-style-oxygen,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
+Conflicts: broffice,
+ libreoffice-filter-mobiledev,
+ vlibreoffice-l10n-3.5,
+ vlibreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -764,6 -757,23 +763,6 @@@ Description: office productivity suite
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreoffice-filter-mobiledev
-Section: misc
-Architecture: all
-Depends: ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
- ${misc:Depends}
-Breaks: libreoffice-core (<< 1:3.5~)
-Description: office productivity suite -- mobile devices filters
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the filters for Mobile Devices:
- * AportisDoc (Palm)
- * PocketWord
- * PocketExcel
-
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
@@@ -4080,7 -4090,7 +4079,7 @@@ Depends: uno-libs3 (= ${ure:Version}),
Suggests: java5-runtime
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12)
-Breaks: openoffice.org-core (<< 1:3.3~)
+Breaks: libreoffice-core (<< 1:4.1.0~alpha), openoffice.org-core (<< 1:3.3~)
Description: LibreOffice UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
@@@ -4206,26 -4216,27 +4205,26 @@@ Conflicts: libreoffice-common (<< 1:3.5
ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
Enhances: libreoffice-base
-Description: LibreOffice extension for building database reports
+Description: LibreOffice component for building database reports
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the report builder extension:
+ This package contains the report builder:
"Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
Package: libreoffice-report-builder-bin
Section: misc
Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Description: LibreOffice extension for building database reports -- libraries
+Description: LibreOffice component for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains some architecture-dependent support libraries
- (librpt*.so) for the report builder extension.
+ (librpt*.so) for the report builder component.
Package: libreoffice-presentation-minimizer
Section: misc
@@@ -4328,9 -4339,9 +4327,9 @@@ Depends: libreoffice-core (= ${binary:V
${idlc-cpp-depends},
${misc:Depends},
${shlibs:Depends}
-Recommends: dmake, g++, ${java-common-depends}, ${java-runtime-depends}
-Suggests: c-shell, libmythes-dev, libreoffice-dev-doc
-Replaces: libreoffice-core (<< 1:4.0.0~rc2)
+Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
+Suggests: libmythes-dev, libreoffice-dev-doc
+Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -4402,12 -4413,12 +4401,12 @@@ Conflicts: libreoffice-common (<< 1:3.5
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
-Description: MySQL Connector extension for LibreOffice
+Description: MariaDB/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 MySQL Connector extension allows one to use the MySQL database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
+ The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
+ database from LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
@@@ -4437,12 -4448,12 +4436,12 @@@ Depends: ant (>= 1.7.0)
autoconf,
automake,
bc,
+ binutils (>= 2.23),
bison,
bsh (>= 2.0b4),
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- dmake (>= 1:4.11),
doxygen,
dpkg-dev (>= 1.16.1),
fastjar,
@@@ -4466,7 -4477,6 +4465,7 @@@
libboost1.53-dev,
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcommons-codec-java,
libcommons-httpclient-java,
@@@ -4493,7 -4503,6 +4492,7 @@@
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
@@@ -4506,17 -4515,15 +4505,17 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.6.0),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
+ libmwaw-dev,
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
- liborcus-dev,
+ liborcus-dev (>= 0.5.0),
libpentaho-reporting-flow-engine-java (>= 0.9.4),
libpng12-dev,
libpoppler-cpp-dev,
diff --combined control.in
index b57702e,fd7e312..f05b379
--- a/control.in
+++ b/control.in
@@@ -3,13 -3,12 +3,12 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: %BUILD_DEPS%
+Build-Depends: %BUILD_DEPS%,
Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
Build-Conflicts: 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%],
flex (= 2.5.34-1) [amd64],
- g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
@@@ -36,16 -35,17 +35,16 @@@ Homepage: http://www.libreoffice.or
Package: libreoffice
Architecture: %OOO_ARCHS%
Section: metapackages
-Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
+Depends: fonts-sil-gentium-basic,
+ libreoffice-base%OOO_NO_BASE_ARCHS%,
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
- libreoffice-filter-mobiledev,
libreoffice-impress,
libreoffice-math,
libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-writer,
${dejavu-depends},
- fonts-sil-gentium-basic,
${java-common-depends},
${misc:Depends},
${pyuno-depends}
@@@ -81,6 -81,7 +80,6 @@@ Description: office productivity suite
* libreoffice-draw: Drawing
* libreoffice-base: Database
* libreoffice-math: Equation editor
- * libreoffice-filter-mobiledev: Mobile Devices filters
.
You can extend the functionality of LibreOffice by installing these
packages:
@@@ -182,26 -183,26 +181,26 @@@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev3
hunspell-vi (<< 1:3.1.0-3),
libcairo2 (= 1.4.8-1),
libicu38 (= 3.8~d01-1),
- libreoffice-common (<< 1:3.6.1~rc1),
- libreoffice-evolution (<< 1:3.4.1~),
- libreoffice-kab (<< 1:3.4.1~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-base (<< ${binary:Version}),
libreoffice-calc (<< ${binary:Version}),
+ libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-dev (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}),
+ libreoffice-evolution (<< 1:3.4.1~),
libreoffice-gnome (<< ${binary:Version}),
libreoffice-gtk (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
+ libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
+ libreoffice-sdbc-postgresql (<< 0.8.1~),
+ libreoffice-style-andromeda (<< 1:3.3.0-1),
+ libreoffice-style-crystal (<< 1:3.3.0-1),
+ libreoffice-style-galaxy (<< 1:3.3.0-1),
+ libreoffice-style-hicontrast (<< 1:3.3.0-1),
+ libreoffice-style-oxygen (<< 1:3.3.0-1),
+ libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
@@@ -264,16 -265,15 +263,16 @@@ Description: office productivity suite
Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: libreoffice-style-default | libreoffice-style,
- ure,
- ${misc:Depends}
+Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
Suggests: libreoffice-style-crystal,
libreoffice-style-hicontrast,
libreoffice-style-oxygen,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
+Conflicts: broffice,
+ libreoffice-filter-mobiledev,
+ vlibreoffice-l10n-3.5,
+ vlibreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -622,6 -622,23 +621,6 @@@ Description: office productivity suite
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreoffice-filter-mobiledev
-Section: misc
-Architecture: all
-Depends: ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
- ${misc:Depends}
-Breaks: libreoffice-core (<< 1:3.5~)
-Description: office productivity suite -- mobile devices filters
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the filters for Mobile Devices:
- * AportisDoc (Palm)
- * PocketWord
- * PocketExcel
-
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
--
LibreOffice packaging repository
Reply to: