diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/530176.diff | 14 | ||||
| -rw-r--r-- | debian/patches/README | 22 | ||||
| -rw-r--r-- | debian/patches/brl-enlarge.diff | 425 | ||||
| -rw-r--r-- | debian/patches/brl-menu.diff | 151 | ||||
| -rw-r--r-- | debian/patches/brl-menu.reconf | 54 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
6 files changed, 0 insertions, 670 deletions
diff --git a/debian/patches/530176.diff b/debian/patches/530176.diff deleted file mode 100644 index 3b1779e..0000000 --- a/debian/patches/530176.diff +++ /dev/null @@ -1,14 +0,0 @@ -Author: Bernhard R. Link <brlink@debian.org> -Description: rpshowall.sh needs bash, so use #!/bin/bash -Bug: 530176 - -Index: ratpoison-1.4.5/contrib/rpshowall.sh -=================================================================== ---- ratpoison-1.4.5.orig/contrib/rpshowall.sh 2009-07-14 15:10:18.000000000 +0200 -+++ ratpoison-1.4.5/contrib/rpshowall.sh 2009-07-14 15:10:25.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # rpshowall - # ratpoison script to show all open windows diff --git a/debian/patches/README b/debian/patches/README deleted file mode 100644 index 1101a32..0000000 --- a/debian/patches/README +++ /dev/null @@ -1,22 +0,0 @@ -This directory lists patches used by the Debian package. It is not used -by the normal Debian package build, as the patches are already applied -by the .diff.gz all together. - -* If you are NMUing the Debian package: - - Just ignore this directory (unless it helps you to understand what I did). - Everything applicaple to your .orig.tar.gz should already be in the - .diff.gz you have. Just modify the actual code, submit a patch with what - you did to the BTS and let me sort it out and include the patch in this - directory. - -* If you do a locally modified package: - - Your choice. But you can savely ignore this directory. Nothing in the - build system uses it. - -* If you are preparing a new version - - Start with the clean source from git or the tarball. Choose which of the patches - from this directy you want to apply and apply them. Copy the debian directory - and build. diff --git a/debian/patches/brl-enlarge.diff b/debian/patches/brl-enlarge.diff deleted file mode 100644 index 513faee..0000000 --- a/debian/patches/brl-enlarge.diff +++ /dev/null @@ -1,425 +0,0 @@ -Author: Bernhard R. Link <brlink@debian.org> -Subject: add removeleft/up/right/down commands - -This patch adds new removeleft/up/right/down commands to extend the current -frame in the given direction, removing all frames in the way. -Default key-bindings are C-t M-arrow-keys. - -Index: ratpoison-1.4.4/ChangeLog -=================================================================== ---- ratpoison-1.4.4.orig/ChangeLog 2009-04-27 04:05:45.000000000 +0200 -+++ ratpoison-1.4.4/ChangeLog 2009-04-27 14:43:28.000000000 +0200 -@@ -1,3 +1,20 @@ -+2005-06-28 Bernhard R. Link <brlink@debian.org> -+ -+ * src/split.c: new functions enlarge_frame_{left,up,right,down} -+ to enlarge a frame in a given direction, optionally removing all -+ direct adjacent frames. -+ (remove_frame): moved code to new rotine maximaize_all_in_frame. -+ (find_frame_{left,up,right,down}): try harder to find a frame in -+ the specified direction. (So that it also works with parts of -+ the screen not beeing in any frame). -+ -+ * src/split.h: added prototypes for enlarge_frame_{left,up,right,down} -+ -+ * src/actions.{c,h}: Added cmd_remove{left,up,right,down} calling -+ enlarge_frame_*, added C-t M-{Left,Right,Up,Down} as keybindings. -+ -+ * doc/ratpoison.1: Document the new commands and keybindings. -+ - commit 18ee1ed3b3839d44e08e5aefd0e926d29d252654 - Author: Shawn Betts <sabetts@gmail.com> - Date: Fri Apr 24 15:28:27 2009 -0700 -Index: ratpoison-1.4.4/doc/ratpoison.1 -=================================================================== ---- ratpoison-1.4.4.orig/doc/ratpoison.1 2009-04-13 14:31:28.000000000 +0200 -+++ ratpoison-1.4.4/doc/ratpoison.1 2009-04-27 14:43:28.000000000 +0200 -@@ -511,6 +511,18 @@ - .cmd remove ( C\-t R ) - Remove the current frame and extend some frames around to fill the remaining - gap. -+.cmd removedown ( C\-t M\-Down ) -+Kill frames directly below the current frame, extending the current -+frame as much as possible. -+.cmd removeleft ( C\-t M\-Left ) -+Kill frames directly left of the current frame, extending the current -+frame as much as possible. -+.cmd removeup ( C\-t M\-Up ) -+Kill frames directly above the current frame, extending the current -+frame as much as possible. -+.cmd removeright ( C\-t M\-Right ) -+Kill frames directly right of the current frame, extending the current -+frame as much as possible. - .cmd resize [ deltax deltay ] ( C\-t r ) - If \fIdeltax\fP and \fIdeltay\fP are supplied, resize the current frame - by that (i.e. move the bottom right corner by the given offsets and then -Index: ratpoison-1.4.4/src/actions.c -=================================================================== ---- ratpoison-1.4.4.orig/src/actions.c 2009-04-13 14:49:08.000000000 +0200 -+++ ratpoison-1.4.4/src/actions.c 2009-04-27 14:43:28.000000000 +0200 -@@ -324,6 +324,10 @@ - "Hook: ", arg_HOOK, - "Command: ", arg_COMMAND); - add_command ("remove", cmd_remove, 0, 0, 0); -+ add_command ("removeup", cmd_removeup, 0, 0, 0); -+ add_command ("removedown", cmd_removedown, 0, 0, 0); -+ add_command ("removeleft", cmd_removeleft, 0, 0, 0); -+ add_command ("removeright", cmd_removeright, 0, 0, 0); - add_command ("resize", cmd_resize, 2, 0, 2, - "", arg_NUMBER, - "", arg_NUMBER); -@@ -785,6 +789,10 @@ - add_keybinding (XK_Down, 0, "focusdown", map); - add_keybinding (XK_Q, 0, "only", map); - add_keybinding (XK_R, 0, "remove", map); -+ add_keybinding (XK_Left, RP_META_MASK, "removeleft", map); -+ add_keybinding (XK_Right, RP_META_MASK, "removeright", map); -+ add_keybinding (XK_Up, RP_META_MASK, "removeup", map); -+ add_keybinding (XK_Down, RP_META_MASK, "removedown", map); - add_keybinding (XK_f, 0, "fselect", map); - add_keybinding (XK_f, RP_CONTROL_MASK, "fselect", map); - add_keybinding (XK_F, 0, "curframe", map); -@@ -2957,6 +2965,38 @@ - } - - cmdret * -+cmd_removeup (int interactive UNUSED, struct cmdarg **args UNUSED) -+{ -+ push_frame_undo (current_screen()); /* fdump to stack */ -+ enlarge_frame_up (current_frame(), 1); -+ return cmdret_new(RET_SUCCESS, NULL); -+} -+ -+cmdret * -+cmd_removedown (int interactive UNUSED, struct cmdarg **args UNUSED) -+{ -+ push_frame_undo (current_screen()); /* fdump to stack */ -+ enlarge_frame_down (current_frame(), 1); -+ return cmdret_new(RET_SUCCESS, NULL); -+} -+ -+cmdret * -+cmd_removeleft (int interactive UNUSED, struct cmdarg **args UNUSED) -+{ -+ push_frame_undo (current_screen()); /* fdump to stack */ -+ enlarge_frame_left (current_frame(), 1); -+ return cmdret_new(RET_SUCCESS, NULL); -+} -+ -+cmdret * -+cmd_removeright (int interactive UNUSED, struct cmdarg **args UNUSED) -+{ -+ push_frame_undo (current_screen()); /* fdump to stack */ -+ enlarge_frame_right (current_frame(), 1); -+ return cmdret_new(RET_SUCCESS, NULL); -+} -+ -+cmdret * - cmd_shrink (int interactive UNUSED, struct cmdarg **args UNUSED) - { - push_frame_undo (current_screen()); /* fdump to stack */ -Index: ratpoison-1.4.4/src/actions.h -=================================================================== ---- ratpoison-1.4.4.orig/src/actions.h 2009-04-13 14:02:34.000000000 +0200 -+++ ratpoison-1.4.4/src/actions.h 2009-04-27 14:43:28.000000000 +0200 -@@ -168,6 +168,10 @@ - RP_CMD (redisplay); - RP_CMD (remhook); - RP_CMD (remove); -+RP_CMD (removedown); -+RP_CMD (removeup); -+RP_CMD (removeleft); -+RP_CMD (removeright); - RP_CMD (rename); - RP_CMD (resize); - RP_CMD (restart); -Index: ratpoison-1.4.4/src/split.c -=================================================================== ---- ratpoison-1.4.4.orig/src/split.c 2009-04-13 03:52:16.000000000 +0200 -+++ ratpoison-1.4.4/src/split.c 2009-04-27 14:47:10.000000000 +0200 -@@ -701,6 +701,147 @@ - return 0; - } - -+ -+static void -+delete_frame (rp_frame *frame) -+{ -+ rp_screen *s; -+ rp_window *win; -+ -+ if (frame == NULL) return; -+ -+ s = frames_screen (frame); -+ -+ list_del (&frame->node); -+ win = find_window_number (frame->win_number); -+ hide_window (win); -+ hide_others (win); -+ -+ frame_free (s, frame); -+} -+ -+static void -+maximize_all_in_frame (rp_frame *frame) -+{ -+ rp_window *win; -+ -+ /* The current frame fits into the new space so keep its -+ new frame parameters and maximize the window to fit -+ the new frame size. */ -+ if (frame->win_number != EMPTY) -+ { -+ win = find_window_number (frame->win_number); -+ maximize_all_windows_in_frame (frame); -+ XRaiseWindow (dpy, win->w); -+ } -+} -+ -+void -+enlarge_frame_left (rp_frame *frame, int remove) -+{ -+ rp_screen *s = frames_screen (frame); -+ rp_frame *cur; -+ struct list_head *tmp, *iter; -+ -+ int new_x = screen_left(s); -+ -+ list_for_each_safe_entry (cur, iter, tmp, &s->frames, node) -+ { -+ if (frame_top(frame) < frame_bottom(cur) -+ && frame_top(cur) < frame_bottom(frame)) -+ { -+ int cur_border = frame_right (cur); -+ -+ if (remove && cur_border == frame_left(frame)) -+ delete_frame(cur); -+ else if (cur_border <= frame_left(frame) && cur_border > new_x ) -+ new_x = cur_border; -+ } -+ } -+ frame->width += frame->x - new_x; -+ frame->x = new_x; -+ maximize_all_in_frame(frame); -+} -+ -+void -+enlarge_frame_right (rp_frame *frame, int remove) -+{ -+ rp_screen *s = frames_screen (frame); -+ rp_frame *cur; -+ struct list_head *tmp, *iter; -+ -+ int new_x = screen_right(s); -+ -+ list_for_each_safe_entry (cur, iter, tmp, &s->frames, node) -+ { -+ if (frame_top(frame) < frame_bottom(cur) -+ && frame_top(cur) < frame_bottom(frame)) -+ { -+ int frame_border = frame_right(frame); -+ -+ if (remove && frame_border == frame_left(cur)) -+ delete_frame(cur); -+ else if (frame_border <= frame_left(cur) && frame_left(cur) < new_x ) -+ new_x = cur->x; -+ } -+ } -+ frame->width = new_x - frame->x; -+ maximize_all_in_frame(frame); -+} -+ -+void -+enlarge_frame_up (rp_frame *frame, int remove) -+{ -+ rp_screen *s = frames_screen (frame); -+ rp_frame *cur; -+ struct list_head *tmp, *iter; -+ -+ int new_y = screen_top(s); -+ -+ list_for_each_safe_entry (cur, iter, tmp, &s->frames, node) -+ { -+ if (frame_left(frame) < frame_right(cur) -+ && frame_left(cur) < frame_right(frame)) -+ { -+ int cur_border = frame_bottom (cur); -+ -+ if (remove && cur_border == frame_top(frame)) -+ delete_frame(cur); -+ else if (cur_border <= frame_top(frame) && cur_border > new_y ) -+ new_y = cur_border; -+ } -+ } -+ frame->height += frame->y - new_y; -+ frame->y = new_y; -+ maximize_all_in_frame(frame); -+} -+ -+void -+enlarge_frame_down (rp_frame *frame, int remove) -+{ -+ rp_screen *s = frames_screen (frame); -+ rp_frame *cur; -+ struct list_head *tmp, *iter; -+ -+ int new_y = screen_bottom(s); -+ -+ list_for_each_safe_entry (cur, iter, tmp, &s->frames, node) -+ { -+ if (frame_left(frame) < frame_right(cur) -+ && frame_left(cur) < frame_right(frame)) -+ { -+ int frame_border = frame_bottom(frame); -+ -+ if (remove && frame_border == frame_top(cur)) -+ delete_frame(cur); -+ else if (frame_border <= frame_top(cur) && frame_top(cur) < new_y ) -+ new_y = frame_top(cur); -+ } -+ } -+ frame->height = new_y - frame->y; -+ maximize_all_in_frame(frame); -+} -+ - void - remove_frame (rp_frame *frame) - { -@@ -798,17 +939,7 @@ - } - - if (fits) -- { -- /* The current frame fits into the new space so keep its -- new frame parameters and maximize the window to fit -- the new frame size. */ -- if (cur->win_number != EMPTY) -- { -- rp_window *new = find_window_number (cur->win_number); -- maximize_all_windows_in_frame (cur); -- XRaiseWindow (dpy, new->w); -- } -- } -+ maximize_all_in_frame(cur); - else - { - memcpy (cur, &tmp_frame, sizeof (rp_frame)); -@@ -1030,16 +1161,24 @@ - rp_screen *s = frames_screen (frame); - rp_frame *cur; - -+ rp_frame *best_frame_yet = NULL; -+ int best_x_yet = frame->x + frame->width + 1; -+ - list_for_each_entry (cur, &s->frames, node) - { - if (frame->y == cur->y + cur->height) - { - if (frame->x >= cur->x && frame->x < cur->x + cur->width) - return cur; -+ if (cur->x >= frame->x && cur->x < best_x_yet ) -+ { -+ best_x_yet = cur->x; -+ best_frame_yet = cur; -+ } - } - } - -- return NULL; -+ return best_frame_yet; - } - - rp_frame * -@@ -1048,16 +1187,24 @@ - rp_screen *s = frames_screen (frame); - rp_frame *cur; - -+ rp_frame *best_frame_yet = NULL; -+ int best_x_yet = frame->x + frame->width + 1; -+ - list_for_each_entry (cur, &s->frames, node) - { - if (frame->y + frame->height == cur->y) - { - if (frame->x >= cur->x && frame->x < cur->x + cur->width) - return cur; -+ if (cur->x >= frame->x && cur->x < best_x_yet ) -+ { -+ best_x_yet = cur->x; -+ best_frame_yet = cur; -+ } - } - } - -- return NULL; -+ return best_frame_yet; - } - - rp_frame * -@@ -1066,16 +1213,24 @@ - rp_screen *s = frames_screen (frame); - rp_frame *cur; - -+ rp_frame *best_frame_yet = NULL; -+ int best_y_yet = frame->y + frame->height + 1; -+ - list_for_each_entry (cur, &s->frames, node) - { - if (frame->x == cur->x + cur->width) - { - if (frame->y >= cur->y && frame->y < cur->y + cur->height) - return cur; -+ if (cur->y >= frame->y && cur->y < best_y_yet ) -+ { -+ best_y_yet = cur->y; -+ best_frame_yet = cur; -+ } - } - } - -- return NULL; -+ return best_frame_yet; - } - - rp_frame * -@@ -1084,16 +1239,24 @@ - rp_screen *s = frames_screen (frame); - rp_frame *cur; - -+ rp_frame *best_frame_yet = NULL; -+ int best_y_yet = frame->y + frame->height + 1; -+ - list_for_each_entry (cur, &s->frames, node) - { - if (frame->x + frame->width == cur->x) - { - if (frame->y >= cur->y && frame->y < cur->y + cur->height) - return cur; -+ if (cur->y >= frame->y && cur->y < best_y_yet ) -+ { -+ best_y_yet = cur->y; -+ best_frame_yet = cur; -+ } - } - } - -- return NULL; -+ return best_frame_yet; - } - - rp_frame * -Index: ratpoison-1.4.4/src/split.h -=================================================================== ---- ratpoison-1.4.4.orig/src/split.h 2009-04-13 03:52:16.000000000 +0200 -+++ ratpoison-1.4.4/src/split.h 2009-04-27 14:43:28.000000000 +0200 -@@ -33,6 +33,10 @@ - void resize_frame_horizontally (rp_frame *frame, int diff); - void resize_frame_vertically (rp_frame *frame, int diff); - void remove_frame (rp_frame *frame); -+void enlarge_frame_left (rp_frame *frame, int remove); -+void enlarge_frame_up (rp_frame *frame, int remove); -+void enlarge_frame_right (rp_frame *frame, int remove); -+void enlarge_frame_down (rp_frame *frame, int remove); - rp_window *find_window_for_frame (rp_frame *frame); - rp_frame *find_windows_frame (rp_window *win); - rp_frame *find_frame_next (rp_frame *frame); diff --git a/debian/patches/brl-menu.diff b/debian/patches/brl-menu.diff deleted file mode 100644 index 61998da..0000000 --- a/debian/patches/brl-menu.diff +++ /dev/null @@ -1,151 +0,0 @@ -Author: Bernhard R. Link <brlink@debian.org> -Subject: add --with-menu - -This patch adds an --with-menu that allows to specify a menu command -that will be available with :menu and with "C-t ." - -Index: ratpoison-1.4.4/ChangeLog -=================================================================== ---- ratpoison-1.4.4.orig/ChangeLog 2009-04-27 14:43:28.000000000 +0200 -+++ ratpoison-1.4.4/ChangeLog 2009-04-27 14:47:28.000000000 +0200 -@@ -1,3 +1,9 @@ -+2005-01-15 Bernhard R. Link <brlink@debian.org> -+ -+ * configure.in: add --with-menu to specify a menu program -+ * src/action.c: add menu alias and binding if menu specified -+ * src/main.c: tell menu command if menu specified -+ - 2005-06-28 Bernhard R. Link <brlink@debian.org> - - * src/split.c: new functions enlarge_frame_{left,up,right,down} -Index: ratpoison-1.4.4/src/main.c -=================================================================== ---- ratpoison-1.4.4.orig/src/main.c 2009-04-13 11:15:46.000000000 +0200 -+++ ratpoison-1.4.4/src/main.c 2009-04-27 14:47:28.000000000 +0200 -@@ -467,7 +467,13 @@ - { - rp_action *help_action; - char *prefix, *help; -+ const char *help_show; - rp_keymap *map; -+#ifdef MENU_PROG -+ rp_action *menu_action; -+ char *menu; -+ const char *menu_show; -+#endif - - prefix = keysym_to_string (prefix_key.sym, prefix_key.state); - -@@ -476,27 +482,44 @@ - /* Find the help key binding. */ - help_action = find_keybinding_by_action ("help " ROOT_KEYMAP, map); - if (help_action) -- help = keysym_to_string (help_action->key, help_action->state); -- else -- help = NULL; -- -- -- if (help) - { -+ help = keysym_to_string (help_action->key, help_action->state); - /* A little kludge to use ? instead of `question' for the help - key. */ - if (!strcmp (help, "question")) -- marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, "?"); -+ help_show = "?"; - else -- marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, help); -- -- free (help); -+ help_show = help; -+ } -+ else -+ { -+ help = NULL; -+ help_show = ":help"; -+ } -+#ifdef MENU_PROG -+ /* Find the menu key binding. */ -+ menu_action = find_keybinding_by_action ("menu", map); -+ if (menu_action) -+ { -+ menu = keysym_to_string (menu_action->key, menu_action->state); -+ if (!strcmp (menu, "period")) -+ menu_show = "."; -+ else -+ menu_show = menu; - } - else - { -- marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, ":help"); -+ menu = NULL; -+ menu_show = ":menu"; - } - -+ marked_message_printf (0, 0, MESSAGE_WELCOME_MENU, prefix, help_show, -+ prefix, menu_show); -+ free(menu); -+#else -+ marked_message_printf (0, 0, MESSAGE_WELCOME, prefix, help_show); -+#endif -+ free(help); - free (prefix); - } - -Index: ratpoison-1.4.4/src/actions.c -=================================================================== ---- ratpoison-1.4.4.orig/src/actions.c 2009-04-27 14:43:28.000000000 +0200 -+++ ratpoison-1.4.4/src/actions.c 2009-04-27 14:47:28.000000000 +0200 -@@ -725,6 +725,9 @@ - add_keybinding (prefix_key.sym, prefix_key.state, "other", map); - add_keybinding (prefix_key.sym, 0, "meta", map); - add_keybinding (XK_g, RP_CONTROL_MASK, "abort", map); -+#ifdef MENU_PROG -+ add_keybinding (XK_period, 0, "menu", map); -+#endif - add_keybinding (XK_0, 0, "select 0", map); - add_keybinding (XK_1, 0, "select 1", map); - add_keybinding (XK_2, 0, "select 2", map); -@@ -811,6 +814,10 @@ - add_alias ("unbind", "undefinekey " ROOT_KEYMAP); - add_alias ("bind", "definekey " ROOT_KEYMAP); - add_alias ("split", "vsplit"); -+ -+#ifdef MENU_PROG -+ add_alias ("menu", "exec " MENU_PROG ); -+#endif - } - - cmdret * -Index: ratpoison-1.4.4/configure.in -=================================================================== ---- ratpoison-1.4.4.orig/configure.in 2009-04-27 03:55:10.000000000 +0200 -+++ ratpoison-1.4.4/configure.in 2009-04-27 14:47:28.000000000 +0200 -@@ -72,6 +72,15 @@ - AC_SUBST(XFT_CFLAGS) - AC_SUBST(XFT_LIBS) - -+AC_ARG_WITH(menu, [ --with-menu=PROG set a external menu program to be advertised ], -+menu_prog="$withval", menu_prog="") -+ -+if test "$menu_prog" != "no" && ! test -z "$menu_prog" ; then -+AC_DEFINE_UNQUOTED(MENU_PROG, "$menu_prog", external menu program to advertise) -+AC_MSG_CHECKING(external menu program) -+AC_MSG_RESULT($menu_prog) -+fi -+ - dnl Checks for programs. - AC_CHECK_TOOL(CC, gcc) - AC_PROG_CC -Index: ratpoison-1.4.4/src/messages.h -=================================================================== ---- ratpoison-1.4.4.orig/src/messages.h 2009-04-13 03:52:16.000000000 +0200 -+++ ratpoison-1.4.4/src/messages.h 2009-04-27 14:47:28.000000000 +0200 -@@ -50,6 +50,7 @@ - #define MESSAGE_PROMPT_VAR_VALUE "Value: " - - #define MESSAGE_WELCOME "Welcome to ratpoison! Hit `%s %s' for help." -+#define MESSAGE_WELCOME_MENU "Welcome to ratpoison! Hit `%s %s' for help. `%s %s' for menu." - - #define EMPTY_FRAME_MESSAGE "Current Frame" - diff --git a/debian/patches/brl-menu.reconf b/debian/patches/brl-menu.reconf deleted file mode 100644 index a929add..0000000 --- a/debian/patches/brl-menu.reconf +++ /dev/null @@ -1,54 +0,0 @@ -Author: Bernhard R. Link <brlink@debian.org> -Subject: change the autogenerated files the brl-menu.diff would change - -Index: ratpoison-1.4.4/configure -=================================================================== ---- ratpoison-1.4.4.orig/configure 2009-04-27 14:48:49.000000000 +0200 -+++ ratpoison-1.4.4/configure 2009-04-27 15:16:28.000000000 +0200 -@@ -1308,6 +1308,7 @@ - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-xterm=PROG set the x terminal emulator used by ratpoison -+ --with-menu=PROG set a external menu program to be advertised - --without-xft Don't use the Xft library even if available - --with-x use the X Window System - -@@ -2530,7 +2531,24 @@ - echo "${ECHO_T}no" >&6; } - fi - -+# Check whether --with-menu was given. -+if test "${with_menu+set}" = set; then -+ withval=$with_menu; menu_prog="$withval" -+else -+ menu_prog="" -+fi - -+if test "$menu_prog" != "no" && ! test -z "$menu_prog" ; then -+ -+cat >>confdefs.h <<_ACEOF -+#define MENU_PROG "$menu_prog" -+_ACEOF -+ -+{ echo "$as_me:$LINENO: checking external menu program" >&5 -+echo $ECHO_N "checking external menu program... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $menu_prog" >&5 -+echo "${ECHO_T}$menu_prog" >&6; } -+fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -Index: ratpoison-1.4.4/src/config.h.in -=================================================================== ---- ratpoison-1.4.4.orig/src/config.h.in 2009-04-27 15:13:46.000000000 +0200 -+++ ratpoison-1.4.4/src/config.h.in 2009-04-27 15:14:01.000000000 +0200 -@@ -75,6 +75,9 @@ - /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ - #undef HAVE_X11_EXTENSIONS_XINERAMA_H - -+/* external menu program to advertise */ -+#undef MENU_PROG -+ - /* Name of package */ - #undef PACKAGE - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 964105e..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -brl-enlarge.diff -brl-menu.diff -brl-menu.reconf -530176.diff |