r11203 - in /desktop/unstable/gdm/debian: changelog control control.in gdm.install gdmXnestWrapper patches/56_xnest-wrapper.patch patches/70_mandatory-relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue May 29 17:32:25 UTC 2007
Author: joss
Date: Tue May 29 17:32:25 2007
New Revision: 11203
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11203
Log:
* gdmXnestWrapper: provide a wrapper script for both nested X servers.
+ gdm.install: install it.
+ 56_xnest-wrapper.patch: force its use in configure.ac.
+ 70_mandatory-relibtoolize.patch: refresh configure.
+ Stop build-depending on xserver-xephyr.
Added:
desktop/unstable/gdm/debian/gdmXnestWrapper (with props)
desktop/unstable/gdm/debian/patches/56_xnest-wrapper.patch
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/control
desktop/unstable/gdm/debian/control.in
desktop/unstable/gdm/debian/gdm.install
desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch
desktop/unstable/gdm/debian/patches/series
Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue May 29 17:32:25 2007
@@ -1,3 +1,13 @@
+gdm (2.18.2-2) UNRELEASED; urgency=low
+
+ * gdmXnestWrapper: provide a wrapper script for both nested X servers.
+ + gdm.install: install it.
+ + 56_xnest-wrapper.patch: force its use in configure.ac.
+ + 70_mandatory-relibtoolize.patch: refresh configure.
+ + Stop build-depending on xserver-xephyr.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 29 May 2007 19:31:59 +0200
+
gdm (2.18.2-1) unstable; urgency=low
[ Sam Morris ]
Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Tue May 29 17:32:25 2007
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Loic Minier <lool at dooz.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
Build-Depends: libpam0g-dev,
libgnomeui-dev,
librsvg2-dev,
@@ -24,8 +24,7 @@
gnome-pkg-tools,
quilt,
libdbus-glib-1-dev (>= 0.30),
- x11proto-core-dev,
- xserver-xephyr
+ x11proto-core-dev
Standards-Version: 3.7.2
Package: gdm
Modified: desktop/unstable/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control.in?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control.in (original)
+++ desktop/unstable/gdm/debian/control.in Tue May 29 17:32:25 2007
@@ -24,8 +24,7 @@
gnome-pkg-tools,
quilt,
libdbus-glib-1-dev (>= 0.30),
- x11proto-core-dev,
- xserver-xephyr
+ x11proto-core-dev
Standards-Version: 3.7.2
Package: gdm
Modified: desktop/unstable/gdm/debian/gdm.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.install?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.install (original)
+++ desktop/unstable/gdm/debian/gdm.install Tue May 29 17:32:25 2007
@@ -2,6 +2,7 @@
debian/locale.conf etc/gdm
debian/Xsession etc/gdm
debian/debian-moreblue usr/share/gdm/themes
+debian/gdmXnestWrapper usr/share/gdm/
debian/tmp/etc/dm
debian/tmp/etc/gdm/Init
debian/tmp/etc/gdm/PreSession
Added: desktop/unstable/gdm/debian/gdmXnestWrapper
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdmXnestWrapper?rev=11203&op=file
==============================================================================
--- desktop/unstable/gdm/debian/gdmXnestWrapper (added)
+++ desktop/unstable/gdm/debian/gdmXnestWrapper Tue May 29 17:32:25 2007
@@ -1,0 +1,12 @@
+#! /bin/sh
+
+if [ -x /usr/bin/Xephyr ]; then
+ exec /usr/bin/Xephyr "$@"
+fi
+
+if [ -x /usr/bin/Xnest ]; then
+ exec /usr/bin/Xnest -name Xnest "$@"
+fi
+
+echo "Cannot find nested X server, exiting..." >&2
+exit 1
Propchange: desktop/unstable/gdm/debian/gdmXnestWrapper
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/gdm/debian/patches/56_xnest-wrapper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/56_xnest-wrapper.patch?rev=11203&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/56_xnest-wrapper.patch (added)
+++ desktop/unstable/gdm/debian/patches/56_xnest-wrapper.patch Tue May 29 17:32:25 2007
@@ -1,0 +1,38 @@
+Index: gdm-2.18.2/configure.ac
+===================================================================
+--- gdm-2.18.2.orig/configure.ac 2007-05-29 19:06:44.749348250 +0200
++++ gdm-2.18.2/configure.ac 2007-05-29 19:08:36.096307000 +0200
+@@ -1074,29 +1074,10 @@
+ GDM_USER_PATH="$GDM_USER_PATH:${bindir}"
+ fi
+
+-# Use Xephyr if it is available. It works better than Xnest since Xephyr
+-# supports the Xserver extensions, even if on a remote machine.
+-#
+-if test -x $X_SERVER_PATH/Xephyr; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xephyr"
+- X_XNEST_CONFIG_OPTIONS="-audit 0"
+- X_XNEST_UNSCALED_FONTPATH="true"
+-else
+- if test -x /usr/openwin/bin/Xnest; then
+- # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
+- # use this version.
+- #
+- X_XNEST_CMD="/usr/openwin/bin/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
+- X_XNEST_UNSCALED_FONTPATH="false"
+- else
+- if test -x $X_SERVER_PATH/Xnest; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
+- X_XNEST_UNSCALED_FONTPATH="true"
+- fi
+- fi
+-fi
++# Use the wrapper script for the nested X server
++X_XNEST_CMD=/usr/share/gdm/gdmXnestWrapper
++X_XNEST_CONFIG_OPTIONS="-audit 0"
++X_XNEST_UNSCALED_FONTPATH="true"
+
+ # Set POST_PATH after doing system specific case above just in case
+ # any platforms want to update the PATH for a specific OS or distro.
Modified: desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch Tue May 29 17:32:25 2007
@@ -10,7 +10,7 @@
Index: gdm-2.18.2/aclocal.m4
===================================================================
--- gdm-2.18.2.orig/aclocal.m4 2007-05-29 02:34:10.000000000 +0200
-+++ gdm-2.18.2/aclocal.m4 2007-05-29 10:56:39.000000000 +0200
++++ gdm-2.18.2/aclocal.m4 2007-05-29 19:09:28.971611500 +0200
@@ -587,34 +587,9 @@
AC_SUBST(WARN_CXXFLAGS)
])
@@ -282,7 +282,7 @@
Index: gdm-2.18.2/configure
===================================================================
--- gdm-2.18.2.orig/configure 2007-05-29 02:34:14.000000000 +0200
-+++ gdm-2.18.2/configure 2007-05-29 10:56:39.000000000 +0200
++++ gdm-2.18.2/configure 2007-05-29 19:09:55.737284250 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -7553,7 +7553,41 @@
elif test -x /usr/X11/bin/X; then
X_PATH="/usr/X11/bin"
X_SERVER_PATH="/usr/X11/bin"
-@@ -34646,7 +32201,8 @@
+@@ -34284,29 +31839,10 @@
+ GDM_USER_PATH="$GDM_USER_PATH:${bindir}"
+ fi
+
+-# Use Xephyr if it is available. It works better than Xnest since Xephyr
+-# supports the Xserver extensions, even if on a remote machine.
+-#
+-if test -x $X_SERVER_PATH/Xephyr; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xephyr"
+- X_XNEST_CONFIG_OPTIONS="-audit 0"
+- X_XNEST_UNSCALED_FONTPATH="true"
+-else
+- if test -x /usr/openwin/bin/Xnest; then
+- # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
+- # use this version.
+- #
+- X_XNEST_CMD="/usr/openwin/bin/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
+- X_XNEST_UNSCALED_FONTPATH="false"
+- else
+- if test -x $X_SERVER_PATH/Xnest; then
+- X_XNEST_CMD="$X_SERVER_PATH/Xnest"
+- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
+- X_XNEST_UNSCALED_FONTPATH="true"
+- fi
+- fi
+-fi
++# Use the wrapper script for the nested X server
++X_XNEST_CMD=/usr/share/gdm/gdmXnestWrapper
++X_XNEST_CONFIG_OPTIONS="-audit 0"
++X_XNEST_UNSCALED_FONTPATH="true"
+
+ # Set POST_PATH after doing system specific case above just in case
+ # any platforms want to update the PATH for a specific OS or distro.
+@@ -34646,7 +32182,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -7563,7 +7597,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -34655,10 +32211,13 @@
+@@ -34655,10 +32192,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -7580,7 +7614,7 @@
# PATH needs CR
-@@ -34882,19 +32441,28 @@
+@@ -34882,19 +32422,28 @@
as_mkdir_p=false
fi
@@ -7620,7 +7654,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -34910,7 +32478,7 @@
+@@ -34910,7 +32459,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
@@ -7629,7 +7663,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -34939,7 +32507,7 @@
+@@ -34939,7 +32488,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -7638,7 +7672,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -34963,7 +32531,7 @@
+@@ -34963,7 +32512,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -7650,7 +7684,7 @@
Index: gdm-2.18.2/gui/Makefile.in
===================================================================
--- gdm-2.18.2.orig/gui/Makefile.in 2007-05-29 02:34:17.000000000 +0200
-+++ gdm-2.18.2/gui/Makefile.in 2007-05-29 10:56:39.000000000 +0200
++++ gdm-2.18.2/gui/Makefile.in 2007-05-29 19:09:29.007613750 +0200
@@ -114,7 +114,6 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \
@@ -7696,7 +7730,7 @@
Index: gdm-2.18.2/gui/greeter/Makefile.in
===================================================================
--- gdm-2.18.2.orig/gui/greeter/Makefile.in 2007-05-29 02:34:18.000000000 +0200
-+++ gdm-2.18.2/gui/greeter/Makefile.in 2007-05-29 10:56:39.000000000 +0200
++++ gdm-2.18.2/gui/greeter/Makefile.in 2007-05-29 19:09:29.007613750 +0200
@@ -67,7 +67,6 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -7720,7 +7754,7 @@
Index: gdm-2.18.2/ltmain.sh
===================================================================
--- gdm-2.18.2.orig/ltmain.sh 2006-11-08 17:23:53.000000000 +0100
-+++ gdm-2.18.2/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
++++ gdm-2.18.2/ltmain.sh 2007-05-29 19:09:29.011614000 +0200
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -7756,8 +7790,8 @@
no)
Index: gdm-2.18.2/config.guess
===================================================================
---- gdm-2.18.2.orig/config.guess 2007-05-29 10:56:49.000000000 +0200
-+++ gdm-2.18.2/config.guess 2007-04-20 04:09:10.000000000 +0200
+--- gdm-2.18.2.orig/config.guess 2007-05-29 02:34:20.000000000 +0200
++++ gdm-2.18.2/config.guess 2007-05-29 19:09:29.011614000 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -7966,8 +8000,8 @@
#echo '(No uname command or uname output not recognized.)' 1>&2
Index: gdm-2.18.2/config.sub
===================================================================
---- gdm-2.18.2.orig/config.sub 2007-05-29 10:56:51.000000000 +0200
-+++ gdm-2.18.2/config.sub 2007-04-20 04:09:10.000000000 +0200
+--- gdm-2.18.2.orig/config.sub 2007-05-29 02:34:20.000000000 +0200
++++ gdm-2.18.2/config.sub 2007-05-29 19:09:29.015614250 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=11203&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Tue May 29 17:32:25 2007
@@ -10,6 +10,7 @@
50_close-fds.patch
51_misc-env-var-fixes.patch
55_use-theme-gtkrc.patch
+56_xnest-wrapper.patch
57_gdm-is-local.patch
58_is-local-check-null.patch
59_standard-x-server-detection.patch
More information about the pkg-gnome-commits
mailing list