app-install-data-ubuntu

Merge lp://staging/~jjed/app-install-data-ubuntu/no_dups into lp://staging/app-install-data-ubuntu

  1. no_dups
  2. Merge into ubuntu
Proposed by Jjed
Status: Merged
Merged at revision: 694
Proposed branch: lp://staging/~jjed/app-install-data-ubuntu/no_dups
Merge into: lp://staging/app-install-data-ubuntu
Diff against target: 267 lines (+0/-243)
5 files modified
menu-data-additional/ccsm.desktop (+0/-12)
menu-data-additional/gparted.desktop (+0/-66)
menu-data-additional/gvim.desktop (+0/-82)
menu-data-additional/nact.desktop (+0/-67)
menu-data-additional/nm-applet.desktop (+0/-16)
To merge this branch: bzr merge lp://staging/~jjed/app-install-data-ubuntu/no_dups
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+71412@code.staging.launchpad.net

Description of the change

The recent release of app-install-data-ubuntu contains some duplicate desktop entries (eg LP:#824593 and LP:#824855). This is due to custom-built .desktop files in menu-data-additional/ for packages that now have their own, perfectly adequate entries.

The branch removes the following duplicates:

    ccsm.desktop -> compizconfig-settings-manager:ccsm.desktop
    gparted.desktop -> gparted:gparted.desktop
    gvim.desktop -> vim-gui-common:gvim.desktop
    nact.desktop -> nautilus-actions:nact.desktop
    nm-applet.desktop -> nm-applet.desktop

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: