Re: Merging the new ldm

On Tue, 2010-10-05 at 09:53 -0400, Jim McQuillan wrote:
> Stephane,
> 
> Sounds fantastic.  Looking forward to seeing it.
> 
> Jim.

I just finished doing the merge (by hand ...).
We have:
 Removed: 5
 Added: 30
 Modified: 12

Attached is the full list of changes and diffs.

I haven't tried building the current ldm-trunk though I'd think it's
going to build just fine without any "required" packaging changes.

At this point I wouldn't recommend it for use in production but I
believe it'd be great to have each maintainer to test it on its distro
and provide feedback/fix bugs.

I'll probably start testing it by deploying it on our thin clients at
Revolution Linux and improve/fix as we discover new issues.

There was a few issues during the merge of that branch as the source
branch was far from clean and quite outdated. I believe I managed to
cleanup the history so that it doesn't contain any weirdness anymore.
If someone notices some other weirdness, please let me know and I'll see
if I can alter the history to fix it.

Branch is: lp:~ltsp-upstream/ltsp/ldm-trunk
Revision is: 1284
Last old LDM revision is: 1279

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb

_____________________________________________________________________
Ltsp-developer mailing list.   To un-subscribe, or change prefs, goto:
      https://lists.sourceforge.net/lists/listinfo/ltsp-developer
For additional LTSP help,   try #ltsp channel on irc.freenode.net

removed:
  src/get_ip.c
  src/greeter_iface.c
  src/ldm-getenv-bool.c
  src/ldm-getenv-bool.h
  src/sshutils.c
added:
  gtkgreet/prefs.c
  gtkgreet/prefs.h
  gtkgreet/prefwin.c
  gtkgreet/prefwin.h
  src/ldmgreetercomm.c
  src/ldmgreetercomm.h
  src/ldmplugin.c
  src/ldmplugin.h
  src/ldmutils.c
  src/ldmutils.h
  src/plugin.c
  src/plugin.h
  src/plugins/
  src/plugins/rdesktop/
  src/plugins/rdesktop/Makefile.am
  src/plugins/rdesktop/rdesktop.c
  src/plugins/rdesktop/rdesktop.h
  src/plugins/ssh/
  src/plugins/ssh/Makefile.am
  src/plugins/ssh/ssh.c
  src/plugins/ssh/ssh.h
  wwm/
  wwm/Makefile.am
  wwm/README
  wwm/client.c
  wwm/events.c
  wwm/main.c
  wwm/mapfunctions.c
  wwm/misc.c
  wwm/new.c
  wwm/screen.c
  wwm/sendkey.c
  wwm/wwm-defaults.h
  wwm/wwm.h
modified:
  Makefile.am
  autogen.sh
  configure.ac
  gtkgreet/Makefile.am
  gtkgreet/greeter.c
  gtkgreet/greeter.h
  po/POTFILES.in
  src/Makefile.am
  src/ldm.c
  src/ldm.h
  src/ldminfo.c
  src/ldminfo.h

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkyrnZAACgkQjxyfqkjBhuyZxwCeNw+N5N9H6bXFxCXdqzQoGaDY
bXUAnjjUrDss6McHKSvfeiYyG4p66pbT
=wSG3
-----END PGP SIGNATURE-----