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

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



The following commit has been merged in the debian-experimental-4.0 branch:
commit 34f4b2ef22ca10c665de74c6b64ed26e11126f3d
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 15 22:43:08 2013 +0100

    depend on python3-uno (>= 4.0~) to be sure we use a python3.3+-built one

diff --git a/control.in b/control.in
index 4b8843c..f236df3 100644
--- a/control.in
+++ b/control.in
@@ -59,7 +59,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
  ttf-dejavu,
  ttf-sil-gentium-basic,
  libreofficeVER-filter-mobiledev,
- python3-uno | python-uno,
+ python3-uno (>= 4.0~) | python-uno,
  ${java-common-depends},
  ${misc:Depends}
 Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
@@ -202,7 +202,7 @@ Suggests: libreofficeVER-style-hicontrast,
  libreofficeVER-style-crystal,
  libreofficeVER-style-oxygen
 Recommends: xfonts-mathml,
- python3-uno | python-uno,
+ python3-uno (>= 4.0~) | python-uno,
  ${textcat-data-recommends}
 Conflicts: libtextcat-data (<< 2.2-8),
  broffice,
@@ -485,7 +485,7 @@ Description: office productivity suite -- GNOME integration
 
 Package: libreofficeVER-emailmerge
 Architecture: all
-Depends: ${python:Depends}, python3-uno | python-uno, libreofficeVER-core, ${misc:Depends}
+Depends: ${python:Depends}, python3-uno (>= 4.0~) | python-uno, libreofficeVER-core, ${misc:Depends}
 Enhances: libreofficeVER-writer
 Replaces: python-uno (<< 1:2.4.1-5)
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -506,7 +506,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
  ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: python3-uno, python3-uno,libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno (>= 4.0~), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
 Description: Python-UNO bridge
  The Python-UNO bridge allows use of the standard LibreOffice API 
  with the Python scripting language. It additionally allows 
@@ -584,7 +584,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
 Package: libreoffice-script-provider-python
 Architecture: all
 Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python3-uno | python-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python3-uno (>= 4.0~) | python-uno, ${misc:Depends}
 Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
 Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
 Description: Python script support provider for LibreOffice scripting framework

-- 
LibreOffice packaging repository


Reply to: