Commit a74d2761 authored by Andreas Henriksson's avatar Andreas Henriksson

Have gbp pq import && gbp pq export rename patches

- debian/patches/kbd_mode.diff =>
  debian/patches/Change-misleading-kbd_mode-message-for-XLATE-mode.patch
- debian/patches/manpages.diff =>
  debian/patches/Miscellaneous-manpage-corrections-and-additions.patch
- debian/patches/openvt.diff =>
  debian/patches/Various-fixes-to-the-openvt-utility.patch
- debian/patches/unicode_start_breaks_X.diff =>
  debian/patches/Check-for-X-in-kbd_mode.patch
- debian/patches/dead2.diff =>
  debian/patches/Support-KT_DEAD2-diacritics.patch
- debian/patches/0001-add-configure-flag-to-disable-tests.patch =>
  debian/patches/add-configure-flag-to-disable-tests.patch

Git-Dch: Full
parent 0d7909d4
From: Michael Schutte <michi@debian.org>
Date: Thu, 10 Dec 2015 20:31:03 +0100
Subject: Change misleading kbd_mode message for XLATE mode
Bug-Debian: http://bugs.debian.org/546712
Forwarded: no
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
The text said “default (ASCII) mode”, which is wrong in two respects:
XLATE isn’t limited to 7-bit ASCII, but works with various 8-bit
......@@ -13,16 +15,15 @@ an issue with this commit, though cursory research with
codesearch.google.com shows only the BiCon project
<http://sourceforge.net/projects/bicon/>, which does “kbd_mode | grep -q
-i Unicode” and is thus unaffected.
---
src/kbd_mode.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
src/kbd_mode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: devel/src/kbd_mode.c
===================================================================
--- devel.orig/src/kbd_mode.c 2011-07-22 19:06:53.000000000 +0200
+++ devel/src/kbd_mode.c 2011-07-22 19:07:00.000000000 +0200
@@ -88,7 +88,7 @@
diff --git a/src/kbd_mode.c b/src/kbd_mode.c
index b45ffdf..f654d8e 100644
--- a/src/kbd_mode.c
+++ b/src/kbd_mode.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[]){
printf(_("The keyboard is in mediumraw (keycode) mode\n"));
break;
case K_XLATE:
......
From: Denis Barbier <barbier@debian.org>
Date: Thu, 10 Dec 2015 20:31:03 +0100
Subject: Check for X in kbd_mode
Bug-Debian: http://bugs.debian.org/281305
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
“kbd_mode” can render X unusable. Add checks to unicode_{start,stop} to
avoid the problem.
This patch originated in console-tools.
---
src/unicode_start | 13 +++++++++++++
src/unicode_stop | 6 ++++++
2 files changed, 19 insertions(+), 0 deletions(-)
src/unicode_start | 13 +++++++++++++
src/unicode_stop | 6 ++++++
2 files changed, 19 insertions(+)
Index: devel/src/unicode_start
===================================================================
--- devel.orig/src/unicode_start 2011-07-22 19:06:52.000000000 +0200
+++ devel/src/unicode_start 2011-07-22 19:07:10.000000000 +0200
@@ -13,6 +13,19 @@
diff --git a/src/unicode_start b/src/unicode_start
index d5234a8..7351fe0 100755
--- a/src/unicode_start
+++ b/src/unicode_start
@@ -13,6 +13,19 @@ esac
# Enables Unicode processing in the current console.
#
......@@ -36,10 +38,10 @@ Index: devel/src/unicode_start
# 1. The input side: the keyboard driver.
# Set the keyboard driver in Unicode mode. (Default is ASCII mode.)
Index: devel/src/unicode_stop
===================================================================
--- devel.orig/src/unicode_stop 2011-07-22 19:06:52.000000000 +0200
+++ devel/src/unicode_stop 2011-07-22 19:07:10.000000000 +0200
diff --git a/src/unicode_stop b/src/unicode_stop
index 07a8e4b..858bbc5 100755
--- a/src/unicode_stop
+++ b/src/unicode_stop
@@ -1,5 +1,11 @@
#!/bin/sh
......
From: Samuel Thibault <sthibault@debian.org>
Date: Thu, 10 Dec 2015 20:31:04 +0100
Subject: Support KT_DEAD2 diacritics
Forwarded: no
Bug-Debian: http://bugs.debian.org/694169
Add support for KT_DEAD2 diacritics to loadkeys and dumpkeys using the
dead2_ prefix.
[ah@debian.org: update to patch libkeymap and use get_sym{,_size} helpers]
---
src/libkeymap/dump.c | 3 +++
src/libkeymap/ksyms.c | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
index f1ecbc6..697d78b 100644
--- a/src/libkeymap/dump.c
+++ b/src/libkeymap/dump.c
@@ -377,6 +377,9 @@
@@ -377,6 +377,9 @@ print_keysym(struct lk_ctx *ctx, FILE *fd, int code, char numeric)
else if (!numeric && t == KT_META && v < 128 && v < get_sym_size(ctx, KT_LATIN) &&
(p = get_sym(ctx, KT_LATIN, v))[0])
fprintf(fd, "Meta_%-11s", p);
......@@ -21,9 +25,11 @@ dead2_ prefix.
else
fprintf(fd, "0x%04x %s", code, plus ? "" : " ");
}
diff --git a/src/libkeymap/ksyms.c b/src/libkeymap/ksyms.c
index 22b1336..a54a7aa 100644
--- a/src/libkeymap/ksyms.c
+++ b/src/libkeymap/ksyms.c
@@ -302,6 +302,14 @@
@@ -302,6 +302,14 @@ ksymtocode(struct lk_ctx *ctx, const char *s, int direction) {
/* fall through to error printf */
}
......
From: Michael Schutte <michi@debian.org>
Date: Thu, 10 Dec 2015 20:31:03 +0100
Subject: Various fixes to the openvt utility
Forwarded: no
Bug-Debian: http://bugs.debian.org/190387
Bug-Debian: http://bugs.debian.org/630108
Bug-Debian: http://bugs.debian.org/642324
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Three unrelated fixes:
......@@ -15,14 +15,15 @@ Three unrelated fixes:
* When showing the help output, only exit with a zero status if the
“-h” option was given.
---
src/openvt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
src/openvt.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/openvt.c b/src/openvt.c
index 1ba8912..09bed94 100644
--- a/src/openvt.c
+++ b/src/openvt.c
@@ -238,10 +238,12 @@
@@ -238,10 +238,12 @@ main(int argc, char *argv[])
case 'V':
print_version_and_exit();
break;
......@@ -36,7 +37,7 @@ Three unrelated fixes:
}
}
@@ -363,7 +365,8 @@
@@ -363,7 +365,8 @@ main(int argc, char *argv[])
close(0);
close(1);
close(2);
......@@ -46,7 +47,7 @@ Three unrelated fixes:
if ((dup2(fd, 0) == -1) || (dup2(fd, 1) == -1) || (dup2(fd, 2) == -1))
kbd_error(1, errno, "dup");
@@ -386,7 +389,6 @@
@@ -386,7 +389,6 @@ main(int argc, char *argv[])
if (do_wait) {
int retval = 0; /* actual value returned form process */
......@@ -54,7 +55,7 @@ Three unrelated fixes:
waitpid(pid, &retval, 0);
if (show) { /* Switch back... */
@@ -403,7 +405,10 @@
@@ -403,7 +405,10 @@ main(int argc, char *argv[])
/* if all our stuff went right, we want to return the exit code of the command we ran
super vital for scripting loops etc */
......
From baeb5aa827d956bd06492775dc5bd9f89d394149 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 13 Jul 2015 23:38:41 -0400
Subject: [PATCH] add configure flag to disable tests
Subject: add configure flag to disable tests
The tests require the check package to be installed. There is a configure
test for this package (which is good), but it's unconditional (which is
......@@ -59,6 +58,3 @@ index d0b462b..f659758 100644
m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
AM_SILENT_RULES([yes])
--
2.1.4
kbd_mode.diff
manpages.diff
openvt.diff
unicode_start_breaks_X.diff
dead2.diff
0001-add-configure-flag-to-disable-tests.patch
Change-misleading-kbd_mode-message-for-XLATE-mode.patch
Miscellaneous-manpage-corrections-and-additions.patch
Various-fixes-to-the-openvt-utility.patch
Check-for-X-in-kbd_mode.patch
Support-KT_DEAD2-diacritics.patch
add-configure-flag-to-disable-tests.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment