Viewing all changes in revision 11.
- Committer: Bazaar Package Importer
- Date: 2009-01-27 10:51:22 UTC
- mfrom: (0.4.2 squeeze)
- Revision ID: james.westby@ubuntu.com-20090127105122-pruu9bbi9c2zqfdn
* Merge from debian unstable (LP: #321826), Ubuntu remaining changes:
- debian/{control,control.in}:
+ Add the sugar-activities package back for people upgrading from Hardy.
Should be kept until after next LTS.
+ Add gstreamer0.10-alsa on sugar Depends field.
- debian/sugar.install:
+ Install things in to the sugar package.
- debian/{control,control.in}:
+ Add the sugar-activities package back for people upgrading from Hardy.
Should be kept until after next LTS.
+ Add gstreamer0.10-alsa on sugar Depends field.
- debian/sugar.install:
+ Install things in to the sugar package.
- files added:
- debian/patches/0002_remove_unused_glive.py.patch
- files removed:
- debian/patches/2005_look_in_usr_share_activities.patch
- files modified:
- debian/cdbs/1/class/autotools-vars.mk
expand all
collapse all
added
removed
