X Strike Force X.Org X11 SVN commit: r32 - in trunk: debian debian/patches xc/config/cf
Author: branden
Date: 2005-03-10 14:49:25 -0500 (Thu, 10 Mar 2005)
New Revision: 32
Added:
trunk/debian/patches/
trunk/debian/patches/0000_backport_from_upstream.diff
Modified:
trunk/debian/changelog
trunk/xc/config/cf/linux.cf
Log:
Backport fix from upstream CVS trunk:
+ Shut up (tons of) Imake warnings on Debian systems by testing for
variable being defined before testing its value. (Presumably the
fallback definition of NothingOutsideProjectRoot in Imake.tmpl was
intended to prevent this, but it apparently is not in effect yet
when linux.cf is parsed.)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-03-10 07:27:07 UTC (rev 31)
+++ trunk/debian/changelog 2005-03-10 19:49:25 UTC (rev 32)
@@ -16,8 +16,15 @@
build-essential package libc6-dev), bzip2 and dbs (new organization of
source package will not require these).
- -- Branden Robinson <branden@debian.org> Wed, 9 Mar 2005 19:22:02 -0500
+ * Backport fix from upstream CVS trunk:
+ + Shut up (tons of) Imake warnings on Debian systems by testing for
+ variable being defined before testing its value. (Presumably the
+ fallback definition of NothingOutsideProjectRoot in Imake.tmpl was
+ intended to prevent this, but it apparently is not in effect yet
+ when linux.cf is parsed.)
+ -- Branden Robinson <branden@debian.org> Thu, 10 Mar 2005 14:47:41 -0500
+
$Id$
vim:set ai et sts=2 sw=2 tw=78:
Added: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff 2005-03-10 07:27:07 UTC (rev 31)
+++ trunk/debian/patches/0000_backport_from_upstream.diff 2005-03-10 19:49:25 UTC (rev 32)
@@ -0,0 +1,44 @@
+$Id$
+
+2005-03-06 Branden Robinson <branden@debian.org>
+
+ * xc/config/cf/linux.cf
+ Shut up (tons of) Imake warnings on Debian systems by testing for
+ variable being defined before testing its value. (Presumably the
+ fallback definition of NothingOutsideProjectRoot in Imake.tmpl was
+ intended to prevent this, but it apparently is not in effect yet
+ when linux.cf is parsed.)
+
+Index: xc/config/cf/linux.cf
+===================================================================
+RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
+retrieving revision 1.23
+retrieving revision 1.24
+diff -u -r1.23 -r1.24
+--- xc/config/cf/linux.cf 1 Feb 2005 02:02:31 -0000 1.23
++++ xc/config/cf/linux.cf 6 Mar 2005 01:05:00 -0000 1.24
+@@ -95,13 +95,13 @@
+ XCOMM binutils: (LinuxBinUtilsMajorVersion)
+
+ #if LinuxDistribution == LinuxDebian
+-# if !NothingOutsideProjectRoot
++# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ # define SystemManDirectory /usr/share/man
+ # endif
+ # define HasPam YES
+ /* un-comment this when it is un-broken */
+ /* # define JoystickSupport YES */
+-# if !NothingOutsideProjectRoot
++# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ # define XAppLoadDir EtcX11Directory/app-defaults
+ # define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+ /* the relative symlink created by this rule causes problems for us */
+@@ -112,7 +112,7 @@
+ # define InstallAppDefaultsLong(file,class) @@\
+ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+ # endif /* InstallAppDefFiles */
+-# endif /* !NothingOutsideProjectRoot */
++# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
+ # define SharedLibXdmGreet NO
+ # define LinkGLToUsrInclude NO
+ # define LinkGLToUsrLib NO
Property changes on: trunk/debian/patches/0000_backport_from_upstream.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/xc/config/cf/linux.cf
===================================================================
--- trunk/xc/config/cf/linux.cf 2005-03-10 07:27:07 UTC (rev 31)
+++ trunk/xc/config/cf/linux.cf 2005-03-10 19:49:25 UTC (rev 32)
@@ -95,13 +95,13 @@
XCOMM binutils: (LinuxBinUtilsMajorVersion)
#if LinuxDistribution == LinuxDebian
-# if !NothingOutsideProjectRoot
+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
# endif
# define HasPam YES
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-# if !NothingOutsideProjectRoot
+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
# define XAppLoadDir EtcX11Directory/app-defaults
# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
/* the relative symlink created by this rule causes problems for us */
@@ -112,7 +112,7 @@
# define InstallAppDefaultsLong(file,class) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
# endif /* InstallAppDefFiles */
-# endif /* !NothingOutsideProjectRoot */
+# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
# define SharedLibXdmGreet NO
# define LinkGLToUsrInclude NO
# define LinkGLToUsrLib NO
Reply to: