Merge branch 'master' of ssh://sabetts@git.sv.gnu.org/srv/git/ratpoison

3 files changed, 39 insertions, 9 deletions

diff --git a/debian/patches/brl-menu.reconf b/debian/patches/brl-menu.reconf
index 83535d5..751dbd3 100644
--- a/debian/patches/brl-menu.reconf
+++ b/debian/patches/brl-menu.reconf
@@ -1,8 +1,8 @@
-Index: ratpoison-1.4.2/configure
+Index: ratpoison-1.4.3/configure
 ===================================================================
---- ratpoison-1.4.2.orig/configure	2007-10-07 11:28:27.000000000 +0200
-+++ ratpoison-1.4.2/configure	2007-10-07 11:28:32.000000000 +0200
-@@ -864,6 +864,7 @@
+--- ratpoison-1.4.3.orig/configure	2008-02-20 18:14:22.000000000 +0100
++++ ratpoison-1.4.3/configure	2008-02-20 18:24:32.000000000 +0100
+@@ -1312,6 +1312,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
@@ -10,7 +10,7 @@ Index: ratpoison-1.4.2/configure
    --with-x                use the X Window System
  
  Some influential environment variables:
-@@ -1872,6 +1873,27 @@
+@@ -2379,6 +2380,27 @@
  _ACEOF
  
  
@@ -38,11 +38,11 @@ Index: ratpoison-1.4.2/configure
  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.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
-Index: ratpoison-1.4.2/src/config.h.in
+Index: ratpoison-1.4.3/src/config.h.in
 ===================================================================
---- ratpoison-1.4.2.orig/src/config.h.in	2007-10-07 11:28:27.000000000 +0200
-+++ ratpoison-1.4.2/src/config.h.in	2007-10-07 11:28:32.000000000 +0200
-@@ -72,6 +72,9 @@
+--- ratpoison-1.4.3.orig/src/config.h.in	2008-02-20 18:14:22.000000000 +0100
++++ ratpoison-1.4.3/src/config.h.in	2008-02-20 18:24:32.000000000 +0100
+@@ -78,6 +78,9 @@
  /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
  #undef HAVE_X11_EXTENSIONS_XINERAMA_H
  
diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff
new file mode 100644
index 0000000..d41bf32
--- /dev/null
+++ b/debian/patches/manpage.diff
@@ -0,0 +1,29 @@
+Index: ratpoison-1.4.3/doc/ratpoison.1
+===================================================================
+--- ratpoison-1.4.3.orig/doc/ratpoison.1	2008-02-21 14:34:02.000000000 +0100
++++ ratpoison-1.4.3/doc/ratpoison.1	2008-02-21 14:58:37.000000000 +0100
+@@ -429,7 +429,6 @@
+ .cmd msgwait [ seconds ]
+ Set the duration the message window is shown.
+ If \fIseconds\fP is zero, wait infinitely.
+-.# This will hopefully be changed to set msgwait some day...
+ .cmd newkmap keymap
+ Generate a new keymap names \fIkeymap\fP. This keymap can
+ be used to add new key\-command mapping to it with \fBdefinekey\fP
+@@ -555,7 +554,6 @@
+ 
+ Default is all allowed i.e.\& 15.
+ 
+-.#This will hopefully change to set rudeness and names instead of numbers one day.
+ .cmd sdump
+ Output the list of all screens.
+ The screens are separated by commas. Each screen is shown as 6 values:
+@@ -686,7 +684,7 @@
+ .br
+ %W by the unit to resize the window horizontally (width_inc)
+ .br
+-.%x by the xine screen number
++%x by the xine screen number
+ and
+ .br
+ %% by a single %
diff --git a/debian/patches/series b/debian/patches/series
index ebfdaf9..f8003c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 brl-enlarge.diff -p0
 brl-menu.diff
 brl-menu.reconf
+manpage.diff