[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit a26e0495f0fe108c0b880477373e3093326e9661
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jan 12 17:58:11 2012 +0100
cherry-pick demotion of java-Recommends for -writer to Suggests and demote lucene and java-common recommends to suggests for help packages again (LP: #916726)
diff --git a/control.help.in b/control.help.in
index a3d3ea1..da71626 100644
--- a/control.help.in
+++ b/control.help.in
@@ -1,7 +1,8 @@
Package: libreofficeVER-help-@LCODE@
Architecture: all
Section: doc
-Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@, ${lucene-depends}, ${java-common-depends}
+Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@
+Suggests: ${lucene-depends}, ${java-common-depends}
Depends: libreofficeVER-writer | language-support-translations-@CCODE@, libreofficeVER-l10n-@LCODE@,
${misc:Depends}
Conflicts: ${lucene-conflicts}
diff --git a/control.in b/control.in
index 40922e9..1a74686 100644
--- a/control.in
+++ b/control.in
@@ -253,9 +253,11 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
${shlibs:Depends},
${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math
+Recommends: libreofficeVER-emailmerge, libreofficeVER-math
Replaces: libreofficeVER-core (<< 1:3.3.2-5)
Suggests: libreofficeVER-gcj,
+ ${ooo-binfilter-dep},
+ ${java-runtime-depends}, ${java-common-depends},
libreofficeVER-base
Description: office productivity suite -- word processor
LibreOffice is a full-featured office productivity suite that provides
--
LibreOffice packaging repository
Reply to: