-
Committer:
Package Import Robot
-
Author(s):
Jeremy Bicha
-
Date:
2012-05-23 20:24:53 UTC
-
mfrom:
(116.1.4 sid)
-
Revision ID:
package-import@ubuntu.com-20120523202453-arwn92jex5mo7w80
Tags: 3.4.1-4ubuntu1
* Merge with Debian. Remaining Ubuntu changes:
- debian/gnome-keyring.gsettings-override:
Prefer keyserver.ubuntu.com.
- debian/gnome-keyring.ubiquity:
Apply capabilities at the end of the ubiquity process to make sure new
installs have gnome-keyring-daemon with cap_ipc_lock+ep. Install this
in debian/rules.
- 04_nodisplay_autostart.patch:
Clean up Startup Applications dialog by hiding default apps.