[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-246-g9ff9f34



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 7c1a1796b84ce1557516013a23167f9ed169991e
Author: Benjamin Drung <bdrung@debian.org>
Date:   Mon Apr 8 12:42:51 2013 +0200

    remove -common self-conflict

diff --git a/control.in b/control.in
index 5594d9c..ef0ae97 100644
--- a/control.in
+++ b/control.in
@@ -272,7 +272,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-l10n-3.5, libreoffice-l10n-3.6
 Provides: libreoffice-l10n-en-us
 Breaks: libreoffice-core (<< 1:${oover}~),
         libreoffice-core (>= 1:${next-oover}~),

-- 
LibreOffice packaging repository


Reply to: