[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-194-g6c04e8d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 6c04e8dec2f3feb52abf4f53a960da47811157b9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 7 16:11:31 2013 +0100
remove delta for mobiledev and gentium
- it makes only sense if we complete the MIR on the metapackage
- use fonts- instead of the transitional ttf- for gentium though
diff --git a/changelog b/changelog
index 3b5a069..a449b93 100644
--- a/changelog
+++ b/changelog
@@ -11,8 +11,6 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
* remaining delta on debian/control:
- drop ${java-common-depends} from Recommends to Suggests on
libreoffice-help-*
- - drop libreoffice-filter-mobiledev and ttf-sil-gentium-basic from Depends
- to Suggests on libreoffice
- add libreoffice-gnome | libreoffice-kde Recommends on libreoffice
- add libreoffice-style-human Suggests to libreoffice-common
- add libreoffice-common self Conflicts with << 3.5.0
@@ -53,6 +51,8 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
- this is so that ./configure doesnt stumble over other checks
(e.g. still needing gnomevfs)
* removed delta:
+ - drop libreoffice-filter-mobiledev and ttf-sil-gentium-basic from Depends
+ to Suggests on libreoffice
- remove libreoffice-core postinst
- fixed gnu make version
- remove hotfixes get-orig-sources hack
diff --git a/control.in b/control.in
index 296d41e..2b4ba97 100644
--- a/control.in
+++ b/control.in
@@ -66,10 +66,12 @@ Homepage: http://www.libreoffice.org
Package: libreofficeVER
Architecture: %OOO_ARCHS%
Section: metapackages
-Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
+Depends: fonts-sil-gentium-basic,
+ libreofficeVER-base%OOO_NO_BASE_ARCHS%,
libreofficeVER-calc,
libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw,
+ libreofficeVER-filter-mobiledev,
libreofficeVER-impress,
libreofficeVER-math,
libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
@@ -82,7 +84,6 @@ Recommends: fonts-liberation | ttf-mscorefonts-installer,
libpaper-utils,
%LO-DESKTOP-INTEGRATION%
Suggests: cups-bsd,
- fonts-sil-gentium-basic,
hunspell-dictionary,
hyphen-hyphenation-patterns,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
--
LibreOffice packaging repository
Reply to: