[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-5-g9633098
The following commit has been merged in the master branch:
commit 9633098ad69b55a6291c263f9091e357082e7915
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 5 14:29:56 2012 +0200
split script-provider-for-python out into -script-provider-python
diff --git a/changelog b/changelog
index 928484c..8d3b643 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,11 @@ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
- strip ure from uno-libs3.substvars again after the .symbols change
(closes: #667465)
* debian/libreoffice-core.preinst.in: silence rmdir
+ * debian/rules, debian/control.in, debian/*.triggers.in,
+ debian/scripts/gid2pkgdirs.sh: split script-provider-for-python out of
+ python(3)-uno out to libreoffice-script-provider-python where it belongs
- -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 14:22:45 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 14:24:22 +0200
libreoffice (1:3.5.2-1) unstable; urgency=low
diff --git a/control b/control
index 06d0137..a6ede96 100644
--- a/control
+++ b/control
@@ -354,13 +354,13 @@ Description: office productivity suite -- email mail merge
to E-Mail.
Package: python-uno
-Provides: ${python:Provides}, libreoffice-script-provider-python
+Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -370,7 +370,6 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
-Provides: libreoffice-script-provider-python
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
@@ -423,6 +422,23 @@ Description: office productivity suite -- legacy 1.0 XML DTD
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
+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}
+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 is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Scripting Framework allows LibreOffice users to write and run macros
+ in multiple languages including LibreOffice Basic, Python, Java, BeanShell
+ and JavaScript. These macros can then be assigned to menus, toolbars,
+ keyboard shortcuts, events and embedded objects.
+ .
+ This package contains the script provider to support Python.
+
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
diff --git a/control.in b/control.in
index 1639aad..04a205e 100644
--- a/control.in
+++ b/control.in
@@ -495,7 +495,7 @@ Description: office productivity suite -- email mail merge
to E-Mail.
Package: python-uno
-Provides: ${python:Provides}, libreofficeVER-script-provider-python
+Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
Architecture: %OOO_ARCHS%
@@ -504,7 +504,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -514,7 +514,6 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
-Provides: libreofficeVER-script-provider-python
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreofficeVER
@@ -579,6 +578,23 @@ Description: office productivity suite -- legacy 1.0 XML DTD
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
+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}
+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 is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Scripting Framework allows LibreOffice users to write and run macros
+ in multiple languages including LibreOffice Basic, Python, Java, BeanShell
+ and JavaScript. These macros can then be assigned to menus, toolbars,
+ keyboard shortcuts, events and embedded objects.
+ .
+ This package contains the script provider to support Python.
+
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
diff --git a/libreoffice-mysql-connector.bug-script.in b/libreoffice-script-provider-python.bug-script.in
old mode 100755
new mode 100644
similarity index 62%
copy from libreoffice-mysql-connector.bug-script.in
copy to libreoffice-script-provider-python.bug-script.in
index fb22371..f1319a9
--- a/libreoffice-mysql-connector.bug-script.in
+++ b/libreoffice-script-provider-python.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --bundled com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
+/usr/lib/libreoffice/program/unopkg list --bundled com.sun.star.script.provider.ScriptProviderForPython >&3
diff --git a/python-uno.triggers.in b/libreoffice-script-provider-python.triggers.in
similarity index 100%
rename from python-uno.triggers.in
rename to libreoffice-script-provider-python.triggers.in
diff --git a/python-uno.NEWS b/python-uno.NEWS
new file mode 100644
index 0000000..17676ff
--- /dev/null
+++ b/python-uno.NEWS
@@ -0,0 +1,10 @@
+libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
+
+ * The script provider for python (which was in python-uno before has been
+ split out into libreoffice-script-provider-python as it's the same in both
+ variants and python-uno should contain just the module anyway.
+
+ If you relied on python-uno for the script provider, install the new
+ package in addition.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 00:42:32 +0200
diff --git a/python3-uno.NEWS b/python3-uno.NEWS
new file mode 100644
index 0000000..482db8e
--- /dev/null
+++ b/python3-uno.NEWS
@@ -0,0 +1,10 @@
+libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
+
+ * The script provider for python (which was in python3-uno before has been
+ split out into libreoffice-script-provider-python as it's the same in both
+ variants and python3-uno should contain just the module anyway.
+
+ If you relied on python3-uno for the script provider, install the new
+ package in addition.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 05 Apr 2012 00:42:32 +0200
diff --git a/python3-uno.triggers.in b/python3-uno.triggers.in
deleted file mode 100644
index b5aaf61..0000000
--- a/python3-uno.triggers.in
+++ /dev/null
@@ -1 +0,0 @@
-activate /usr/lib/libreoffice/share/extensions
diff --git a/rules b/rules
index 3cf4d62..4f16f49 100755
--- a/rules
+++ b/rules
@@ -394,7 +394,7 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher -Nlibreoffice$(VER)-script-provider-python
endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
@@ -1033,7 +1033,7 @@ ifeq "$(BUILD_BINFILTERS)" "y"
endif
ifneq "$(BUILD_PYUNO)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
endif
@@ -2166,12 +2166,7 @@ ifeq "$(BUILD_PYUNO)" "y"
debian/python3-uno/$(OODIR)/share/Scripts
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- rm -f debian/python-uno/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
- ifeq "$(ENABLE_PYTHON3)" "y"
- mkdir -p debian/python3-uno/$(OODIR)/share/extensions
- cp -ra debian/python-uno/$(OODIR)/share/extensions/* \
- debian/python3-uno/$(OODIR)/share/extensions
- endif
+ rm -f debian/libreoffice$(VER)-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 9e809ee..382e261 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -99,7 +99,7 @@ create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
-create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/python-uno
+create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
--
LibreOffice packaging repository
Reply to: