[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-61-gaa20231
The following commit has been merged in the debian-experimental-3.5 branch:
commit aa20231523c2a3c64d8f7dece05241e82b6729d6
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 24 17:23:48 2013 +0100
remove bogus | python3-uno dependency alternatives
diff --git a/changelog b/changelog
index 45259e9..9125011 100644
--- a/changelog
+++ b/changelog
@@ -23,6 +23,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- recommend fonts-liberation instead of ttf-liberation
(closes: #691949)
+ - remove bogus | python3-uno dependency alternatives. Will properly be back
+ with LO 4.0 which supportts python3
* debian/control.mozilla.in, debian/rules: rename
mozilla-libreoffice -> browser-plugin-libreoffice
* debian/libreoffice-{core,gtk3}.bug-script.in:
diff --git a/control b/control
index c9742cf..30e84a9 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 c04b8ab..e29d816 100644
--- a/control.in
+++ b/control.in
@@ -480,7 +480,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)
@@ -579,7 +579,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: