r24060 - in /desktop/unstable/gdm3/debian: changelog control control.in patches/16_xserver_path.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Apr 27 19:31:27 UTC 2010
Author: joss
Date: Tue Apr 27 19:31:27 2010
New Revision: 24060
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24060
Log:
* Pass X_PATH et al. through DEB_CONFIGURE_SCRIPT_ENV.
* 16_xserver_path.patch: use the environment variables when they
exist. Based on a patch by Julien Cristau.
* Stop build-depending on xserver-xorg.
Added:
desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/control
desktop/unstable/gdm3/debian/control.in
desktop/unstable/gdm3/debian/patches/series
desktop/unstable/gdm3/debian/rules
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24060&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Tue Apr 27 19:31:27 2010
@@ -1,3 +1,12 @@
+gdm3 (2.30.2-2) UNRELEASED; urgency=low
+
+ * Pass X_PATH et al. through DEB_CONFIGURE_SCRIPT_ENV.
+ * 16_xserver_path.patch: use the environment variables when they
+ exist. Based on a patch by Julien Cristau.
+ * Stop build-depending on xserver-xorg.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 27 Apr 2010 21:26:58 +0200
+
gdm3 (2.30.2-1) unstable; urgency=low
* Break orca < 2.30.0-2 just to be sure.
Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=24060&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control [utf-8] Tue Apr 27 19:31:27 2010
@@ -40,7 +40,6 @@
libattr1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
iso-codes,
libaudit-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- xserver-xorg,
docbook-xml
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=24060&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Tue Apr 27 19:31:27 2010
@@ -35,7 +35,6 @@
libattr1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
iso-codes,
libaudit-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- xserver-xorg,
docbook-xml
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Added: desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/16_xserver_path.patch?rev=24060&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/16_xserver_path.patch (added)
+++ desktop/unstable/gdm3/debian/patches/16_xserver_path.patch [utf-8] Tue Apr 27 19:31:27 2010
@@ -1,0 +1,16 @@
+Index: gdm-2.30.2/configure.ac
+===================================================================
+--- gdm-2.30.2.orig/configure.ac 2010-04-27 21:27:38.177532027 +0200
++++ gdm-2.30.2/configure.ac 2010-04-27 21:29:03.733526716 +0200
+@@ -1129,7 +1129,10 @@ dnl ------------------------------------
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
++if test -n "$X_PATH"; then
++ # assume the user set these variables and don't second-guess them.
++ true
++elif test -x /usr/X11/bin/Xserver; then
+ X_PATH="/usr/X11/bin"
+ X_SERVER_PATH="/usr/X11/bin"
+ X_SERVER="/usr/X11/bin/Xserver"
Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24060&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Tue Apr 27 19:31:27 2010
@@ -15,4 +15,5 @@
13_gdmsetup_desktop.patch
14_bindv6only.patch
15_kfreebsd.patch
+16_xserver_path.patch
90_relibtoolize.patch
Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=24060&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Tue Apr 27 19:31:27 2010
@@ -8,6 +8,11 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gdm
+
+DEB_CONFIGURE_SCRIPT_ENV += X_PATH="/usr/bin" \
+ X_SERVER_PATH="/usr/bin" \
+ X_SERVER="/usr/bin/Xorg" \
+ X_CONFIG_OPTIONS="-audit 0"
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
--enable-ipv6=yes \
More information about the pkg-gnome-commits
mailing list