[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-5-2-g40fe840

[Rene Engelhard]

The following commit has been merged in the master branch:
commit 40fe840a256a0c8499069a6bf40e489e1cda3eab
Author: Rene Engelhard <r...@debian.org>
Date:   Sun Jul 1 22:14:45 2012 +0200

    make -filter-mobiledev Break libreoffice-core (<< 1:3.5~) (closes: #633929)

diff --git a/changelog b/changelog
index 1017754..d227920 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.5.4-6) UNRELEASED; urgency=low
   * debian/templates/soffice-template.desktop.in: fix Icon= (remove
     obsolete 3), thanks Miros◈aw Zalewski (closes: #678313)
 
+  * debian/control.in: make -filter-mobiledev Break libreoffice-core
+    (<< 1:3.5~) (closes: #633929)
+
  -- Rene Engelhard <r...@debian.org>  Wed, 20 Jun 2012 23:29:13 +0200
 
 libreoffice (1:3.5.4-5) unstable; urgency=low
diff --git a/control b/control
index d99b73f..558aa5e 100644
--- a/control
+++ b/control
@@ -400,6 +400,7 @@ Package: libreoffice-filter-mobiledev
 Section: misc
 Architecture: all
 Depends: ${java-runtime-depends}, ${java-common-depends}, ${java:Depends}, 
${misc:Depends}
+Breaks: libreoffice-core (<< 1:3.5~)
 Description: office productivity suite -- mobile devices filters
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index d48ebd5..d9e2708 100644
--- a/control.in
+++ b/control.in
@@ -554,6 +554,7 @@ Depends: ${java-runtime-depends},
  ${java-common-depends},
  ${java:Depends},
  ${misc:Depends}
+Breaks: libreofficeVER-core (<< 1:3.5~)
 Description: office productivity suite -- mobile devices filters
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1slqbq-0004ao...@vasks.debian.org