diff -Nru ldm-2.2.8/ChangeLog ldm-2.2.9/ChangeLog --- ldm-2.2.8/ChangeLog 2012-03-30 16:12:22.000000000 +0000 +++ ldm-2.2.9/ChangeLog 2012-04-13 16:20:18.000000000 +0000 @@ -1,3 +1,25 @@ + 1432 Vagrant Cascadian 2012-04-13 {ldm-2.2.9} + version 2.2.9 + + 1431 Alkis Georgopoulos 2012-04-12 + Don't set LIBGL_ALWAYS_INDIRECT for fat clients. + + 1430 Alkis Georgopoulos 2012-04-12 + X51-opengl: fix broken client environment (LP: #979472). + + 1429 Stéphane Graber 2012-04-03 + Move xcompmgr from running when DISABLE_XCOMPMGR isn't set to when + LDM_XCOMPMGR is set. That's motivated by the fact that metacity + now supports compositing and it should be done there when possible. + + 1428 Vagrant Cascadian 2012-04-02 + fall back to ltsp-common-functions to avoid issues with backwards + compatibility. + + 1427 Alkis Georgopoulos 2012-03-31 + ldm-script.in: source ltsp-client-functions instead of + ltsp-common-functions. + 1426 Vagrant Cascadian 2012-03-30 {ldm-2.2.8} version 2.2.8 diff -Nru ldm-2.2.8/configure.ac ldm-2.2.9/configure.ac --- ldm-2.2.8/configure.ac 2012-03-30 16:12:20.000000000 +0000 +++ ldm-2.2.9/configure.ac 2012-04-13 16:20:16.000000000 +0000 @@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4]) PACKAGE=ldm -VERSION=2.2.8 +VERSION=2.2.9 AUTHOR=sbalneav@ltsp.org AM_INIT_AUTOMAKE([$PACKAGE],[$VERSION],[$AUTHOR]) diff -Nru ldm-2.2.8/debian/changelog ldm-2.2.9/debian/changelog --- ldm-2.2.8/debian/changelog 2012-03-30 16:32:29.000000000 +0000 +++ ldm-2.2.9/debian/changelog 2012-04-13 16:37:57.000000000 +0000 @@ -1,3 +1,17 @@ +ldm (2:2.2.9-1) unstable; urgency=low + + * New upstream version: + - Don't use indirect rendering for fat clients. + - X51-opengl: Fix broken client environment (LP: #979472). + - Only enable xcompmgr if LDM_XCOMPMGR boolean is set appropriately. + - ldm-script: source ltsp-client-functions, falling back to + ltsp-common-functions if not available. + + * Update debian/patches/remove-hackish-gettext-function. + * Update debian/copyright. + + -- Vagrant Cascadian Fri, 13 Apr 2012 09:37:55 -0700 + ldm (2:2.2.8-1) unstable; urgency=low * New upstream version: diff -Nru ldm-2.2.8/debian/copyright ldm-2.2.9/debian/copyright --- ldm-2.2.8/debian/copyright 2012-02-24 20:08:48.000000000 +0000 +++ ldm-2.2.9/debian/copyright 2012-04-13 16:33:54.000000000 +0000 @@ -1,10 +1,10 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 -Upstream-Maintainer: LTSP upstream team +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Contact: LTSP upstream team Upstream-Name: ldm Upstream-Source: http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk/ Files: debian/* -Copyright: 2007-2009 Vagrant Cascadian +Copyright: 2007-2012 Vagrant Cascadian 2009 Ryan Niebur License: GPL-2+ @@ -39,13 +39,23 @@ Copyright: 2007 Oliver Grawert 2007 Scott Balneaves 2008 Ryan Niebur -License GPL-2 +License: GPL-2 Files: gtkgreet/hostwin.c Copyright: 2007 Oliver Grawert 2008 Toshio Kuratomi License: GPL-2 +Files: gtkgreet/prefs.h gtkgreet/prefs.c gtkgreet/prefwin.c gtkgreet/prefwin.h +Copyright: + 2010 Simon Poirier, +License: GPL-2+ + +Files: src/logging.c +License: GPL-2+ +Copyright: + 2010 Stéphane Graber , Revolution Linux + Files: src/ldm.c Copyright: 2007-2008 Scott Balneaves 2005-2007 Oliver Grawert @@ -105,11 +115,23 @@ Copyright: 2007 Canonical Ltd License: GPL-2+ +Files: wwm/* +Copyright: + 2010 Scott Balneaves + 1999-2001 Ciaran Anscomb + 1998-2000 Decklin Foster + 1994 David Hogan + 2010-2012 Stéphane Graber + 2010 David Goulet + 2010 Simon Poirier + 2010 Vincent Vinet +License: evilwm-aewm-9wm + License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2. - + . On Debian and Ubuntu systems, a copy of the GNU General Public License version 2 may be found in the file /usr/share/common-licenses/GPL-2. @@ -118,6 +140,42 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + . On Debian and Ubuntu systems, a copy of the GNU General Public License version 2 may be found in the file /usr/share/common-licenses/GPL-2. + +License: evilwm-aewm-9wm + This is free software. You can do what you want to it, but if it + breaks something, you get to pay for the counselling. The code was + originally based on aewm, so this is distributed under the same terms, + which follow. + . + AEWM LICENCE + . + Copyright (c) 1998-2000 Decklin Foster. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS + OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE + HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM. + . + You are granted permission to copy, publish, distribute, and/or sell + copies of this program and any modified versions or derived works, + provided that this copyright and notice are not removed or altered. + . + Portions of the code were based on 9wm, which contains this license: + . + > 9wm is free software, and is Copyright (c) 1994 by David Hogan. + > Permission is granted to all sentient beings to use this software, + > to make copies of it, and to distribute those copies, provided + > that: + > + > (1) the copyright and licence notices are left intact + > (2) the recipients are aware that it is free software + > (3) any unapproved changes in functionality are either + > (i) only distributed as patches + > or (ii) distributed as a new program which is not called 9wm + > and whose documentation gives credit where it is due + > (4) the author is not held responsible for any defects + > or shortcomings in the software, or damages caused by it. + > + > There is no warranty for this software. Have a nice day. diff -Nru ldm-2.2.8/debian/patches/remove-hackish-gettext-function ldm-2.2.9/debian/patches/remove-hackish-gettext-function --- ldm-2.2.8/debian/patches/remove-hackish-gettext-function 2012-02-24 20:08:48.000000000 +0000 +++ ldm-2.2.9/debian/patches/remove-hackish-gettext-function 2012-04-13 15:05:44.000000000 +0000 @@ -6,10 +6,10 @@ ## DP: implementation, which may have security issues. @DPATCH@ -Index: ldm-2.1.2/share/ldm-script.in +Index: ldm-trunk/share/ldm-script.in =================================================================== ---- ldm-2.1.2.orig/share/ldm-script.in 2010-08-05 22:24:51.000000000 -0400 -+++ ldm-2.1.2/share/ldm-script.in 2010-08-05 22:27:26.000000000 -0400 +--- ldm-trunk.orig/share/ldm-script.in 2012-04-02 13:22:31.963008519 -0700 ++++ ldm-trunk/share/ldm-script.in 2012-04-13 08:05:38.170045995 -0700 @@ -34,17 +34,7 @@ export TEXTDOMAIN=ldmrc @@ -27,5 +27,5 @@ -fi +. /usr/bin/gettext.sh - # source common functions - if [ -f "/usr/share/ltsp/ltsp-common-functions" ]; then + # source ltsp client functions + if [ -f "/usr/share/ltsp/ltsp-client-functions" ]; then diff -Nru ldm-2.2.8/rc.d/X51-opengl ldm-2.2.9/rc.d/X51-opengl --- ldm-2.2.8/rc.d/X51-opengl 2012-03-30 16:12:20.000000000 +0000 +++ ldm-2.2.9/rc.d/X51-opengl 2012-04-13 16:20:16.000000000 +0000 @@ -1,5 +1,5 @@ # Force indirect rendering when using LDM_DIRECTX so we have some working GL by default -if boolean_is_true "$LDM_DIRECTX"; then - export CLIENT_ENV="$(ClIENT_ENV) LIBGL_ALWAYS_INDIRECT=true" +if boolean_is_true "$LDM_DIRECTX" && ! boolean_is_true "$LTSP_FATCLIENT"; then + CLIENT_ENV="$CLIENT_ENV LIBGL_ALWAYS_INDIRECT=true" fi diff -Nru ldm-2.2.8/rc.d/X52-xcompmgr ldm-2.2.9/rc.d/X52-xcompmgr --- ldm-2.2.8/rc.d/X52-xcompmgr 2012-03-30 16:12:20.000000000 +0000 +++ ldm-2.2.9/rc.d/X52-xcompmgr 2012-04-13 16:20:16.000000000 +0000 @@ -1,5 +1,5 @@ # Turn on compositing to improve performance and lower bandwidth usage -if ! boolean_is_true "$DISABLE_XCOMPMGR" && [ -n "$(which xcompmgr)" ]; then +if boolean_is_true "$LDM_XCOMPMGR" && [ -n "$(which xcompmgr)" ]; then xcompmgr -a& fi diff -Nru ldm-2.2.8/share/ldm-script.in ldm-2.2.9/share/ldm-script.in --- ldm-2.2.8/share/ldm-script.in 2012-03-30 16:12:20.000000000 +0000 +++ ldm-2.2.9/share/ldm-script.in 2012-04-13 16:20:16.000000000 +0000 @@ -46,8 +46,11 @@ } fi -# source common functions -if [ -f "/usr/share/ltsp/ltsp-common-functions" ]; then +# source ltsp client functions +if [ -f "/usr/share/ltsp/ltsp-client-functions" ]; then + . /usr/share/ltsp/ltsp-client-functions +# source older common functions for backwards compatibility +elif [ -f "/usr/share/ltsp/ltsp-common-functions" ]; then . /usr/share/ltsp/ltsp-common-functions fi