X Strike Force XFree86 SVN commit: r2129 - in trunk/debian: . patches
Author: branden
Date: 2005-01-11 01:48:21 -0500 (Tue, 11 Jan 2005)
New Revision: 2129
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
Log:
Apply patch to a file that actually exists in the source tree when it is
unpacked.
You learn something new about the source tree every day. 3 X clients hard
link some of their source files from another directory.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-11 06:18:28 UTC (rev 2128)
+++ trunk/debian/CHANGESETS 2005-01-11 06:48:21 UTC (rev 2129)
@@ -127,9 +127,9 @@
document the reason.
2125
-Fix xprop to not bleat a usage message when XOpenDisplay() fails. Being
-unable to connect to the X server is an operational error, not a
-user-input error.
- 2128
+Fix xlsfonts, xprop, xwd, and xwininfo to not bleat a usage message when
+XOpenDisplay() fails. Being unable to connect to the X server is an
+operational error, not a user-input error.
+ 2128, 2129
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-11 06:18:28 UTC (rev 2128)
+++ trunk/debian/changelog 2005-01-11 06:48:21 UTC (rev 2129)
@@ -101,9 +101,9 @@
rejected. If TDFXValidMode() would return MODE_BAD, use xf86DrvMsg() to
document the reason.
- * Fix xprop to not bleat a usage message when XOpenDisplay() fails. Being
- unable to connect to the X server is an operational error, not a
- user-input error.
+ * Fix xlsfonts, xprop, xwd, and xwininfo to not bleat a usage message when
+ XOpenDisplay() fails. Being unable to connect to the X server is an
+ operational error, not a user-input error.
-- Branden Robinson <branden@debian.org> Tue, 11 Jan 2005 01:17:16 -0500
Modified: trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
===================================================================
--- trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff 2005-01-11 06:18:28 UTC (rev 2128)
+++ trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff 2005-01-11 06:48:21 UTC (rev 2129)
@@ -8,10 +8,13 @@
* it is asked for with a --help option or the like.
* the command line is syntactically invalid.
+Because xlsfonts's dsimple.c source file is also used in xprop, xwd, and
+xwininfo, this patch also corrects this behavior for those programs.
+
Not submitted upstream to XFree86 or X.Org.
---- xc/programs/xprop/dsimple.c~ 2005-01-09 02:40:41.000000000 -0500
-+++ xc/programs/xprop/dsimple.c 2005-01-09 02:41:58.000000000 -0500
+--- xc/programs/xlsfonts/dsimple.c~ 2005-01-09 02:40:41.000000000 -0500
++++ xc/programs/xlsfonts/dsimple.c 2005-01-09 02:41:58.000000000 -0500
@@ -144,8 +144,7 @@
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
Reply to: