-
Committer:
Bazaar Package Importer
-
Author(s):
Julian Andres Klode
-
Date:
2010-01-28 18:22:28 UTC
-
mfrom:
(1.1.5 upstream)
(2.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20100128182228-3y7favkx3da87135
Tags: 0.9.13-3
* debian/patches: Add DEP-3 headers to all our patches.
* Update Standards-Version to 3.8.4.
* Merge from Ubuntu:
- applet-category.diff: Add a category to the applet.
- respect-nautilus-spacial-setting.diff: Do not pass --browser to nautilus.
* Update default-applications.diff:
- Rename ooo-writer.desktop to openoffice.org-writer.desktop.
- Call nautilus without the --browser argument.
- Change banshee-1.desktop to rhythmbox.desktop.
- Add f-spot.desktop and firefox.desktop which are normally ignored on
Debian but used on Ubuntu.