[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-181-g8964b12
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8964b12ef502f413ceafb7ea4d32cf28cd9b4313
Author: Rene Engelhard <rene@debian.org>
Date: Thu Dec 22 23:00:18 2011 +0100
allow python3-uno for libreoffice-emailmerge
diff --git a/control b/control
index 1fe4225..f6ba527 100644
--- a/control
+++ b/control
@@ -341,7 +341,7 @@ Description: office productivity suite -- GNOME integration
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno, libreoffice-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3-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 f0d20a6..3e69256 100644
--- a/control.in
+++ b/control.in
@@ -481,7 +481,7 @@ Description: office productivity suite -- GNOME integration
Package: libreofficeVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno, libreofficeVER-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3-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: