[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc1-1-261-g949237b
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 949237b7c9b452c85a2a16f565c3fc7b5a185e4e
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 27 11:06:16 2013 +0100
breaks should do (thanks Rico)
see http://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces
diff --git a/changelog b/changelog
index b629eab..a9f700e 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +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
+ * make -common break old -emailmerge (LP: #1160533)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 27 Mar 2013 00:59:50 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 27 Mar 2013 11:05:40 +0100
libreoffice (1:4.0.2~rc2-1) UNRELEASED; urgency=low
diff --git a/control.in b/control.in
index 223035f..1f3c6fe 100644
--- a/control.in
+++ b/control.in
@@ -274,10 +274,11 @@ 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, libreoffice-emailmerge (<< 1:4.0.2~rc2)
+Conflicts: broffice, libreoffice-common (<< 1:3.5.0), libreoffice-l10n-3.5, libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
+ libreoffice-emailmerge (<< 1:4.0.2~rc2),
libreoffice-style-andromeda (<< 1:${oover}~),
libreoffice-style-crystal (<< 1:${oover}~),
libreoffice-style-crystal (>= 1:${next-oover}~),
@@ -292,7 +293,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~),
libreoffice-pdfimport (<< 1.0.6),
- libreoffice-presenter-console (<< 1.1.1)
+ libreoffice-presenter-console (<< 1.1.1),
libreoffice-wiki-publisher (<< 1.1.2),
libreoffice-report-builder (<< 1.2.3),
libreoffice-presentation-minimizer (<< 1.0.4),
--
LibreOffice packaging repository
Reply to: