[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-71-g3057a33



The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 6cf6cd027833c2053c19367625de1d83be56734b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Mar 27 12:01:10 2012 +0200

    lp#916291: add a few conflicts against -common

diff --git a/control.in b/control.in
index 25c0f5a..52a0065 100644
--- a/control.in
+++ b/control.in
@@ -210,7 +210,8 @@ 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-common (<< 1:3.5.0)
 Provides: libreoffice-l10n-en-us
 Breaks: libreofficeVER-style-crystal (<< 1:${oover}~),
  libreofficeVER-style-oxygen (<< 1:${oover}~),
@@ -514,11 +515,11 @@ XB-Python-Version: ${python:Versions}
 Section: python
 Architecture: %OOO_ARCHS%
 Enhances: libreofficeVER
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreofficeu-core (= ${binary:Version}),
  ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: python3-uno
+Conflicts: python3-uno, libreoffice-common (<< 1:3.5.0)
 Description: Python-UNO bridge
  The Python-UNO bridge allows use of the standard LibreOffice API 
  with the Python scripting language. It additionally allows 
@@ -536,7 +537,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
  ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: python-uno
+Conflicts: python-uno, libreoffice-common (<< 1:3.5.0)
 Description: Python-UNO bridge
  The Python-UNO bridge allows use of the standard LibreOffice API 
  with the Python scripting language. It additionally allows 

-- 
LibreOffice packaging repository


Reply to: