~sil2100/unity/ubuntu_ffe1

Viewing all changes in revision 761.

  • Committer: Sebastien Bacher
  • Date: 2012-08-22 11:05:48 UTC
  • mfrom: (760.1.7 ubuntu)
  • Revision ID: seb128@ubuntu.com-20120822110548-sg3syz2xvsta520d
[Didier Roche]
* Backports:
  - the remaining part of the gconf removal from upstream branch
  - the .convert migration scripts
* debian/control:
  - do not build-dep on gconf anymore
  - build-dep on latest compiz for building gsettings keys
    (part 2 of LP: #1035261)
* debian/unity-common.install, debian/control:
  - don't ship gconf schemas as not built anymore (the gsettings schema ones
    are already shipped)
  - install the gnome-control-center unity keybinding integration
  - install the .convert files handled by the compiz migration script and
    make unity-common depending on the right version of compiz-gnome (with
    the migration script)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: