[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-194-g1dfef1e
The following commit has been merged in the debian-experimental-4.0 branch:
commit 1dfef1edaecb356707f10057b3bd0e7dd36a5e7d
Author: Rene Engelhard <rene@debian.org>
Date: Tue Dec 18 02:05:56 2012 +0100
python3: switch pyuno default also for -emailmerge and add | for Recommends
diff --git a/control b/control
index c43594f..d556e11 100644
--- a/control
+++ b/control
@@ -106,7 +106,7 @@ Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-style-crystal, libreoffice-style-oxygen
-Recommends: xfonts-mathml, python-uno, ${textcat-data-recommends}
+Recommends: xfonts-mathml, python3-uno | python-uno, ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<< 1:3.3.0~), libreoffice-l10n-3.5, libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-style-crystal (<< 1:${oover}~),
@@ -347,7 +347,7 @@ Description: office productivity suite -- GNOME integration
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3-uno, libreoffice-core, ${misc:Depends}
+Depends: ${python:Depends}, python3-uno | python-uno, libreoffice-core, ${misc:Depends}
Enhances: libreoffice-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.in b/control.in
index cad32bd..fbe1752 100644
--- a/control.in
+++ b/control.in
@@ -202,7 +202,7 @@ Suggests: libreofficeVER-style-hicontrast,
libreofficeVER-style-crystal,
libreofficeVER-style-oxygen
Recommends: xfonts-mathml,
- python-uno,
+ python3-uno | 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}, python-uno | python3-uno, libreofficeVER-core, ${misc:Depends}
+Depends: ${python:Depends}, python3-uno | 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)
--
LibreOffice packaging repository
Reply to: