~ubuntu-branches/ubuntu/karmic/gnome-user-share/karmic

Viewing all changes in revision 14.

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-09-05 01:27:39 UTC
  • Revision ID: james.westby@ubuntu.com-20090905012739-916f655uax528ytn
Tags: 2.26.0-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + Build-depend on rarian-compat rather than scrollkeeper.
    + Depend on bluez-gnome|gnome-bluetooth rather than just
      gnome-bluetooth.
  - debian/patches/01_notification.patch:
    + Display an alert box instead of a notification for files 
      recieved.
  - debian/{rules,preinst}:
    + Don't move autostart file from /etc/xdg/autostart to
      /usr/share/gnome/autostart. Upstream use the former.
  - Remove debian/dirs: we don't need to create /usr/share/gnome.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: