./packages/openofficeorg/3.0/experimental r1137: merge 2.4.1-4
------------------------------------------------------------
revno: 1137
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-02 11:54:16 +0200
message:
merge 2.4.1-4
modified:
changelog
openoffice.org-core.postrm.in
------------------------------------------------------------
revno: 1022.1.117
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-07-01 23:08:38 +0200
message:
fix postrm
modified:
changelog
openoffice.org-core.postrm.in
------------------------------------------------------------
revno: 1022.1.118
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-02 11:48:25 +0200
message:
-4
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-07-01 22:09:08 +0000
+++ b/changelog 2008-07-02 09:54:16 +0000
@@ -66,10 +66,10 @@
-- Rene Engelhard <rene@debian.org> Tue, 01 Jul 2008 21:52:36 +0200
-openoffice.org (1:2.4.1-3.4pre) unstable; urgency=low
+openoffice.org (1:2.4.1-4) unstable; urgency=medium
* ooo-build
- + update (r12931)
+ + update (r12994)
+ sw-field-patch-fix-competing-protection.diff: for the competing
protection problem from n#400884 (really closes: #477653)
+ distro-configs/Common.conf.in: randr reenabled per default
@@ -79,8 +79,10 @@
* debian/control.in:
- make openoffice.org metapackage depend on ttf-liberation. Remove
msttcorefonts suggestion.
+ * debian/openoffice.org-core.postrm.in:
+ - fix. rm -rf /var/spool/openoffice, not /var/spool/openoffice2
- -- Rene Engelhard <rene@debian.org> Mon, 30 Jun 2008 17:27:53 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 01 Jul 2008 23:06:23 +0200
openoffice.org (1:2.4.1-3) unstable; urgency=medium
=== modified file 'openoffice.org-core.postrm.in'
--- a/openoffice.org-core.postrm.in 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-core.postrm.in 2008-07-01 21:08:38 +0000
@@ -10,7 +10,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "remove" ]; then
- rm -rf /var/spool/openoffice2
+ rm -rf /var/spool/openoffice$VER
fi
#DEBHELPER#
Reply to: