[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-194-g6c04e8d

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 48bba45cc49d1857aedff3f52a32924297ca37f3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Mar 7 15:17:59 2013 +0100

    tweak -core to conflict against evolution in general, as we dont ship it anymore

diff --git a/control.in b/control.in
index f6bfeeb..296d41e 100644
--- a/control.in
+++ b/control.in
@@ -209,7 +209,7 @@ Conflicts: cacao-oj6-jre,
            libreofficeVER-calc (<< ${binary:Version}),
            libreofficeVER-dev (<< ${binary:Version}),
            libreofficeVER-draw (<< ${binary:Version}),
-           libreofficeVER-evolution (<< ${binary:Version}),
+           libreofficeVER-evolution,
            libreofficeVER-gnome (<< ${binary:Version}),
            libreofficeVER-gtk (<< ${binary:Version}),
            libreofficeVER-impress (<< ${binary:Version}),

-- 
LibreOffice packaging repository