------------------------------------------------------------
revno: 1173
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-07-14 22:48:12 +0200
message:
fix merge errors
modified:
control.in
openoffice.org-wiki-publisher.preinst.in
=== modified file 'control.in'
--- a/control.in 2008-07-14 02:19:50 +0000
+++ b/control.in 2008-07-14 20:48:12 +0000
@@ -528,12 +528,8 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
-Package: openoffice.orgVER-style-galaxy
-Architecture: all
Depends: openoffice.orgVER-common (= ${Source-Version})
Replaces: openoffice.orgVER-common (<< 2.1~m190),
openoffice.orgVER-style-default, openoffice.org-style-andromeda
-Conflicts: openoffice.orgVER-style-default, openoffice.org-style-andromeda
-Provides: openoffice.orgVER-style-default,openoffice.org-style-andromeda
Description: Andromeda (Classic) symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'openoffice.org-wiki-publisher.preinst.in'
--- a/openoffice.org-wiki-publisher.preinst.in 2008-07-14 20:37:46 +0000
+++ b/openoffice.org-wiki-publisher.preinst.in 2008-07-14 20:48:12 +0000
@@ -11,7 +11,7 @@
case "$1" in
upgrade)
- remove_extension com.sun.wiki-publisher
+ remove_extension com.sun.wiki-publisher
;;
esac
