~ubuntu-branches/ubuntu/wily/bookmarkbridge/wily

Viewing all changes in revision 7.

  • Committer: Bazaar Package Importer
  • Author(s): Brian Thomason
  • Date: 2010-02-09 15:10:33 UTC
  • mfrom: (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100209151033-jqqer01nl7u2z2l5
Tags: 0.76-2.2ubuntu1
* Merge from debian testing. (LP: #513949) Remaining changes:
  + debian/debian/bookmarkbridge.xpm:
    - Provide an icon.
  + debian/bookmarkbridge.desktop:
    - Provide a .desktop file.
  + debian/dirs:
    - Create /usr/share/applications and /usr/share/pixmaps.
  + debian/rules:
    - Install icon and .desktop file.
  + debian/control:
    - Update Maintainer field as per spec.
* Dropped the following changes that are now included in Debian:
  - debian/patches/03_fix_missing_include.dpatch

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: