-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-01-03 12:49:49 UTC
-
mfrom:
(116.1.1 sid)
-
Revision ID:
package-import@ubuntu.com-20120103124949-wbal957heafylj4b
* Merge with Debian unstable. Remaining Ubuntu changes:
- Add debian/gnome-keyring.gsettings-override: Prefer
keyserver.ubuntu.com.
- Add 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.
- Add 04_nodisplay_autostart.patch: Clean up Startup Applications dialog
by hiding default apps.
- debian/watch: Watch for development versions.
* Add 01_gmodule_include.patch: Fix FTBFS due to missing include/wrong
linking.
* Add 00git_glib_2.31_deprecations.patch: Fix deprecated API for building
with glib 2.31. Backported from upstream git head. (LP: #911125)