Branches for Wily

Author: Dmitry Shachnev
Revision Date: 2015-06-17 10:43:45 UTC

* Merge with Debian unstable, remaining changes:
  - debian/control:
    + Use unity-settings-daemon instead of gnome-settings-daemon.
    + Make gnome-session-flashback suggest compiz.
    + gnome-flashback-common breaks/replaces old gnome-menus.
  - debian/rules:
    + Add an epoch number to gnome-session-flashback package.
  - debian/gnome-flashback-services.desktop:
    + Emit upstart indicator-services-start signal.
  - debian/gnome-flashback-common.gsettings-override:
    + Install this file in gnome-session-flashback package.
    + Disable some not needed gnome-flashback components.
  - Add Ubuntu-specific patches:
    + desktop_names.diff
    + required_components.diff
    + software_center.diff
* Drop settings_menus.diff, applied upstream.
* Drop disable_acceleration_check.diff, applied upstream.
* Simplify dpkg-parsechangelog call in debian/rules.
* Disable fix-button-layout workaround, we do not need it.

Author: Dmitry Shachnev
Revision Date: 2015-06-17 10:43:45 UTC

* Merge with Debian unstable, remaining changes:
  - debian/control:
    + Use unity-settings-daemon instead of gnome-settings-daemon.
    + Make gnome-session-flashback suggest compiz.
    + gnome-flashback-common breaks/replaces old gnome-menus.
  - debian/rules:
    + Add an epoch number to gnome-session-flashback package.
  - debian/gnome-flashback-services.desktop:
    + Emit upstart indicator-services-start signal.
  - debian/gnome-flashback-common.gsettings-override:
    + Install this file in gnome-session-flashback package.
    + Disable some not needed gnome-flashback components.
  - Add Ubuntu-specific patches:
    + desktop_names.diff
    + required_components.diff
    + software_center.diff
* Drop settings_menus.diff, applied upstream.
* Drop disable_acceleration_check.diff, applied upstream.
* Simplify dpkg-parsechangelog call in debian/rules.
* Disable fix-button-layout workaround, we do not need it.