Author: orw
Date: Mon Jun 3 08:09:23 2013
New Revision: 1488884
URL: http://svn.apache.org/r1488884
Log:
121968: adjust package description for debian system integration package
Modified:
openoffice/trunk/main/sysui/desktop/debian/control
Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1488884&r1=1488883&r2=1488884&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Mon Jun 3 08:09:23 2013
@@ -2,5 +2,5 @@ Description: %productname desktop integr
Maintainer: Apache Software Foundation
Architecture: all
Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openofficeorg-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration,
openoffice.org-debian-menus, openoffice.org-bundled
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
