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

Viewing all changes in revision 17.

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-02-06 23:53:16 UTC
  • mfrom: (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100206235316-k07fl1e5z199v6sx
Tags: 2.28.2-4ubuntu1
* Merge with Debian unstable, remaining changes:
  - debian/control:
    + Build-depend on rarian-compat rather than scrollkeeper
  - 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: