[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-255-g2a632dd
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 6dcab12e5d3086ef9c45c13346e10a53622e0c97
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Mar 15 08:16:45 2013 +0100
wrap-n-sort Debian for merge
diff --git a/control.in b/control.in
index 059998c..2121499 100644
--- a/control.in
+++ b/control.in
@@ -67,7 +67,8 @@ Homepage: http://www.libreoffice.org
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,
@@ -77,7 +78,6 @@ Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-writer,
ttf-dejavu,
- fonts-sil-gentium-basic,
${java-common-depends},
${misc:Depends},
${pyuno-depends}
@@ -88,8 +88,8 @@ Suggests: cups-bsd,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
- libreoffice-grammarcheck,
libreoffice-gnome,
+ libreoffice-grammarcheck,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version},
libsane,
@@ -215,26 +215,26 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
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),
@@ -297,9 +297,7 @@ Description: office productivity suite -- arch-dependent files
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,
@@ -322,7 +320,8 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~)
-Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.1~rc2)
+Replaces: libreoffice-emailmerge (<< 1:4.0.1~rc2),
+ openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -346,9 +345,7 @@ Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-math,
- ${java-common-depends},
- ${java-runtime-depends}
+Recommends: libreoffice-math, ${java-common-depends}, ${java-runtime-depends}
Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-base, libreoffice-gcj
Description: office productivity suite -- word processor
diff --git a/control.mozilla.in b/control.mozilla.in
index 394a124..2028893 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -7,9 +7,7 @@ Enhances: firefox,
libreoffice,
libreoffice-core,
mozilla-browser
-Depends: libreoffice-core (>= 1:3.5.0~beta~),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: libreoffice-core (>= 1:3.5.0~beta~), ${misc:Depends}, ${shlibs:Depends}
Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
libreoffice-base,
libreoffice-calc,
diff --git a/control.postgresql.in b/control.postgresql.in
index 7fe2266..724ee26 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -1,9 +1,7 @@
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: libreoffice-core (>= 1:3.5.0~beta),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends}
Suggests: postgresql (>= 8.4)
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Description: PostgreSQL SDBC driver for LibreOffice
diff --git a/control.reportdesign.in b/control.reportdesign.in
index d367fd0..3d09f46 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -27,10 +27,7 @@ Homepage: http://extensions.services.openoffice.org/project/reportdesign
Package: libreoffice-report-builder-bin
Section: misc
Architecture: %OOO_REPORTDESIGN_ARCHS%
-Depends: libreoffice-core,
- libreoffice-base,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice extension for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index c02c270..c4dbbae 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -20,8 +20,7 @@ Package: libreoffice-dev-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: libreoffice-dev (= ${binary:Version}),
- www-browser
+Recommends: libreoffice-dev (= ${binary:Version}), www-browser
Suggests: libreoffice-dtd-officedocument1.0
Conflicts: openoffice.org-dev-doc
Description: office productivity suite -- SDK documentation
--
LibreOffice packaging repository
Reply to: