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

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit 38dd1d672acbc29b2bfd490425ac1179c38783d6
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Mar 1 23:55:00 2013 +0100

    fix control.in merge and regen control...

diff --git a/control b/control
index 1725197..70ee43b 100644
--- a/control
+++ b/control
@@ -486,9 +486,6 @@ Depends: libreoffice-core (= ${binary:Version}),
          libreoffice-draw (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libreoffice-presenter-console
-Provides: libreoffice-presenter-console
-Replaces: libreoffice-presenter-console
 Suggests: bluez
 Description: office productivity suite -- presentation
  LibreOffice is a full-featured office productivity suite that provides
@@ -3354,6 +3351,14 @@ Description: office productivity suite -- Zulu language package
  install extra dictionaries/hyphenation patterns/thesauri independently of
  the language packs.
 
+Package: libreoffice-presenter-console
+Section: oldlibs
+Architecture: all
+Depends: libreoffice-impress (>= 4.0.0)
+Description: transitional package for LibreOffice presenter's console
+ This package used to contain the LibreOffice presenter console. It has been
+ integrated with LibreOffice Impress 4.0. You can safely remove this package.
+
 Package: libreoffice-help-en-us
 Breaks: libreoffice-help-ca,
         libreoffice-help-ca-xv,
diff --git a/control.in b/control.in
index feeeb54..3bd81c0 100644
--- a/control.in
+++ b/control.in
@@ -380,18 +380,9 @@ Description: office productivity suite -- spreadsheet
 Package: libreofficeVER-impress
 Architecture: %OOO_ARCHS%
 Depends: libreofficeVER-core (= ${binary:Version}),
-<<<<<<< HEAD
          libreofficeVER-draw (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libreofficeVER-presenter-console
-Provides: libreofficeVER-presenter-console
-Replaces: libreofficeVER-presenter-console
-=======
- libreofficeVER-draw (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
->>>>>>> a4a27da... add transitional package for presenter-console
 Description: office productivity suite -- presentation
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

-- 
LibreOffice packaging repository