r10875 - in /desktop/unstable/gdm/debian: changelog patches/30_hardcode-standard-x-server.patch patches/59_standard-x-server-detection.patch patches/70_mandatory-relibtoolize.patch patches/series

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue May 8 15:41:20 UTC 2007 

Author: lool
Date: Tue May  8 15:41:16 2007
New Revision: 10875

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10875
Log:
* Rework 30_hardcode-standard-x-server and rename to
  59_standard-x-server-detection; update 70_mandatory-relibtoolize.

Added:
    desktop/unstable/gdm/debian/patches/59_standard-x-server-detection.patch
      - copied, changed from r10782, desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch
Removed:
    desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    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=10875&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue May  8 15:41:16 2007
@@ -6,8 +6,10 @@
   [ Loic Minier ]
   * Pass -Wall to CFLAGS too.
   * Build-depend on xserver-xephyr; thanks Sven Arvidsson; closes: #422287.
-
- -- Loic Minier <lool at dooz.org>  Fri, 04 May 2007 22:28:42 +0200
+  * Rework 30_hardcode-standard-x-server and rename to
+    59_standard-x-server-detection; update 70_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 08 May 2007 17:41:08 +0200
 
 gdm (2.18.1-2) unstable; urgency=low
 

Copied: desktop/unstable/gdm/debian/patches/59_standard-x-server-detection.patch (from r10782, desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/59_standard-x-server-detection.patch?rev=10875&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/30_hardcode-standard-x-server.patch (original)
+++ desktop/unstable/gdm/debian/patches/59_standard-x-server-detection.patch Tue May  8 15:41:16 2007
@@ -1,20 +1,48 @@
-Debian #362925, #363160; Hardcode StandardXServer to /usr/bin/X.
+GNOME #436879; Debian #362925, #363160; Hardcode StandardXServer to /usr/bin/X.
 
 Index: gdm-2.18.1/configure.ac
 ===================================================================
 --- gdm-2.18.1.orig/configure.ac	2007-04-09 07:15:16.000000000 +0200
-+++ gdm-2.18.1/configure.ac	2007-05-02 10:20:56.000000000 +0200
-@@ -1010,7 +1010,12 @@
++++ gdm-2.18.1/configure.ac	2007-05-08 16:23:16.000000000 +0200
+@@ -1010,29 +1010,34 @@
  # symlink to each other, and configure should use the more stable
  # location (the real directory) if possible.
  #
 -if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-+if true; then # debian
++if test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then
+    X_PATH="/usr/X11R6/bin"
+    X_SERVER_PATH="/usr/X11R6/bin"
+    X_SERVER="/usr/X11R6/bin/X"
+    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+    X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
++elif test ! -h /usr/X11 -a ! -h /usr/X11/bin -a -x /usr/X11/bin/X; then
+    X_PATH="/usr/X11/bin"
+    X_SERVER_PATH="/usr/X11/bin"
+    X_SERVER="/usr/X11/bin/X"
+    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+    X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
++elif test -x /usr/bin/X; then
 +   X_PATH="/usr/bin"
 +   X_SERVER_PATH="/usr/bin"
 +   X_SERVER="/usr/bin/X"
+    X_CONFIG_OPTIONS="-audit 0"
+ elif test -x /usr/bin/Xorg; then
+    X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/Xorg"
+    X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11R6/bin/X; then
++   X_PATH="/usr/X11R6/bin"
++   X_SERVER_PATH="/usr/X11R6/bin"
++   X_SERVER="/usr/X11R6/bin/X"
++   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 +   X_CONFIG_OPTIONS="-audit 0"
-+elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-    X_PATH="/usr/X11R6/bin"
-    X_SERVER_PATH="/usr/X11R6/bin"
-    X_SERVER="/usr/X11R6/bin/X"
+ elif test -x /usr/X11/bin/X; then
+    X_PATH="/usr/X11/bin"
+    X_SERVER_PATH="/usr/X11/bin"

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=10875&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch Tue May  8 15:41:16 2007
@@ -7,9 +7,10 @@
 automake-1.9
 rm -rf autom4te.cache
 
-diff -urN gdm-2.18.1.orig/aclocal.m4 gdm-2.18.1/aclocal.m4
+Index: gdm-2.18.1/aclocal.m4
+===================================================================
 --- gdm-2.18.1.orig/aclocal.m4	2007-04-09 07:16:35.000000000 +0200
-+++ gdm-2.18.1/aclocal.m4	2007-05-02 12:03:40.000000000 +0200
++++ gdm-2.18.1/aclocal.m4	2007-05-08 17:12:59.000000000 +0200
 @@ -11,2028 +11,2592 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -6395,9 +6396,10 @@
  
  m4_include([m4/gnome-doc-utils.m4])
  m4_include([m4/intltool.m4])
-diff -urN gdm-2.18.1.orig/config.guess gdm-2.18.1/config.guess
+Index: gdm-2.18.1/config.guess
+===================================================================
 --- gdm-2.18.1.orig/config.guess	2007-04-09 07:17:04.000000000 +0200
-+++ gdm-2.18.1/config.guess	2007-04-20 04:09:10.000000000 +0200
++++ gdm-2.18.1/config.guess	2007-05-08 17:12:59.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -6604,9 +6606,10 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urN gdm-2.18.1.orig/config.sub gdm-2.18.1/config.sub
+Index: gdm-2.18.1/config.sub
+===================================================================
 --- gdm-2.18.1.orig/config.sub	2007-04-09 07:17:04.000000000 +0200
-+++ gdm-2.18.1/config.sub	2007-04-20 04:09:10.000000000 +0200
++++ gdm-2.18.1/config.sub	2007-05-08 17:12:59.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -6908,9 +6911,10 @@
  	mips*-cisco)
  		os=-elf
  		;;
-diff -urN gdm-2.18.1.orig/configure gdm-2.18.1/configure
+Index: gdm-2.18.1/configure
+===================================================================
 --- gdm-2.18.1.orig/configure	2007-04-09 07:16:44.000000000 +0200
-+++ gdm-2.18.1/configure	2007-05-02 12:03:46.000000000 +0200
++++ gdm-2.18.1/configure	2007-05-08 17:13:12.000000000 +0200
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -13978,20 +13982,48 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -34151,7 +31770,12 @@
+@@ -34151,29 +31770,34 @@
  # symlink to each other, and configure should use the more stable
  # location (the real directory) if possible.
  #
 -if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-+if true; then # debian
++if test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then
+    X_PATH="/usr/X11R6/bin"
+    X_SERVER_PATH="/usr/X11R6/bin"
+    X_SERVER="/usr/X11R6/bin/X"
+    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
+    X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
++elif test ! -h /usr/X11 -a ! -h /usr/X11/bin -a -x /usr/X11/bin/X; then
+    X_PATH="/usr/X11/bin"
+    X_SERVER_PATH="/usr/X11/bin"
+    X_SERVER="/usr/X11/bin/X"
+    GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+    X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+-   X_PATH="/usr/X11R6/bin"
+-   X_SERVER_PATH="/usr/X11R6/bin"
+-   X_SERVER="/usr/X11R6/bin/X"
+-   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
++elif test -x /usr/bin/X; then
 +   X_PATH="/usr/bin"
 +   X_SERVER_PATH="/usr/bin"
 +   X_SERVER="/usr/bin/X"
+    X_CONFIG_OPTIONS="-audit 0"
+ elif test -x /usr/bin/Xorg; then
+    X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/Xorg"
+    X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11R6/bin/X; then
++   X_PATH="/usr/X11R6/bin"
++   X_SERVER_PATH="/usr/X11R6/bin"
++   X_SERVER="/usr/X11R6/bin/X"
++   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 +   X_CONFIG_OPTIONS="-audit 0"
-+elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-    X_PATH="/usr/X11R6/bin"
-    X_SERVER_PATH="/usr/X11R6/bin"
-    X_SERVER="/usr/X11R6/bin/X"
+ elif test -x /usr/X11/bin/X; then
+    X_PATH="/usr/X11/bin"
+    X_SERVER_PATH="/usr/X11/bin"
 @@ -34577,7 +32201,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
@@ -14086,9 +14118,10 @@
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2006 Free Software Foundation, Inc.
-diff -urN gdm-2.18.1.orig/gui/Makefile.in gdm-2.18.1/gui/Makefile.in
+Index: gdm-2.18.1/gui/Makefile.in
+===================================================================
 --- gdm-2.18.1.orig/gui/Makefile.in	2007-04-09 07:16:59.000000000 +0200
-+++ gdm-2.18.1/gui/Makefile.in	2007-05-02 12:03:50.000000000 +0200
++++ gdm-2.18.1/gui/Makefile.in	2007-05-08 17:12:59.000000000 +0200
 @@ -114,7 +114,6 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) \
@@ -14131,9 +14164,10 @@
  
  gdmphotosetup_LDADD = \
  	libgdmcommon.a		\
-diff -urN gdm-2.18.1.orig/gui/greeter/Makefile.in gdm-2.18.1/gui/greeter/Makefile.in
+Index: gdm-2.18.1/gui/greeter/Makefile.in
+===================================================================
 --- gdm-2.18.1.orig/gui/greeter/Makefile.in	2007-04-09 07:17:00.000000000 +0200
-+++ gdm-2.18.1/gui/greeter/Makefile.in	2007-05-02 12:03:50.000000000 +0200
++++ gdm-2.18.1/gui/greeter/Makefile.in	2007-05-08 17:12:59.000000000 +0200
 @@ -67,7 +67,6 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -14154,9 +14188,10 @@
  
  EXTRA_DIST = \
  	gdmthemetester.in \
-diff -urN gdm-2.18.1.orig/ltmain.sh gdm-2.18.1/ltmain.sh
+Index: gdm-2.18.1/ltmain.sh
+===================================================================
 --- gdm-2.18.1.orig/ltmain.sh	2007-01-12 06:30:30.000000000 +0100
-+++ gdm-2.18.1/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
++++ gdm-2.18.1/ltmain.sh	2007-05-08 17:12:59.000000000 +0200
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=10875&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Tue May  8 15:41:16 2007
@@ -1,5 +1,4 @@
 20_xdm-stuff.patch
-30_hardcode-standard-x-server.patch
 35_gdm.conf.patch
 37_manpage-binaries.patch
 41_config-files.patch
@@ -14,6 +13,7 @@
 53_remove-ok-and-cancel-from-included-themes.patch
 55_use-theme-gtkrc.patch
 57_gdm-is-local.patch
+59_standard-x-server-detection.patch
 60_logname-is-log-name-in-PostLogin.patch
 61_gdm-manpage-section.patch
 62_reference-manual-docbook-entity-reference.patch

More information about the pkg-gnome-commits mailing list