[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/desktop

[Petr Mladek]

 sysui/desktop/debian/control |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 754586bb7148ffd9f8e7fd34a6f1700b74e4286f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jul 18 11:40:17 2013 +0200

    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 at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-on: https://gerrit.libreoffice.org/5019
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index da25ee4..cfcd707 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