[Alessio Treglia]

* Merge from debian unstable (LP: #318102), Ubuntu remaining changes:
  - Added /usr/share/activities/ to the search path to work around issue
    with the packaging of the activities. This can be dropped when
    the activities are fixed.
  - Add the sugar-activities package back for people upgrading from Hardy.
    Should be kept until after next LTS.
  - Actually install things in to the sugar package.
  - Add 2005_look_in_usr_share_activities.patch to debian/patches/series.
* Added gstreamer0.10-alsa on sugar Depends field (LP: #317462).

[Devid Antonio Filoni]

* Fix debhelper-but-no-misc-depends lintian warning.