summaryrefslogtreecommitdiffstats
path: root/sysui/desktop/debian
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-08-18 11:44:38 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-08-18 11:44:38 +0000
commit6f4218bb97c4cc4c386552c4d6af4049c883398c (patch)
tree112d3f51f5b29d78b323f987ff5d9d6b1f1ecd77 /sysui/desktop/debian
parentINTEGRATION: CWS mh19121 (1.47.88); FILE MERGED (diff)
downloadcore-6f4218bb97c4cc4c386552c4d6af4049c883398c.tar.gz
core-6f4218bb97c4cc4c386552c4d6af4049c883398c.zip
INTEGRATION: CWS debianer (1.2.8); FILE MERGED
2005/08/08 14:03:42 obr 1.2.8.2: #i52874# provide virtual package openoffice.org-unbundled to avoid clashes with debian sid packages 2005/08/05 09:06:06 obr 1.2.8.1: #i52874# rename linux packages: openofficeorg => openoffice.org
Diffstat (limited to 'sysui/desktop/debian')
-rw-r--r--sysui/desktop/debian/control8
1 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index 336fef1a3701..58ecf8f6d551 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,7 +1,7 @@
-Package: openofficeorg-debian-menus
+Package: openoffice.org-debian-menus
Description: OpenOffice.org desktop integration
Maintainer: OpenOffice.org
Architecture: all
-Provides: openofficeorg-desktop-integration
-Conflicts: openofficeorg-desktop-integration
-Replaces: openofficeorg-desktop-integration
+Provides: openoffice.org-desktop-integration, openoffice.org-unbundled, openofficeorg-desktop-integration, openofficeorg-debian-menus
+Conflicts: openofficeorg-desktop-integration, openoffice.org-bundled, openofficeorg-debian-menus
+Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus