Tags: patch
diff -Nru xdotool-3.20160805.1/debian/changelog xdotool-3.20160805.1/debian/changelog --- xdotool-3.20160805.1/debian/changelog 2017-01-04 19:49:19.000000000 +0000 +++ xdotool-3.20160805.1/debian/changelog 2017-01-24 09:06:54.000000000 +0000 @@ -1,3 +1,11 @@ +xdotool (1:3.20160805.1-3) unstable; urgency=medium + + * Removed + debian/patches/0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch + -- reverted upstream. (Closes: 850257) + + -- Shih-Yuan Lee (FourDollars) <fourdoll...@gmail.com> Tue, 24 Jan 2017 17:06:54 +0800 + xdotool (1:3.20160805.1-2) unstable; urgency=medium * disable parallel build, in an attempt to avoid ephemeral test suite diff -Nru xdotool-3.20160805.1/debian/patches/0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch xdotool-3.20160805.1/debian/patches/0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch --- xdotool-3.20160805.1/debian/patches/0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch 2017-01-03 13:53:50.000000000 +0000 +++ xdotool-3.20160805.1/debian/patches/0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -From: "Brian J. Dowling" <bjd-...@simplicity.net> -Date: Sat, 3 Sep 2016 03:59:31 -0400 -Subject: Fixed 'type' --window to use default %1 as manpage stated - -Fixed 'key' usage to remove END_CHAINING because it is possible, -'key' checks if next word is a command. - -(cherry picked from commit 8e4218c1929331d8979217f7a7f16efa2dd8d0f3) ---- - cmd_key.c | 4 ++-- - cmd_type.c | 11 ++++------- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/cmd_key.c b/cmd_key.c -index dd040e9..9ea7112 100644 ---- a/cmd_key.c -+++ b/cmd_key.c -@@ -47,8 +47,8 @@ int cmd_key(context_t *context) { - "including those not currently available on your keyboard.\n" - "\n" - "If no window is given, and there are windows in the stack, %1 is used. Otherwise\n" -- "the currently-focused window is used\n" -- HELP_CHAINING_ENDS; -+ "the currently-focused window is used\n"; -+ - int option_index; - - while ((c = getopt_long_only(context->argc, context->argv, "+d:hcw:", -diff --git a/cmd_type.c b/cmd_type.c -index 1b72656..c0e8437 100644 ---- a/cmd_type.c -+++ b/cmd_type.c -@@ -8,7 +8,7 @@ int cmd_type(context_t *context) { - int i; - int c; - char *cmd = *context->argv; -- char *window_arg = NULL; -+ const char *window_arg = "%1"; - int arity = -1; - char *terminator = NULL; - char *file = NULL; -@@ -59,14 +59,15 @@ int cmd_type(context_t *context) { - "--file <filepath> - specify a file, the contents of which will be\n" - " be typed as if passed as an argument. The filepath\n" - " may also be '-' to read from stdin.\n" -- "-h, --help - show this help output\n"; -+ "-h, --help - show this help output\n" -+ HELP_SEE_WINDOW_STACK; - int option_index; - - while ((c = getopt_long_only(context->argc, context->argv, "+w:d:ch", - longopts, &option_index)) != -1) { - switch (c) { - case opt_window: -- window_arg = strdup(optarg); -+ window_arg = optarg; - break; - case opt_delay: - /* --delay is in milliseconds, convert to microseconds */ -@@ -203,10 +204,6 @@ int cmd_type(context_t *context) { - - free(data); - -- if (window_arg != NULL) { -- free(window_arg); -- } -- - consume_args(context, args_count); - return ret > 0; - } diff -Nru xdotool-3.20160805.1/debian/patches/series xdotool-3.20160805.1/debian/patches/series --- xdotool-3.20160805.1/debian/patches/series 2017-01-03 13:53:50.000000000 +0000 +++ xdotool-3.20160805.1/debian/patches/series 2017-01-24 09:06:44.000000000 +0000 @@ -1,3 +1,2 @@ 0001-preserve-xdo_t-abi.patch 0002-record-upstream-version-info-Closes-795809.patch -0003-Fixed-type-window-to-use-default-1-as-manpage-stated.patch
signature.asc
Description: PGP signature