[Pkg-kbd-commit] r190 - people/barbier/kbd/trunk/debian/patches
Denis Barbier
barbier at costa.debian.org
Thu Jul 20 20:53:45 UTC 2006
Author: barbier
Date: 2006-07-20 20:53:44 +0000 (Thu, 20 Jul 2006)
New Revision: 190
Modified:
people/barbier/kbd/trunk/debian/patches/canonical_syms.diff
people/barbier/kbd/trunk/debian/patches/charsets0.diff
people/barbier/kbd/trunk/debian/patches/defkeymap.diff
people/barbier/kbd/trunk/debian/patches/fedora-kbd-1.12-alias.patch
people/barbier/kbd/trunk/debian/patches/kbdrate_notty.diff
people/barbier/kbd/trunk/debian/patches/kbdrate_sparc.diff
people/barbier/kbd/trunk/debian/patches/kmap_suffix.diff
people/barbier/kbd/trunk/debian/patches/main_argc.diff
people/barbier/kbd/trunk/debian/patches/man_pages.diff
people/barbier/kbd/trunk/debian/patches/po_makefile.diff
people/barbier/kbd/trunk/debian/patches/replace_echo_by_printf.diff
people/barbier/kbd/trunk/debian/patches/resurrect_utf8_filename.diff
people/barbier/kbd/trunk/debian/patches/thai.diff
people/barbier/kbd/trunk/debian/patches/uni_suffix.diff
people/barbier/kbd/trunk/debian/patches/unicode_start_breaks_X.diff
Log:
'quilt refresh' all patches, no other changes
Modified: people/barbier/kbd/trunk/debian/patches/canonical_syms.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/canonical_syms.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/canonical_syms.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -24,8 +24,10 @@
exit 0
---- kbd-1.12.orig/src/ksyms.c
-+++ kbd-1.12/src/ksyms.c
+Index: trunk/src/ksyms.c
+===================================================================
+--- trunk.orig/src/ksyms.c
++++ trunk/src/ksyms.c
@@ -770,7 +770,7 @@
};
Modified: people/barbier/kbd/trunk/debian/patches/charsets0.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/charsets0.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/charsets0.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -26,9 +26,11 @@
exit 0
---- kbd-1.12.orig/src/ksyms.c
-+++ kbd-1.12/src/ksyms.c
-@@ -1604,6 +1602,7 @@
+Index: trunk/src/ksyms.c
+===================================================================
+--- trunk.orig/src/ksyms.c
++++ trunk/src/ksyms.c
+@@ -1602,6 +1602,7 @@
sym *charnames;
int start;
} charsets[] = {
@@ -36,7 +38,7 @@
{ "iso-8859-1", latin1_syms, 160 },
{ "iso-8859-2", latin2_syms, 160 },
{ "iso-8859-3", latin3_syms, 160 },
-@@ -1636,7 +1635,7 @@
+@@ -1637,7 +1638,7 @@
fprintf(f, "%s{", mm[j]);
ct = 0;
lth = strlen(mm[j]);
@@ -45,7 +47,7 @@
if(!strncmp(charsets[i].charset, mm[j], lth)) {
if(ct++)
fprintf(f, ",");
-@@ -1645,7 +1644,7 @@
+@@ -1646,7 +1647,7 @@
}
fprintf(f, "}");
}
@@ -54,9 +56,9 @@
for (j=0; j<sizeof(mm)/sizeof(mm[0]); j++) {
lth = strlen(mm[j]);
if(!strncmp(charsets[i].charset, mm[j], lth))
-@@ -1665,8 +1664,11 @@
- if (!strcasecmp(charset, "unicode"))
+@@ -1668,8 +1669,11 @@
return 0;
+ }
- for (i = 0; i < sizeof(charsets)/sizeof(charsets[0]); i++) {
+ for (i = 1; i < sizeof(charsets)/sizeof(charsets[0]); i++) {
Modified: people/barbier/kbd/trunk/debian/patches/defkeymap.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/defkeymap.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/defkeymap.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -23,9 +23,10 @@
exit 0
@DPATCH@
-diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/paths.h kbd-1.12/src/paths.h
---- /home/wart/Projects/debian/kbd/new/kbd-1.12/src/paths.h 2004-01-27 14:26:28.000000000 +0300
-+++ kbd-1.12/src/paths.h 2004-01-27 14:38:14.000000000 +0300
+Index: trunk/src/paths.h
+===================================================================
+--- trunk.orig/src/paths.h
++++ trunk/src/paths.h
@@ -16,10 +16,10 @@
* Default keymap, and where the kernel copy of it lives.
*/
Modified: people/barbier/kbd/trunk/debian/patches/fedora-kbd-1.12-alias.patch
===================================================================
--- people/barbier/kbd/trunk/debian/patches/fedora-kbd-1.12-alias.patch 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/fedora-kbd-1.12-alias.patch 2006-07-20 20:53:44 UTC (rev 190)
@@ -1,6 +1,7 @@
-diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c
---- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100
-+++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900
+Index: trunk/src/psffontop.c
+===================================================================
+--- trunk.orig/src/psffontop.c
++++ trunk/src/psffontop.c
@@ -59,7 +59,6 @@
static unsigned int
Modified: people/barbier/kbd/trunk/debian/patches/kbdrate_notty.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/kbdrate_notty.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/kbdrate_notty.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -24,8 +24,10 @@
exit 0
---- kbd-1.12.orig/src/kbdrate.c
-+++ kbd-1.12/src/kbdrate.c
+Index: trunk/src/kbdrate.c
+===================================================================
+--- trunk.orig/src/kbdrate.c
++++ trunk/src/kbdrate.c
@@ -112,7 +112,7 @@
kbdrep_s.period = -1;
kbdrep_s.delay = -1;
Modified: people/barbier/kbd/trunk/debian/patches/kbdrate_sparc.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/kbdrate_sparc.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/kbdrate_sparc.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -25,9 +25,10 @@
exit 0
@DPATCH@
-diff -urNad /opt/tmp/kbd-1.12/src/kbdrate.c kbd-1.12/src/kbdrate.c
---- /opt/tmp/kbd-1.12/src/kbdrate.c 2004-08-03 00:25:20.000000000 +0200
-+++ kbd-1.12/src/kbdrate.c 2004-08-03 00:26:47.000000000 +0200
+Index: trunk/src/kbdrate.c
+===================================================================
+--- trunk.orig/src/kbdrate.c
++++ trunk/src/kbdrate.c
@@ -86,10 +86,20 @@
* actually used values are returned */
struct kbd_repeat {
Modified: people/barbier/kbd/trunk/debian/patches/kmap_suffix.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/kmap_suffix.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/kmap_suffix.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -23,9 +23,10 @@
exit 0
@DPATCH@
-diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y kbd-1.12/src/loadkeys.y
---- /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y 2004-01-27 14:25:50.000000000 +0300
-+++ kbd-1.12/src/loadkeys.y 2004-01-27 14:37:01.000000000 +0300
+Index: trunk/src/loadkeys.y
+===================================================================
+--- trunk.orig/src/loadkeys.y
++++ trunk/src/loadkeys.y
@@ -566,7 +566,7 @@
}
Modified: people/barbier/kbd/trunk/debian/patches/main_argc.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/main_argc.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/main_argc.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -24,9 +24,10 @@
exit 0
@DPATCH@
-diff -urNad /opt/tmp/kbd-1.12/src/getunimap.c kbd-1.12/src/getunimap.c
---- /opt/tmp/kbd-1.12/src/getunimap.c 2004-08-01 20:33:38.000000000 +0200
-+++ kbd-1.12/src/getunimap.c 2004-08-02 22:45:30.000000000 +0200
+Index: trunk/src/getunimap.c
+===================================================================
+--- trunk.orig/src/getunimap.c
++++ trunk/src/getunimap.c
@@ -62,7 +62,7 @@
}
}
@@ -36,9 +37,10 @@
usage();
fd = getfd(console);
-diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
---- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:45:06.000000000 +0200
-+++ kbd-1.12/src/loadunimap.c 2004-08-02 22:46:39.000000000 +0200
+Index: trunk/src/loadunimap.c
+===================================================================
+--- trunk.orig/src/loadunimap.c
++++ trunk/src/loadunimap.c
@@ -73,18 +73,18 @@
}
}
@@ -61,9 +63,10 @@
infnam = argv[optind];
loadunicodemap(fd, infnam);
exit(0);
-diff -urNad /opt/tmp/kbd-1.12/src/showconsolefont.c kbd-1.12/src/showconsolefont.c
---- /opt/tmp/kbd-1.12/src/showconsolefont.c 2004-08-02 22:44:30.000000000 +0200
-+++ kbd-1.12/src/showconsolefont.c 2004-08-02 22:47:07.000000000 +0200
+Index: trunk/src/showconsolefont.c
+===================================================================
+--- trunk.orig/src/showconsolefont.c
++++ trunk/src/showconsolefont.c
@@ -135,7 +135,7 @@
}
}
Modified: people/barbier/kbd/trunk/debian/patches/man_pages.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/man_pages.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/man_pages.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -26,8 +26,10 @@
exit 0
---- kbd-1.12.orig/man/Makefile
-+++ kbd-1.12/man/Makefile
+Index: trunk/man/Makefile
+===================================================================
+--- trunk.orig/man/Makefile
++++ trunk/man/Makefile
@@ -7,6 +7,13 @@
install -d -m 755 $(MANDIR)/$$i; \
install -m 644 $$i/*.[0-9] $(MANDIR)/$$i; \
@@ -42,8 +44,10 @@
rm -f $(MANDIR)/man5/keytables.5
clean:
---- kbd-1.12.orig/man/man1misc/splitfont.1
-+++ kbd-1.12/man/man1misc/splitfont.1
+Index: trunk/man/man1misc/splitfont.1
+===================================================================
+--- /dev/null
++++ trunk/man/man1misc/splitfont.1
@@ -0,0 +1,28 @@
+.TH SPLITFONT 1 "2002-02-24" "" "Linux Console"
+
@@ -73,16 +77,20 @@
+
+.SH "SEE ALSO"
+setfont(8).
---- kbd-1.12.orig/man/man8/showconsolefont.8
-+++ kbd-1.12/man/man8/showconsolefont.8
+Index: trunk/man/man8/showconsolefont.8
+===================================================================
+--- trunk.orig/man/man8/showconsolefont.8
++++ trunk/man/man8/showconsolefont.8
@@ -1,4 +1,4 @@
-.TH SHOWFONT 1 "2002-02-22" "" "Linux Console"
+.TH SHOWCONSOLEFONT 8 "2002-02-22" "" "Linux Console"
.SH NAME
showconsolefont \- Show the current EGA/VGA console screen font
---- kbd-1.12.orig/man/man8misc/setlogcons.8
-+++ kbd-1.12/man/man8misc/setlogcons.8
+Index: trunk/man/man8misc/setlogcons.8
+===================================================================
+--- /dev/null
++++ trunk/man/man8misc/setlogcons.8
@@ -0,0 +1,26 @@
+.TH SETLOGCONS 8 "18 Apr 2004" "Console tools" "Linux User's Manual"
+
@@ -110,8 +118,10 @@
+This manual page was written by Alastair McKinstry.
+.SH "SEE ALSO"
+dmesg(1)
---- kbd-1.12.orig/man/man8misc/vcstime.8
-+++ kbd-1.12/man/man8misc/vcstime.8
+Index: trunk/man/man8misc/vcstime.8
+===================================================================
+--- /dev/null
++++ trunk/man/man8misc/vcstime.8
@@ -0,0 +1,25 @@
+.\" Copyright 2003 Alastair McKinstry <mckinstry at computer.org>"
+.\" May be distributed under the GNU General Public License"
Modified: people/barbier/kbd/trunk/debian/patches/po_makefile.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/po_makefile.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/po_makefile.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -24,8 +24,10 @@
exit 0
---- kbd-1.12.orig/po/Makefile.in
-+++ kbd-1.12/po/Makefile.in
+Index: trunk/po/Makefile.in
+===================================================================
+--- trunk.orig/po/Makefile.in
++++ trunk/po/Makefile.in
@@ -1,5 +1,5 @@
PACKAGE = kbd
-VERSION = 1.10
Modified: people/barbier/kbd/trunk/debian/patches/replace_echo_by_printf.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/replace_echo_by_printf.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/replace_echo_by_printf.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -1,17 +1,17 @@
-Index: kbd-1.12/src/unicode_stop
+Index: trunk/src/unicode_stop
===================================================================
---- kbd-1.12.orig/src/unicode_stop
-+++ kbd-1.12/src/unicode_stop
+--- trunk.orig/src/unicode_stop
++++ trunk/src/unicode_stop
@@ -15,4 +15,4 @@
# stop unicode
kbd_mode -a
-echo -n -e '\033%@'
+printf '\033%%@'
-Index: kbd-1.12/src/unicode_start
+Index: trunk/src/unicode_start
===================================================================
---- kbd-1.12.orig/src/unicode_start
-+++ kbd-1.12/src/unicode_start
+--- trunk.orig/src/unicode_start
++++ trunk/src/unicode_start
@@ -38,7 +38,7 @@
# Tell the console output driver that the bytes arriving are UTF-8
# encoded multibyte sequences.
Modified: people/barbier/kbd/trunk/debian/patches/resurrect_utf8_filename.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/resurrect_utf8_filename.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/resurrect_utf8_filename.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -1,7 +1,7 @@
-Index: kbd-1.12/doc/utf/invalid_name
+Index: trunk/doc/utf/invalid_name
===================================================================
--- /dev/null
-+++ kbd-1.12/doc/utf/invalid_name
++++ trunk/doc/utf/invalid_name
@@ -0,0 +1,12 @@
+After
+% kbd_mode -u
Modified: people/barbier/kbd/trunk/debian/patches/thai.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/thai.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/thai.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -10,7 +10,7 @@
#include "ethiopic.syms.h"
#include "sami.syms.h"
-@@ -1633,6 +1634,7 @@
+@@ -1634,6 +1635,7 @@
{ "cp-1250", cp1250_syms, 128 },
{ "koi8-r", koi8_syms, 128 },
{ "koi8-u", koi8_syms, 128 },
Modified: people/barbier/kbd/trunk/debian/patches/uni_suffix.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/uni_suffix.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/uni_suffix.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -23,9 +23,10 @@
exit 0
@DPATCH@
-diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
---- /opt/tmp/kbd-1.12/src/loadunimap.c 2004-08-02 22:57:25.000000000 +0200
-+++ kbd-1.12/src/loadunimap.c 2004-08-02 22:57:44.000000000 +0200
+Index: trunk/src/loadunimap.c
+===================================================================
+--- trunk.orig/src/loadunimap.c
++++ trunk/src/loadunimap.c
@@ -28,8 +28,8 @@
extern char *progname;
extern int force;
Modified: people/barbier/kbd/trunk/debian/patches/unicode_start_breaks_X.diff
===================================================================
--- people/barbier/kbd/trunk/debian/patches/unicode_start_breaks_X.diff 2006-07-20 20:50:16 UTC (rev 189)
+++ people/barbier/kbd/trunk/debian/patches/unicode_start_breaks_X.diff 2006-07-20 20:53:44 UTC (rev 190)
@@ -1,7 +1,7 @@
-Index: kbd/src/unicode_stop
+Index: trunk/src/unicode_stop
===================================================================
---- kbd.orig/src/unicode_stop
-+++ kbd/src/unicode_stop
+--- trunk.orig/src/unicode_stop
++++ trunk/src/unicode_stop
@@ -1,4 +1,18 @@
#!/bin/sh
+
@@ -21,10 +21,10 @@
kbd_mode -a
+
echo -n -e '\033%@'
-Index: kbd/src/unicode_start
+Index: trunk/src/unicode_start
===================================================================
---- kbd.orig/src/unicode_start
-+++ kbd/src/unicode_start
+--- trunk.orig/src/unicode_start
++++ trunk/src/unicode_start
@@ -1,6 +1,19 @@
#!/bin/sh
# Enables Unicode processing in the current console.
More information about the Pkg-kbd-commit
mailing list