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

13 files changed, 63 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c0c4872
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+*~
+configure
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.status
+config.log
+config.guess
+config.sub
+depcomp
+install-sh
+missing
+ratpoison-*.tar.gz
+ratpoison-*.tar.gz.sig
\ No newline at end of file
diff --git a/NEWS b/NEWS
index 54794c6..0175d0b 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+* Changes since 1.4.1
+Just bug fixes.
+
 * Changes since 1.4.0
 ** set padding affects bar location
 On OSX the bar and top of each window is hidden by the menu bar. set
diff --git a/configure.in b/configure.in
index 768de89..fa6f188 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ dnl
 dnl $Id: configure.in,v 1.54 2006/12/19 22:13:07 sabetts Exp $
 
 AC_INIT(src/main.c)
-AM_INIT_AUTOMAKE(ratpoison, 1.4.2-CVS)
+AM_INIT_AUTOMAKE(ratpoison, 1.4.3-GIT)
 
 AM_MAINTAINER_MODE
 
diff --git a/contrib/.cvsignore b/contrib/.cvsignore
deleted file mode 100644
index 3dda729..0000000
--- a/contrib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/debian/changelog b/debian/changelog
index f5c0a94..21ccb9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,32 @@
-ratpoison (1.4.2~CVS-0) UNRELEASED; urgency=low
+ratpoison (1.4.2-1) unstable; urgency=low
 
- -- Bernhard R. Link <brlink@debian.org>  Wed, 18 Apr 2007 10:05:48 +0200
+  * new upstream version
+  - obsoletes restorededication.patch, memoryhole.patch,
+    noabortonvoncerterror.diff, nodoubleclassreading.diff,
+    nodoubleclassreading.diff, utf8locale.diff
+  - mimic emacs X key naming more closely. A modifier being both
+    Hyper and Super should only be treated as one and not as both
+    (Closes: 419882)
+
+ -- Bernhard R. Link <brlink@debian.org>  Sun,  7 Oct 2007 11:29:55 +0200
+
+ratpoison (1.4.1-5) unstable; urgency=low
+
+  * backport of some patches to 1.4.1:
+  - nodoubleclassreading.diff: reduce X server communication a bit
+  - noabortonconverterror.diff: don't abort (by requesting infinite
+    amount of memory) if there is an string truncation error. (Closes: 423141)
+  - utf8locale.diff: also handle utf8 window titles correctly if ratpoison
+    itself is running in utf8 locale. (Closes: 438063)
+  * adopt to new menu layout
+
+ -- Bernhard R. Link <brlink@debian.org>  Wed, 15 Aug 2007 12:24:28 +0200
+
+ratpoison (1.4.1-4) unstable; urgency=low
+
+  * close memory hole in dealing with utf-8 window titles (Closes: 423141)
+
+ -- Bernhard R. Link <brlink@debian.org>  Fri, 01 Jun 2007 20:04:18 +0200
 
 ratpoison (1.4.1-3) unstable; urgency=low
 
diff --git a/debian/menu b/debian/menu
index 3bfb8ba..3914777 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(ratpoison):needs="wm" section="WindowManagers" \
+?package(ratpoison):needs="wm" section="Window Managers" \
   title="ratpoison" command="/usr/bin/ratpoison"
diff --git a/debian/patches/brl-menu.reconf b/debian/patches/brl-menu.reconf
index ad24132..83535d5 100644
--- a/debian/patches/brl-menu.reconf
+++ b/debian/patches/brl-menu.reconf
@@ -1,7 +1,7 @@
-Index: ratpoison-1.4.1/configure
+Index: ratpoison-1.4.2/configure
 ===================================================================
---- ratpoison-1.4.1.orig/configure	2007-04-16 18:45:18.000000000 +0200
-+++ ratpoison-1.4.1/configure	2007-04-16 18:47:11.000000000 +0200
+--- 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 @@
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -38,10 +38,10 @@ Index: ratpoison-1.4.1/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.1/src/config.h.in
+Index: ratpoison-1.4.2/src/config.h.in
 ===================================================================
---- ratpoison-1.4.1.orig/src/config.h.in	2007-04-16 18:45:18.000000000 +0200
-+++ ratpoison-1.4.1/src/config.h.in	2007-04-16 18:47:11.000000000 +0200
+--- 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 @@
  /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
  #undef HAVE_X11_EXTENSIONS_XINERAMA_H
diff --git a/debian/patches/restorededication.patch b/debian/patches/restorededication.patch
deleted file mode 100644
index 991dfac..0000000
--- a/debian/patches/restorededication.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ratpoison-1.4.1/src/frame.c
-===================================================================
---- ratpoison-1.4.1.orig/src/frame.c	2007-04-16 18:39:47.000000000 +0200
-+++ ratpoison-1.4.1/src/frame.c	2007-04-16 18:49:17.000000000 +0200
-@@ -248,7 +248,7 @@
- 	read_slot(dedicated);
-         if (dedicated <= 0)
-           f->dedicated = 0;
--        else if (f->dedicated >= 1)
-+        else
-           f->dedicated = 1;
-       }
-       else if (!strcmp(tmp, ")"))
diff --git a/debian/patches/series b/debian/patches/series
index a670386..ebfdaf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 brl-enlarge.diff -p0
 brl-menu.diff
 brl-menu.reconf
-restorededication.patch
diff --git a/debian/rules b/debian/rules
index e64174f..17a6fa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,9 +115,9 @@ binary-arch: build-arch install-arch
 	dh_md5sums
 	dh_builddeb
 
-RATPOISON_VERSION=1.4.1
+RATPOISON_VERSION=1.4.2
 RATPOISON_CVSVERSION=1.4.1~CVS$(shell date +%Y%m%d)
-RATPOISON_UVERSION=1.4.1-CVS
+RATPOISON_UVERSION=1.4.2-CVS
 
 # some helpers for me
 # just ignore those if you want to do a NMU or a security upload, change the files outside
diff --git a/doc/.cvsignore b/doc/.gitignore
index 6c49f9d..a5915b2 100644
--- a/doc/.cvsignore
+++ b/doc/.gitignore
@@ -1,4 +1,2 @@
-ratpoison.info
-Makefile.in
-Makefile
 texinfo.tex
+ratpoison.info
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index d1212f1..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.in
-Makefile
-stamp-h.in
-ratpoison
-config.h
-stamp-h
-stamp-h.in
-.deps
-config.h.in
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..77cfffb
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+config.h
+config.h.in
+stamp-h1
+*.o
+ratpoison