[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-187-g32b9280
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit defd8346a8fd1c22d1d5a55af05efc3d1d81058e
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 6 16:45:01 2013 +0100
fix merge errors and stay on gcc-4.7 on all archs
diff --git a/control.in b/control.in
index 7c9e580..c734917 100644
--- a/control.in
+++ b/control.in
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: autoconf,
+Build-Depends: %BUILD_DEPS%,
+ autoconf,
automake,
bc,
bison,
@@ -33,18 +34,15 @@ Build-Depends: autoconf,
x11proto-render-dev,
xsltproc,
zip,
- zlib1g-dev,
- %BUILD_DEPS%
-Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
+ zlib1g-dev
+Build-Depends-Indep: %BUILD_DEPS_INDEP%, fdupes, imagemagick, xml-core
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),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@ -80,8 +78,11 @@ Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
${java-common-depends},
${misc:Depends},
${pyuno-depends}
-Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde
+Recommends: fonts-liberation | ttf-mscorefonts-installer,
+ libpaper-utils,
+ libreoffice-gnome | libreoffice-kde
Suggests: cups-bsd,
+ fonts-sil-gentium-basic,
hunspell-dictionary,
hyphen-hyphenation-patterns,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
@@ -98,7 +99,6 @@ Suggests: cups-bsd,
mythes-thesaurus,
openclipart-libreoffice,
pstoedit,
- ttf-sil-gentium-basic,
unixodbc,
${gstreamer-plugins-suggests},
${java-runtime-depends},
@@ -305,8 +305,8 @@ Depends: libreofficeVER-style-default | libreofficeVER-style,
ure,
${misc:Depends}
Suggests: libreofficeVER-style-crystal,
- libreofficeVER-style-human,
libreofficeVER-style-hicontrast,
+ libreofficeVER-style-human,
libreofficeVER-style-oxygen,
libreofficeVER-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
@@ -354,8 +354,7 @@ Depends: libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
libreofficeVER-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreofficeVER-emailmerge,
- libreofficeVER-math,
+Recommends: libreofficeVER-emailmerge, libreofficeVER-math
Replaces: libreofficeVER-core (<< 1:3.3.2-5)
Suggests: libreofficeVER-base,
libreofficeVER-gcj,
@@ -546,7 +545,7 @@ Package: libreofficeVER-style-human
Architecture: all
Depends: ${misc:Depends}
Recommends: libreofficeVER-core
-Suggests: kde-icons-crystal, crystalcursors
+Suggests: crystalcursors, kde-icons-crystal
Provides: libreofficeVER-style, libreofficeVER-style-default
Description: office productivity suite -- Human symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -606,7 +605,7 @@ Description: office productivity suite -- GNOME integration
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the GNOME VFS support, the session installer
- integration and a GConf backend.
+ integration and a GConf backend.
.
You can extend the functionality of this by installing these packages:
.
@@ -658,7 +657,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno, libreofficeVER-common (<< 1:3.5.0)
+Conflicts: libreofficeVER-common (<< 1:3.5.0), python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -789,4 +788,3 @@ Description: PDF Import component for LibreOffice
.
This package contains a component enabling LibreOffice to import PDF
Documents.
-
--
LibreOffice packaging repository
Reply to: