-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2012-03-05 15:30:01 UTC
-
mfrom:
(7.3.8 sid)
-
Revision ID:
package-import@ubuntu.com-20120305153001-p8j3q6jw9fv47g91
Tags: 3.2.3-3ubuntu1
* Merge from Debian testing, remaining changes:
- debian/control.in:
+ don't package the gsettings backend since it's not meant to be
distributed
- debian/control.in, debian/rules:
+ use dh-autoreconf
- debian/patches/02_xml-gettext-domain.patch:
+ use gettext from schemas translations
- debian/patches/05_nodisplay_autostart.patch:
+ Don't show in "Startup Applications"
- debian/patches/06_onlyshowin_unity.patch:
+ Add Unity to OnlyShowIn
- debian/70gconfd_path-on-session, debian/gconf2-common.install:
+ add additional gconf path depending on selected desktop session:
- debian/gconf-schemas: Shrink the generated %gconf-tree.xml, by
filtering out locale specific defaults for uninstalled locales,
leading tabs, empty short descriptions, and mtimes (which aren't
interesting for system-wide defaults).
- debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
+ Declare a new trigger on /usr/share/GConf/gsettings to watch when
new gsettings convert files are installed.
- debian/default.path, debian/gconf2-common.dirs:
+ drop old compatibility path from intrepid, that was required until
lucid
* Dropped changes:
- debian/control.in: no build-dependency on gnome-common, we're using
dh-autoreconf.
- Build using dh_python2: merged in Debian.
- Mark gconf2 Multi-Arch: foreign: merged in Debian.