./packages/openofficeorg/3.3.0/experimental r2074: we apparently don't need the "register mailmerge.py" workaround anymore (besides that it doesn't work anymore ; ))
------------------------------------------------------------
revno: 2074
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2010-08-02 11:29:48 -0400
message:
we apparently don't need the "register mailmerge.py" workaround anymore (besides that it doesn't work anymore ;))
removed:
openoffice.org-emailmerge.bug-script.in
openoffice.org-emailmerge.postinst.in
openoffice.org-emailmerge.prerm.in
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-08-01 21:48:59 +0000
+++ b/changelog 2010-08-02 15:29:48 +0000
@@ -39,7 +39,7 @@
so that we don't "loose" icons because of not-matching basis. Thanks
Michael Tokarev for pointing this out.
- -- Rene Engelhard <rene@debian.org> Sun, 01 Aug 2010 17:44:44 -0400
+ -- Rene Engelhard <rene@debian.org> Mon, 02 Aug 2010 11:25:33 -0400
openoffice.org (1:3.2.1-5) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-07-31 20:34:22 +0000
+++ b/control 2010-08-02 15:29:48 +0000
@@ -409,8 +409,7 @@
Package: openoffice.org-emailmerge
Architecture: all
-Pre-Depends: ${python:Depends}, python-uno, openoffice.org-common
-Depends: ${misc:Depends}
+Depends: ${python:Depends}, python-uno, openoffice.org-core, ${misc:Depends}
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
=== modified file 'control.in'
--- a/control.in 2010-07-31 20:34:22 +0000
+++ b/control.in 2010-08-02 15:29:48 +0000
@@ -684,8 +684,7 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Pre-Depends: ${python:Depends}, python-uno, openoffice.orgVER-common
-Depends: ${misc:Depends}
+Depends: ${python:Depends}, python-uno, openoffice.orgVER-core, ${misc:Depends}
Enhances: openoffice.orgVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
=== removed file 'openoffice.org-emailmerge.bug-script.in'
--- a/openoffice.org-emailmerge.bug-script.in 2010-02-02 23:10:41 +0000
+++ b/openoffice.org-emailmerge.bug-script.in 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared org.openoffice.legacy.mailmerge.py >&3
=== removed file 'openoffice.org-emailmerge.postinst.in'
--- a/openoffice.org-emailmerge.postinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-emailmerge.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension /@OOBASISDIR@/program/mailmerge.py
-fi
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-emailmerge.prerm.in'
--- a/openoffice.org-emailmerge.prerm.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-emailmerge.prerm.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- remove_extension org.openoffice.legacy.mailmerge.py
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Reply to: