-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2011-09-07 07:42:29 UTC
-
mfrom:
(7.2.4 sid)
-
Revision ID:
package-import@ubuntu.com-20110907074229-sq0d30bui0r78fz0
Tags: 0.102-1ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- 04-autorestart.patch: Add gnome session restart support to ensure we
always have an authentication agent running. To be forwarded upstream.
- 06-authentication-failure-string.patch: Improve error message displayed
when authentication fails.
- Tell the .desktop file for the authentication agent to auto-restart the
agent in case of failure.
- debian/rules: Use dh-autoreconf to reconfigure after applying patches,
especially for 04-autorestart.patch. Add dh-autoreconf build dependency.
- debian/polkit-gnome-authentication-agent-1.desktop: Only start the agent
in non-GNOME sessions, and explicitly add "Unity" to the list.