Author: dnusinow
Date: 2006-02-26 19:29:48 -0500 (Sun, 26 Feb 2006)
New Revision: 1337
Removed:
branches/modular/app/xbase-clients/debian/patches/04_xkb_README_typos.diff
Modified:
branches/modular/app/xbase-clients/debian/changelog
branches/modular/app/xbase-clients/debian/patches/series
Log:
Remove last patch. It's already applied in slightly modified form by upstream.
Modified: branches/modular/app/xbase-clients/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:24:47 UTC
(rev 1336)
+++ branches/modular/app/xbase-clients/debian/changelog 2006-02-27 00:29:48 UTC
(rev 1337)
@@ -6,9 +6,8 @@
* Port patches from trunk
+ general/014_startx_hostname_fix.diff
+ general/015_startx_dummy_fix.diff
- + general/025b_xkb_README_typos.diff
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 19:24:12 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 19:29:32 -0500
xbase-clients (1:1.0.1-1) experimental; urgency=low
Deleted:
branches/modular/app/xbase-clients/debian/patches/04_xkb_README_typos.diff
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/04_xkb_README_typos.diff
2006-02-27 00:24:47 UTC (rev 1336)
+++ branches/modular/app/xbase-clients/debian/patches/04_xkb_README_typos.diff
2006-02-27 00:29:48 UTC (rev 1337)
@@ -1,24 +0,0 @@
-Index: xbase-clients/xkbcomp-X11R7.0-1.0.1/README.config
-===================================================================
---- xbase-clients.orig/xkbcomp-X11R7.0-1.0.1/README.config 2006-02-18
14:55:31.000000000 -0500
-+++ xbase-clients/xkbcomp-X11R7.0-1.0.1/README.config 2006-02-26
19:23:49.000000000 -0500
-@@ -30,7 +30,7 @@
-
- o XkbRules - files of rules to be used for keyboard mapping composition
-
-- o XkbModel - name of model of your keyboard type
-+ o XkbModel - name of model of your keyboard
-
- o XkbLayout - layout(s) you intend to use
-
-@@ -60,8 +60,8 @@
- EndSection
-
- The values of parameters XkbModel and XkbLayout are really not surprising.
--The parameters XkbOptions has been explicitly set to empty set of parameters.
--The parameter XkbVariant has been left out. That means the default variant
-+The parameters XkbOptions has been explicitly set to the empty value. The
-+parameter XkbVariant has been left out. That means the default variant
- named basic is loaded.
-
- Of course, this can be also done at runtime using utility setxkbmap. Shell
Modified: branches/modular/app/xbase-clients/debian/patches/series
===================================================================
--- branches/modular/app/xbase-clients/debian/patches/series 2006-02-27
00:24:47 UTC (rev 1336)
+++ branches/modular/app/xbase-clients/debian/patches/series 2006-02-27
00:29:48 UTC (rev 1337)
@@ -1,4 +1,3 @@
001_debian_xinitrc.diff
02_startx_hostname.diff
03_startx_dummy.diff
-04_xkb_README_typos.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
