[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc1-1-259-gc6ddb3f
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit c6ddb3fdcb64fc8aee9fd212d6ecdea506a02736
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 27 01:01:45 2013 +0100
fdo#62725: make -common conflict against old -emailmerge
see e.g. also https://lists.launchpad.net/libreoffice/msg00048.html
diff --git a/changelog b/changelog
index 2d65e30..b629eab 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa1) raring; urgency=low
* merge from Debian
* limit jobs for subsequent checks to 1 and reenable heisenbugged tests
+ * make -common conflict against the old -emailmerge
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 26 Mar 2013 18:08:13 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 27 Mar 2013 00:59:50 +0100
libreoffice (1:4.0.2~rc2-1) UNRELEASED; urgency=low
diff --git a/control.in b/control.in
index 0b66ada..223035f 100644
--- a/control.in
+++ b/control.in
@@ -274,7 +274,7 @@ Suggests: libreoffice-style-crystal,
libreoffice-style-oxygen,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice, libreoffice-common (<< 1:3.5.0), libreoffice-l10n-3.5, libreoffice-l10n-3.6
+Conflicts: broffice, libreoffice-common (<< 1:3.5.0), libreoffice-l10n-3.5, libreoffice-l10n-3.6, libreoffice-emailmerge (<< 1:4.0.2~rc2)
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
--
LibreOffice packaging repository
Reply to: