Ubuntu
gdm package

Merge lp://qastaging/~noskcaj/ubuntu/vivid/gdm/3.14.1 into lp://qastaging/ubuntu/vivid/gdm

  1. Vivid (15.04)
  2. 3.14.1
  3. Merge into vivid
Proposed by Jackson Doak
Status: Merged
Merge reported by: Tim Lunn
Merged at revision: not available
Proposed branch: lp://qastaging/~noskcaj/ubuntu/vivid/gdm/3.14.1
Merge into: lp://qastaging/ubuntu/vivid/gdm
Diff against target: 3994 lines (+1015/-1431)
42 files modified
.pc/01_language.patch/daemon/gdm-session.c (+1/-0)
.pc/revert_override_LANG_with_accountservices.patch/daemon/gdm-session.c (+1/-0)
Makefile.in (+0/-3)
NEWS (+9/-0)
common/Makefile.in (+0/-3)
configure (+10/-37)
configure.ac (+1/-19)
daemon/Makefile.in (+0/-3)
daemon/gdm-session.c (+1/-0)
data/Makefile.in (+0/-3)
data/applications/Makefile.am (+1/-8)
data/applications/Makefile.in (+1/-11)
data/applications/gdm-simple-greeter.desktop (+0/-102)
data/applications/gdm-simple-greeter.desktop.in (+0/-9)
data/applications/gdm-simple-greeter.desktop.in.in (+0/-9)
data/applications/polkit-gnome-authentication-agent-1.desktop (+0/-15)
data/applications/polkit-gnome-authentication-agent-1.desktop.in (+0/-6)
data/applications/polkit-gnome-authentication-agent-1.desktop.in.in (+0/-6)
data/autostart/Makefile.in (+0/-3)
data/pam-redhat/gdm-launch-environment.pam (+0/-1)
data/pixmaps/16x16/Makefile.in (+0/-3)
data/pixmaps/32x32/Makefile.in (+0/-3)
data/pixmaps/48x48/Makefile.in (+0/-3)
data/pixmaps/Makefile.in (+0/-3)
debian/changelog (+10/-0)
debian/control (+5/-5)
debian/control.in (+5/-5)
debian/gdm.preinst (+3/-1)
docs/Makefile.in (+0/-3)
gui/Makefile.in (+0/-3)
gui/simple-chooser/Makefile.in (+0/-3)
libgdm/Makefile.in (+0/-3)
libgdm/gdm-client-glue.h (+1/-1)
libgdm/gdm-client.c (+39/-5)
libgdm/gdm.pc (+1/-1)
po/POTFILES.in (+0/-1)
po/POTFILES.skip (+0/-4)
po/af.po (+443/-566)
po/bn_IN.po (+425/-545)
po/gd.po (+58/-29)
tests/Makefile.in (+0/-3)
utils/Makefile.in (+0/-3)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/gdm/3.14.1
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+243242@code.qastaging.launchpad.net

Description of the change

New upstream release + minor packaging fixes

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Can we merge it from Debian?

Revision history for this message
Jackson Doak (noskcaj) wrote :

Is gdm something that can be merged?

On Mon, Dec 1, 2014 at 7:29 PM, Daniel Holbach <email address hidden>
wrote:

> Can we merge it from Debian?
> --
> https://code.launchpad.net/~noskcaj/ubuntu/vivid/gdm/3.14.1/+merge/243242
> You are the owner of lp:~noskcaj/ubuntu/vivid/gdm/3.14.1.
>

Revision history for this message
Daniel Holbach (dholbach) wrote :

https://packages.debian.org/source/sid/gdm3

Revision history for this message
Jackson Doak (noskcaj) wrote :

I knew of that, but wasn't sure of we actually merged from it anymore
On 2 Dec 2014 20:15, "Daniel Holbach" <email address hidden> wrote:

> https://packages.debian.org/source/sid/gdm3
> --
> https://code.launchpad.net/~noskcaj/ubuntu/vivid/gdm/3.14.1/+merge/243242
> You are the owner of lp:~noskcaj/ubuntu/vivid/gdm/3.14.1.
>

Revision history for this message
Daniel Holbach (dholbach) wrote :

It could be worth having a look at it again, no?

Revision history for this message
Tim Lunn (darkxst) wrote :

yes would be good to merge it again, though it will be a pretty big task, theres quite the delta accumulated since 3.4 days

Revision history for this message
Jackson Doak (noskcaj) wrote :

I'll look into this in the new year, but could the current branch be
sponsored for the moment?
On 22 Dec 2014 10:25, "Tim" <email address hidden> wrote:

> yes would be good to merge it again, though it will be a pretty big task,
> theres quite the delta accumulated since 3.4 days
> --
> https://code.launchpad.net/~noskcaj/ubuntu/vivid/gdm/3.14.1/+merge/243242
> You are the owner of lp:~noskcaj/ubuntu/vivid/gdm/3.14.1.
>

Revision history for this message
Tim Lunn (darkxst) wrote :

Jackson, yes that seems fine to me. I'll upload it later

I took a quick look at things today, there is loads of obsolete cruft in our package, that seems to be inherited from debian, but long since dropped there. I might do this merge...

Revision history for this message
Sebastien Bacher (seb128) wrote :

Tim, do you still plan to upload that one?

Revision history for this message
Tim Lunn (darkxst) wrote :

Seb, I meant too but then got completely messed up in a gdm merge from debian. Since that is almost done, I may just merge Jacksons changed into that that and upload.

btw any objection to renaming gdm to gdm3 to follow debian, would certainly make merges easier

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches