-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-03-30 15:38:01 UTC
-
mfrom:
(3.4.51 experimental)
-
Revision ID:
package-import@ubuntu.com-20120330153801-vit7whgil2nnkv3e
Tags: 2.32.0-1ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- debian/control.in: Add Conflicts to obsolete libzeitgeist-gio,
wncksyncdaemon, and old bamfdaemon, to clean them up on upgrades and
avoid crashes due to incompatibilities. This can be dropped after the
12.04 LTS release.
- debian/control.in, debian/libglib2.0-bin.maintscript,
debian/libglib2.0-bin.postinst: Remove /etc/etc/bash_completion.d/ files
on upgrade, to clean up after LP #911191. This can be dropped after the
12.04 LTS release.
- 01_gettext-desktopfiles.patch: Use official "Keywords" key (lp #949864).
Change now also committed to Debian SVN.
- debian/libglib2.0-0.postrm.in: Only remove the compiled schemas on
purge, not during upgrades. Otherwise we have no schemas available until
the new postinst is run, which leads to applications aborting on missing
schemas. Change now also committed to Debian SVN.
* The new merge now makes packages which build depend on glib
cross-buildable. (LP: #950967)