summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-07-18 11:40:17 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-07-22 10:48:19 +0000
commit754586bb7148ffd9f8e7fd34a6f1700b74e4286f (patch)
tree66c05a17a276c87d7d31f2e39461ff164038d31b
parent4326872e510941595f0682b6b6330d480d3e6150 (diff)
debian-menus packages should not conflict with older versions (fdo#67031)
All the files and menu entries have been versioned since LO 3.4. There are not real conflicts with older versions or native Debian packages any longer. Change-Id: Ie3afb8b506cb23767b52a5f9cf1c721521e60ec3 Reviewed-on: https://gerrit.libreoffice.org/4965 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5019 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
-rwxr-xr-xsysui/desktop/debian/control3
1 files changed, 0 insertions, 3 deletions
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index da25ee454292..cfcd7074a616 100755
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,6 +1,3 @@
Description: %productname desktop integration
Maintainer: LibreOffice
Architecture: all
-Provides: libreoffice-desktop-integration, libreoffice-unbundled
-Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled
-Replaces: libreoffice-desktop-integration, libreoffice-debian-menus