[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-4-6-g90a9e40
The following commit has been merged in the master branch:
commit 90a9e403d774b9f61a5c0078ffe5ba1786537bce
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 24 17:23:48 2013 +0100
remove bogus | python3-uno dependency alternatives
Conflicts:
changelog
diff --git a/changelog b/changelog
index e9d9d10..f5657c0 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,9 @@ libreoffice (1:3.5.4+dfsg-5) UNRELEASED; urgency=low
- make -help-en-us break "the others" to work around 682838
(closes: #682838)
* debian/copyright: fix: ext-sources -> src
+ * debian/control.in:
+ - remove bogus | python3-uno dependency alternatives. Will properly be back
+ with LO 4.0 which supportts python3
-- Rene Engelhard <rene@debian.org> Mon, 14 Jan 2013 21:37:10 +0100
diff --git a/control b/control
index e6040bc..8bfdc77 100644
--- a/control
+++ b/control
@@ -343,7 +343,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}, 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)
@@ -427,7 +427,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}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, 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
diff --git a/control.in b/control.in
index ede4f52..89deb68 100644
--- a/control.in
+++ b/control.in
@@ -483,7 +483,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}, 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)
@@ -582,7 +582,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}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, 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: