X Strike Force X.Org X11 SVN commit: r1344 - in branches/modular/app/xbase-clients/debian: . patches
Author: dnusinow
Date: 2006-02-26 22:37:22 -0500 (Sun, 26 Feb 2006)
New Revision: 1344
Added:
branches/modular/app/xbase-clients/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
* Port patches from trunk
+ general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 03:10:59 UTC (rev 1343)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 03:37:22 UTC (rev 1344)
@@ -10,8 +10,9 @@
+ general/025c_bitmap_manpage_typo.diff
+ general/025d_xedit_manpage_typos.diff
+ general/025e_xvinfo_manpage_typo.diff
+ + general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 20:38:37 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 22:36:47 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/app/xbase-clients/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff 2006-02-27 03:10:59 UTC (rev 1343)
+++ branches/modular/app/xbase-clients/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff 2006-02-27 03:37:22 UTC (rev 1344)
@@ -0,0 +1,29 @@
+$Id: 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 480 2005-08-02 20:14:26Z branden $
+
+This patch by Branden Robinson.
+
+General philosophy:
+
+The user should only be shown a usage messages when:
+ * 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.
+
+Index: xlsfonts-X11R7.0-1.0.1/dsimple.c
+===================================================================
+--- xlsfonts-X11R7.0-1.0.1/dsimple.c.orig 2006-02-18 14:55:15.000000000 -0500
++++ xlsfonts-X11R7.0-1.0.1/dsimple.c 2006-02-26 22:36:04.000000000 -0500
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit (1);
+ }
+
+ return(d);
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 03:10:59 UTC (rev 1343)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 03:37:22 UTC (rev 1344)
@@ -5,3 +5,4 @@
05_bitmap_manpage_typo.diff
06_xedit_manpage_typos.diff
07_xvinfo_manpage_typo.diff
+08_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
Reply to: