X Strike Force X.Org X11 SVN commit: r1340 - in branches/modular/app/xbase-clients/debian: . patches
Author: dnusinow
Date: 2006-02-26 20:40:52 -0500 (Sun, 26 Feb 2006)
New Revision: 1340
Added:
branches/modular/app/xbase-clients/debian/patches/04_xev_flush_standard_output.diff
branches/modular/app/xbase-clients/debian/patches/05_bitmap_manpage_typo.diff
branches/modular/app/xbase-clients/debian/patches/06_xedit_manpage_typos.diff
branches/modular/app/xbase-clients/debian/patches/07_xvinfo_manpage_typo.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
* Port patches from trunk
+ general/073_xev_flush_standard_output.diff
+ general/025c_bitmap_manpage_typo.diff
+ general/025d_xedit_manpage_typos.diff
+ general/025e_xvinfo_manpage_typo.diff
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 01:40:52 UTC (rev 1340)
@@ -7,8 +7,11 @@
+ general/014_startx_hostname_fix.diff
+ general/015_startx_dummy_fix.diff
+ general/073_xev_flush_standard_output.diff
+ + general/025c_bitmap_manpage_typo.diff
+ + general/025d_xedit_manpage_typos.diff
+ + general/025e_xvinfo_manpage_typo.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 19:51:16 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 20:38:37 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/app/xbase-clients/debian/patches/04_xev_flush_standard_output.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/04_xev_flush_standard_output.diff 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/patches/04_xev_flush_standard_output.diff 2006-02-27 01:40:52 UTC (rev 1340)
@@ -0,0 +1,20 @@
+$Id$
+
+Flush standard output after processing each event, since xev's exit(0) is
+unreachable code.
+
+This patch by Branden Robinson. Thanks to Bill Currie for identifying the
+problem and the solution. See Debian bug #238638.
+
+Index: xbase-clients/xev-X11R7.0-1.0.1/xev.c
+===================================================================
+--- xbase-clients.orig/xev-X11R7.0-1.0.1/xev.c 2006-02-18 14:56:32.000000000 -0500
++++ xbase-clients/xev-X11R7.0-1.0.1/xev.c 2006-02-26 19:50:37.000000000 -0500
+@@ -1045,6 +1045,7 @@
+ printf ("Unknown event type %d\n", event.type);
+ break;
+ }
++ fflush(stdout);
+ }
+
+ XCloseDisplay (dpy);
Added: branches/modular/app/xbase-clients/debian/patches/05_bitmap_manpage_typo.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/05_bitmap_manpage_typo.diff 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/patches/05_bitmap_manpage_typo.diff 2006-02-27 01:40:52 UTC (rev 1340)
@@ -0,0 +1,13 @@
+Index: xbase-clients/bitmap-X11R7.0-1.0.1/bitmap.man
+===================================================================
+--- xbase-clients.orig/bitmap-X11R7.0-1.0.1/bitmap.man 2006-02-18 14:55:39.000000000 -0500
++++ xbase-clients/bitmap-X11R7.0-1.0.1/bitmap.man 2006-02-26 20:35:50.000000000 -0500
+@@ -162,7 +162,7 @@
+ .SH USAGE
+ \fIBitmap\fP displays grid in which each square represents a single
+ bit in the picture being edited. Actual size of the bitmap image, as
+-it would appear normaly and inverted, can be obtained by pressing\fB
++it would appear normally and inverted, can be obtained by pressing\fB
+ Meta-I\fP key. You are free to move the image popup out of the way to
+ continue editing. Pressing the left mouse button in the popup window
+ or\fB Meta-I\fP again will remove the real size bitmap image.
Added: branches/modular/app/xbase-clients/debian/patches/06_xedit_manpage_typos.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/06_xedit_manpage_typos.diff 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/patches/06_xedit_manpage_typos.diff 2006-02-27 01:40:52 UTC (rev 1340)
@@ -0,0 +1,22 @@
+Index: xbase-clients/xedit-X11R7.0-1.0.1/xedit.man
+===================================================================
+--- xbase-clients.orig/xedit-X11R7.0-1.0.1/xedit.man 2006-02-18 14:56:14.000000000 -0500
++++ xbase-clients/xedit-X11R7.0-1.0.1/xedit.man 2006-02-26 20:37:32.000000000 -0500
+@@ -291,7 +291,7 @@
+ .B autoReplace (\fPClass \fBReplace)
+ This resource is useful to automatically correct common misspelling errors, but
+ can also be used to create simple macros. The format is
+-\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
++\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
+ Example of use:
+ \"
+ .br
+@@ -308,7 +308,7 @@
+ when you type that words.
+ .TP 8
+ .B ispell.dictionaries (\fPClass \fBispell.Dictionary)
+-Specifies a list of dictionary names, separeted by spaces, available to the
++Specifies a list of dictionary names, separated by spaces, available to the
+ ispell program. The default value is \fI"american americamed+ english"\fP.
+ .TP 8
+ .B ispell.dictionary (\fPClass \fBispell.Dictionary)
Added: branches/modular/app/xbase-clients/debian/patches/07_xvinfo_manpage_typo.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/07_xvinfo_manpage_typo.diff 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/patches/07_xvinfo_manpage_typo.diff 2006-02-27 01:40:52 UTC (rev 1340)
@@ -0,0 +1,13 @@
+Index: xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man
+===================================================================
+--- xbase-clients.orig/xvinfo-X11R7.0-1.0.1/xvinfo.man 2006-02-18 14:55:11.000000000 -0500
++++ xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man 2006-02-26 20:38:32.000000000 -0500
+@@ -11,7 +11,7 @@
+ .PP
+ .B xvinfo
+ prints out the capabilities of any video adaptors associated
+-with the display that are accesible through the X-Video extension.
++with the display that are accessible through the X-Video extension.
+ .SH OPTIONS
+ .PP
+ .TP 8
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 00:51:46 UTC (rev 1339)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27 01:40:52 UTC (rev 1340)
@@ -2,3 +2,6 @@
02_startx_hostname.diff
03_startx_dummy.diff
04_xev_flush_standard_output.diff
+05_bitmap_manpage_typo.diff
+06_xedit_manpage_typos.diff
+07_xvinfo_manpage_typo.diff
Reply to: