[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-3-8-g539e844
The following commit has been merged in the master branch:
commit 8d5ed8737b8d19346889f2df8b80a6b55654185f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 12 11:50:58 2012 +0200
copy python-unos preinst to libreoffice-script-provider-python.preinst.in; guard preinst to only fire on upgrades from pre-splitout. readd conflicts...
diff --git a/changelog b/changelog
index 3574f97..2747778 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,16 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
- readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
GCC_VERSION != ""....
- actually add epoch to libqt4-dev builddeps...
+ * debian/python-uno.preinst.in: only run extension stuff when upgrading
+ from version where the extension was here ...
+ * debian/libreoffice-script-provider-python.preinst.in: ... and copy
+ (old version) here
+ * debian/control.in:
+ - readd libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+ conflicts again (lost when moved to -script-provider-python) to help
+ upgrades
- -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 01:34:17 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 11:41:38 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --git a/control.in b/control.in
index 7bef11e..428c37b 100644
--- a/control.in
+++ b/control.in
@@ -504,7 +504,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python3-uno
+Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -521,7 +521,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python-uno
+Conflicts: python-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/python-uno.preinst.in b/libreoffice-script-provider-python.preinst.in
similarity index 100%
copy from python-uno.preinst.in
copy to libreoffice-script-provider-python.preinst.in
diff --git a/python-uno.preinst.in b/python-uno.preinst.in
index dd0b92a..0d8db01 100644
--- a/python-uno.preinst.in
+++ b/python-uno.preinst.in
@@ -5,8 +5,10 @@ set -e
#INCLUDE_SHELL_LIB#
if [ "$1" = "upgrade" ]; then
- rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
- sync_extensions
+ if dpkg --compare-versions "$2" lt "1:3.5.2-2"; then
+ rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
+ sync_extensions
+ fi
fi
#DEBHELPER#
diff --git a/rules b/rules
index 1c73003..81872dd 100755
--- a/rules
+++ b/rules
@@ -2939,7 +2939,6 @@ ifeq "$(PACKAGE_SDK)" "y"
perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.udk-common-ref
endif
dh_installdocs -i -A debian/README.Debian
- # note libreoffice.1 is already installed into -common by libreoffice-builds package-ooo
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
mv $$i $$i.gz; \
--
LibreOffice packaging repository
Reply to: