~willismonroe/ubuntu/precise/xdg-utils/typo-fix-996304

« back to all changes in this revision

Viewing changes to scripts/xdg-desktop-menu

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Martin Pitt, Scott Ritchie
  • Date: 2011-03-30 13:11:39 UTC
  • Revision ID: james.westby@ubuntu.com-20110330131139-dbnqh2z1d4lrlu68
Tags: 1.1.0~rc1-2ubuntu1
[ Martin Pitt ]
* Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a
  /usr/share/applications/defaults.list symlink. Thanks to Joe Ebel for the
  original patch! (LP: #703106)

[ Scott Ritchie ]
* debian/patches/xdg-generic-use-mimetype.diff:
  - Update to fallback to generic on Gnome (LP: #602799)

Show diffs side-by-side

added added

removed removed

Lines of Context:
686
686
            # App already listed as default
687
687
            continue;
688
688
        fi
689
 
        default_file="$1/defaults.list"
 
689
        default_file="$(readlink -f "$1/defaults.list")"
690
690
        DEBUG 1 "Updating $default_file"
691
691
        grep -v "$MIME=" $default_file > ${default_file}.new 2> /dev/null
692
692
        if ! grep "[Default Applications]" ${default_file}.new > /dev/null; then