[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-14-gd41967a

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit 185f025fe566a631fe5275ebf1064075d8675d4c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Mar 5 23:42:44 2013 +0100

    silent some lintian noise for unversioned breaks:
    
    - promote Breaks to Conflicts against -binfilter as it will never return
    - remove Breaks against -style-industrial which is long gone
    
    Conflicts:
    	changelog

diff --git a/changelog b/changelog
index e724588..109aec6 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,11 @@ libreoffice (1:4.0.1~rc2-1) UNRELEASED; urgency=low
 
   * new upstream release candidate 
 
+  * merge From Ubuntu:
+    - silent some lintian noise for unversioned breaks:
+      + promote Breaks to Conflicts against -binfilter as it will never return
+      + remove Breaks against -style-industrial which is long gone
+
   * merge from Ubuntu:
     - add transitional for -presenter-console
 
diff --git a/control.in b/control.in
index 3bd81c0..3cb0743 100644
--- a/control.in
+++ b/control.in
@@ -198,6 +198,7 @@ Conflicts: cacao-oj6-jre,
            cli-uno-bridge (<< 1:3.0.0~dev300m22),
            libcairo2 (= 1.4.8-1),
            libicu38 (= 3.8~d01-1),
+           libreoffice-filter-binfilter,
            libreoffice-style-andromeda (<< 1:3.3.0-1),
            libreoffice-style-crystal (<< 1:3.3.0-1),
            libreoffice-style-galaxy (<< 1:3.3.0-1),
@@ -238,7 +239,6 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
         hunspell-vi (<< 1:3.1.0-3),
         libreoffice-common (<< 1:3.6.1~rc1),
         libreoffice-evolution (<< 1:3.4.1~),
-        libreoffice-filter-binfilter,
         libreoffice-kab (<< 1:3.4.1~),
         libreoffice-sdbc-postgresql (<< 0.8.1~),
         mozilla-libreoffice (<< 1:3.5.0~beta~),
@@ -323,7 +323,6 @@ Breaks: libreofficeVER-core (<< 1:${oover}~),
         libreofficeVER-style-galaxy (>= 1:${next-oover}~),
         libreofficeVER-style-hicontrast (<< 1:${oover}~),
         libreofficeVER-style-hicontrast (>= 1:${next-oover}~),
-        libreofficeVER-style-industrial,
         libreofficeVER-style-oxygen (<< 1:${oover}~),
         libreofficeVER-style-oxygen (>= 1:${next-oover}~),
         libreofficeVER-style-tango (<< 1:${oover}~),

-- 
LibreOffice packaging repository