[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 4ee637bdee580b7bcdc1961e3def7b17e8a4cdd9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 6 17:48:26 2013 +0100
libreoffice-core already conflicts with -evolution, so no need to break in addition
diff --git a/changelog b/changelog
index d39c92d..84460c8 100644
--- a/changelog
+++ b/changelog
@@ -63,13 +63,15 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
- promote Breaks to Conflicts from langpacks against en-US
- remove Breaks against -style-industrial which is long gone
* misc:depends for presenter-console
+ * libreoffice-core already conflicts with -evolution, so no need to break in
+ addition
[ Rico Tzschichholz ]
* disable two more flaky tests for now:
- fdo#35663
- fdo#61896
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 18:16:35 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 18:18:56 +0100
libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
diff --git a/control.in b/control.in
index c734917..b5c6fa8 100644
--- a/control.in
+++ b/control.in
@@ -239,7 +239,6 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-uz (<< 0.6-3.1),
hunspell-vi (<< 1:3.1.0-3),
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~),
mozilla-libreoffice (<< 1:3.5.0~beta~),
--
LibreOffice packaging repository
Reply to: