[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-157-g0f34416
The following commit has been merged in the debian-experimental-4.0 branch:
commit a2519f4c67d2d05cf0de1ecfa0b5fda2823e946a
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 27 13:02:42 2012 +0100
python3 is now default upstream; switch libreoffice and libreoffice-script-provider-python to prefer it over python-uno
diff --git a/changelog b/changelog
index 4cfc9d3..3f74510 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha1+git20121126-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121127-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/control.in b/control.in
index 8f8ed77..da8b0b9 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,
- python-uno,
+ python3-uno | python-uno,
${java-common-depends},
${misc:Depends}
Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
@@ -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}, python3-uno | 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/patches/py2uno-module.diff b/patches/py2uno-module.diff
index e074925..bb4beaf 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -1,8 +1,8 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -140,6 +140,7 @@ padmin\
- postgresql\
+@@ -142,6 +142,7 @@ postgresql\
psprint_config\
+ python3 \
pyuno\
+py2uno\
qadevOOo\
--
LibreOffice packaging repository
Reply to: