[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-193-gbd0c67c

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.0 branch:
commit bd0c67c783b592f11a1f082f1073d19e9a382ede
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Dec 18 01:15:52 2012 +0100

    conflict against libreoffice-l10n-3.5 and libreoffice-l10n-3.6

diff --git a/control b/control
index dddd299..c43594f 100644
--- a/control
+++ b/control
@@ -107,7 +107,7 @@ Pre-Depends: dpkg (>= 1.15.7.2~)
 Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
 Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-style-crystal, libreoffice-style-oxygen
 Recommends: xfonts-mathml, python-uno, ${textcat-data-recommends}
-Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<< 1:3.3.0~)
+Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<< 1:3.3.0~), libreoffice-l10n-3.5, libreoffice-l10n-3.6
 Provides: libreoffice-l10n-en-us
 Breaks: libreoffice-style-crystal (<< 1:${oover}~),
  libreoffice-style-oxygen (<< 1:${oover}~),
diff --git a/control.in b/control.in
index 77cf926..cad32bd 100644
--- a/control.in
+++ b/control.in
@@ -206,7 +206,9 @@ Recommends: xfonts-mathml,
  ${textcat-data-recommends}
 Conflicts: libtextcat-data (<< 2.2-8),
  broffice,
- openoffice.org-common (<< 1:3.3.0~)
+ openoffice.org-common (<< 1:3.3.0~),
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
 Provides: libreoffice-l10n-en-us
 Breaks: libreofficeVER-style-crystal (<< 1:${oover}~),
  libreofficeVER-style-oxygen (<< 1:${oover}~),

-- 
LibreOffice packaging repository