~noskcaj/ubuntu/wily/lightdm-gtk-greeter/merge

Viewing all changes in revision 25.

  • Committer: Package Import Robot
  • Author(s): Sean Davis, Sean Davis
  • Date: 2015-06-16 20:20:00 UTC
  • mfrom: (1.2.20 sid)
  • Revision ID: package-import@ubuntu.com-20150616202000-whdodnwujc6gfv2i
Tags: 2.0.1-1ubuntu1
[ Sean Davis ]
* Merge from Debian unstable.  Remaining changes:
  - debian/01_ubuntu.conf
    + Renamed from lightdm-gtk-greeter-ubuntu.conf
    + Removed unneeded comments
  - debian/control, debian/rules:
    + Add Indicators support.
  - debian/control:
    + Build-Depends on liblightdm-gobject-1-dev instead on
      liblightdm-gobject-dev as it's non-existing in archive.
  - debian/copyright:
    + Update copyright for lightdm-gtk-greeter, it's been a long time
      since lightdm housed all of the greeters
  - debian/01_ubuntu.conf,
    debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
    debian/60-lightdm-gtk-greeter.conf:
    + Install and remove Ubuntu conf files.
  - debian/lightdm-gtk-greeter.{preinst,prerm,postinstpostrm}
    + Migrate post-1.0.0 configuration to conf.d/01_ubuntu.conf
    + Do not use update-alternatives for lightdm-gtk-greeter config
  - debian/rules
    + Install lightdm and lightdm-gtk-greeter configuration

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: