------------------------------------------------------------
revno: 1144
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-07-06 23:09:34 +0200
message:
split mailmerge.py into -emailmerge
added:
openoffice.org-emailmerge.control.bug
openoffice.org-emailmerge.postinst.in
openoffice.org-emailmerge.preinst.in
openoffice.org-emailmerge.prerm.in
openoffice.org-emailmerge.script.bug
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-07-06 21:03:44 +0000
+++ b/changelog 2008-07-06 21:09:34 +0000
@@ -7,8 +7,16 @@
cli_*dll in various subpackages to make the packages CLI policy compliant.
Rename libuno-cil to cli-uno-bridge. Move the files in libuno*-cil to
/usr/lib/cli/uno
+ * debian/rules, debian/control.in:
+ - split emailmerge out into an own package. Don't make -writer depend on
+ python-uno anymore so that -writer (and openoffice.org) still can be
+ installed when python-uno is not installable (like at python-defaults
+ changes)
+ * debian/openoffice.org-emailmerge*: unopkg add --shared mailmerge.py
+ to register mailmerge.py as it otherwise doesn't seem to work
+ (closes: #488875)
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 02 Jul 2008 21:54:49 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 06 Jul 2008 23:08:20 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-07-06 21:03:44 +0000
+++ b/control 2008-07-06 21:09:34 +0000
@@ -143,8 +143,8 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${Source-Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
@@ -390,6 +390,18 @@
This package allows OpenOffice.org to access Evolution address books.
You need to install evolution separately.
+Package: openoffice.org-emailmerge
+Architecture: all
+Depends: ${python:Depends}, python-uno
+Enhances: openoffice.org-writer
+Replaces: python-uno (<< 1:3.0.0~)
+Description: E-Mail Mailmerge component for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a component which allows OpenOffice.org to "mail merge"
+ to E-Mail.
+
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
=== modified file 'control.in'
--- a/control.in 2008-06-22 01:23:38 +0000
+++ b/control.in 2008-07-06 21:09:34 +0000
@@ -313,9 +313,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
- ${shlibs:Depends},
- ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
+ ${shlibs:Depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
@@ -626,6 +625,18 @@
This package allows OpenOffice.org to access Evolution address books.
You need to install evolution separately.
+Package: openoffice.orgVER-emailmerge
+Architecture: all
+Depends: ${python:Depends}, python-uno
+Enhances: openoffice.orgVER-writer
+Replaces: python-uno (<< 1:3.0.0~)
+Description: E-Mail Mailmerge component for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a component which allows OpenOffice.org to "mail merge"
+ to E-Mail.
+
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
=== added file 'openoffice.org-emailmerge.control.bug'
--- a/openoffice.org-emailmerge.control.bug 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.control.bug 2008-07-06 21:09:34 +0000
@@ -0,0 +1,1 @@
+report-with: python-uno
=== added file 'openoffice.org-emailmerge.postinst.in'
--- a/openoffice.org-emailmerge.postinst.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.postinst.in 2008-07-06 21:09:34 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-emailmerge
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
+ add_extension /usr/lib/openoffice/program/basis3.0/mailmerge.py
+fi
+
+#DEBHELPER#
+
+exit 0
=== added file 'openoffice.org-emailmerge.preinst.in'
--- a/openoffice.org-emailmerge.preinst.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.preinst.in 2008-07-06 21:09:34 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-emailmerge
+
+THIS_PACKAGE=openoffice.org-emailmerge
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ upgrade)
+ remove_extension org.openoffice.legacy.mailmerge.py
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
=== added file 'openoffice.org-emailmerge.prerm.in'
--- a/openoffice.org-emailmerge.prerm.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.prerm.in 2008-07-06 21:09:34 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# prerm script for openoffice.org-emailmerge
+
+THIS_PACKAGE=openoffice.org-emailmerge
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ remove)
+ remove_extension org.openoffice.legacy.mailmerge.py
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
=== added file 'openoffice.org-emailmerge.script.bug'
--- a/openoffice.org-emailmerge.script.bug 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.script.bug 2008-07-06 21:09:34 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/openoffice/program/unopkg list --shared
org.openoffice.legacy.mailmerge.py >&3
=== modified file 'rules'
--- a/rules 2008-07-06 21:03:44 +0000
+++ b/rules 2008-07-06 21:09:34 +0000
@@ -400,8 +400,7 @@
ifeq "$(USE_PYCENTRAL)" "y"
BUILD_DEPS += , python-central (>= 0.5)
endif
- BUILD_DEPS += , python-dev (>= 2.4)
- WRITER_PYUNO_DEP = python-uno (>= $(BASE_VERSION))
+ BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python
@@ -2361,8 +2360,10 @@
dh_testroot
# Copy files placed by ooo-build/bin/package-ooo/install
- rm -rf $(PKGDIR)-common $(PKGDIR)-common.*.debhelper; \
- cp -r --preserve=mode debian/tmp/pkg/openoffice.org-common
$(PKGDIR)-common || exit 1
+ for i in common emailmerge; do \
+ rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper; \
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i
$(PKGDIR)-$$i || exit 1; \
+ done
ifeq "$(PACKAGE_SDK)" "y"
rm -rf $(PKGDIR)-dev-doc $(PKGDIR)-dev-doc.*.debhelper; \
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-dev-doc
$(PKGDIR)-dev-doc || exit 1
@@ -2863,7 +2864,6 @@
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
- -V'writer-pyuno-dep=$(WRITER_PYUNO_DEP)' \
-V'writer-w2l-dep=$(WRITER_W2L_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
