--- fvwm-2.5.18.orig/tests/hints/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/tests/hints/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.746
--- fvwm-2.5.18.orig/tests/hints/.arch-ids/README.id
+++ fvwm-2.5.18/tests/hints/.arch-ids/README.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.748
--- fvwm-2.5.18.orig/tests/hints/.arch-ids/hints_test.c.id
+++ fvwm-2.5.18/tests/hints/.arch-ids/hints_test.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.749
--- fvwm-2.5.18.orig/tests/hints/.arch-ids/=id
+++ fvwm-2.5.18/tests/hints/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.745
--- fvwm-2.5.18.orig/tests/hints/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/tests/hints/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.747
--- fvwm-2.5.18.orig/tests/hints/Makefile.in
+++ fvwm-2.5.18/tests/hints/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-SOURCES = hints_test.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -36,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = hints_test$(EXEEXT)
 subdir = tests/hints
@@ -45,7 +44,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
@@ -58,7 +57,6 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/hints_test.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -204,6 +202,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -320,16 +320,14 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -431,7 +429,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/tests/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/tests/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.742
--- fvwm-2.5.18.orig/tests/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/tests/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.741
--- fvwm-2.5.18.orig/tests/.arch-ids/test_options.id
+++ fvwm-2.5.18/tests/.arch-ids/test_options.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.750
--- fvwm-2.5.18.orig/tests/.arch-ids/README.test_options.id
+++ fvwm-2.5.18/tests/.arch-ids/README.test_options.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.744
--- fvwm-2.5.18.orig/tests/.arch-ids/=id
+++ fvwm-2.5.18/tests/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.740
--- fvwm-2.5.18.orig/tests/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/tests/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.743
--- fvwm-2.5.18.orig/tests/Makefile.in
+++ fvwm-2.5.18/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -192,6 +193,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -295,7 +298,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -307,7 +316,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -315,7 +324,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -336,7 +351,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -435,15 +450,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -472,7 +489,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/utils/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/utils/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.753
--- fvwm-2.5.18.orig/utils/.arch-ids/fvwm_make_browse_menu.sh.id
+++ fvwm-2.5.18/utils/.arch-ids/fvwm_make_browse_menu.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.757
--- fvwm-2.5.18.orig/utils/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/utils/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.752
--- fvwm-2.5.18.orig/utils/.arch-ids/configure_dev.sh.id
+++ fvwm-2.5.18/utils/.arch-ids/configure_dev.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.756
--- fvwm-2.5.18.orig/utils/.arch-ids/changelog.vim.id
+++ fvwm-2.5.18/utils/.arch-ids/changelog.vim.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Sun Aug  6 15:35:10 2006 5362.0
--- fvwm-2.5.18.orig/utils/.arch-ids/xselection.c.id
+++ fvwm-2.5.18/utils/.arch-ids/xselection.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.761
--- fvwm-2.5.18.orig/utils/.arch-ids/rebuild_dev.sh.id
+++ fvwm-2.5.18/utils/.arch-ids/rebuild_dev.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.760
--- fvwm-2.5.18.orig/utils/.arch-ids/build_dev.sh.id
+++ fvwm-2.5.18/utils/.arch-ids/build_dev.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.755
--- fvwm-2.5.18.orig/utils/.arch-ids/fvwm_make_directory_menu.sh.id
+++ fvwm-2.5.18/utils/.arch-ids/fvwm_make_directory_menu.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.758
--- fvwm-2.5.18.orig/utils/.arch-ids/=id
+++ fvwm-2.5.18/utils/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.751
--- fvwm-2.5.18.orig/utils/.arch-ids/quantize_pixmaps.id
+++ fvwm-2.5.18/utils/.arch-ids/quantize_pixmaps.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.759
--- fvwm-2.5.18.orig/utils/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/utils/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.754
--- fvwm-2.5.18.orig/utils/Makefile.in
+++ fvwm-2.5.18/utils/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SOURCES = xselection.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -35,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = xselection$(EXEEXT)
 subdir = utils
@@ -44,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 xselection_SOURCES = xselection.c
@@ -57,7 +56,6 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xselection.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -203,6 +201,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -319,16 +319,14 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
@@ -430,7 +428,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/acinclude.m4
+++ fvwm-2.5.18/acinclude.m4
@@ -526,6 +526,156 @@
 ])
 
 
+dnl --------------------------------------------------------------------------
+dnl contents of imlib.m4
+dnl modified by migo - write diagnostics to >&5 (i.e. config.log) not stdout
+
+# Configure paths for IMLIB
+# Frank Belew     98-8-31
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
+dnl
+AC_DEFUN([AM_PATH_IMLIB],
+[dnl
+dnl Get the cflags and libraries from the imlib-config script
+dnl
+AC_ARG_WITH([imlib-prefix],[  --with-imlib-prefix=PFX prefix for IMLIB files (optional)],
+            imlib_prefix="$withval", imlib_prefix="")
+AC_ARG_WITH(imlib-exec-prefix,[  --with-imlib-exec-prefix=PFX  exec prefix for IMLIB files (optional)],
+            imlib_exec_prefix="$withval", imlib_exec_prefix="")
+AC_ARG_ENABLE(imlibtest, [  --disable-imlibtest     do not try to compile and run a test IMLIB program],
+            , enable_imlibtest=yes)
+
+  if test x$imlib_exec_prefix != x ; then
+     imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix"
+     if test x${IMLIBCONF+set} != xset ; then
+        IMLIBCONF=$imlib_exec_prefix/bin/imlib-config
+     fi
+  fi
+  if test x$imlib_prefix != x ; then
+     imlib_args="$imlib_args --prefix=$imlib_prefix"
+     if test x${IMLIBCONF+set} != xset ; then
+        IMLIBCONF=$imlib_prefix/bin/imlib-config
+     fi
+  fi
+
+  AC_PATH_PROG(IMLIBCONF, imlib-config, no)
+  min_imlib_version=ifelse([$1], ,1.8.1,$1)
+  AC_MSG_CHECKING(for IMLIB - version >= $min_imlib_version)
+  no_imlib=""
+  if test "$IMLIBCONF" = "no" ; then
+    no_imlib=yes
+  else
+    IMLIB_CFLAGS=`$IMLIBCONF $imlibconf_args --cflags`
+    IMLIB_LIBS=`$IMLIBCONF $imlibconf_args --libs`
+
+    imlib_major_version=`$IMLIBCONF $imlib_args --version | \
+           sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/'`
+    imlib_minor_version=`$IMLIBCONF $imlib_args --version | \
+           sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\2/'`
+    if test "x$enable_imlibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $IMLIB_CFLAGS"
+      LIBS="$LIBS $IMLIB_LIBS"
+dnl
+dnl Now check if the installed IMLIB is sufficiently new. (Also sanity
+dnl checks the results of imlib-config to some extent
+dnl
+      rm -f conf.imlibtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <gdk_imlib.h>
+
+ImlibImage testimage;
+
+int main ()
+{
+  int major, minor;
+  char *tmp_version;
+
+  system ("touch conf.imlibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = strdup("$min_imlib_version");
+  if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
+     printf("%s, bad version string\n", "$min_imlib_version");
+     exit(1);
+   }
+
+    if (($imlib_major_version > major) ||
+        (($imlib_major_version == major) && ($imlib_minor_version > minor)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version);
+      printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If imlib-config was wrong, set the environment variable IMLIBCONF\n");
+      printf("*** to point to the correct copy of imlib-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_imlib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_imlib" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])
+  else
+     AC_MSG_RESULT(no)
+     if test "$IMLIBCONF" = "no" ; then
+       echo "*** The imlib-config script installed by IMLIB could not be found"
+       echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the IMLIBCONF environment variable to the"
+       echo "*** full path to imlib-config."
+     else
+       if test -f conf.imlibtest ; then
+        :
+       else
+          echo "*** Could not run IMLIB test program, checking why..."
+          CFLAGS="$CFLAGS $IMLIB_CFLAGS"
+          LIBS="$LIBS $IMLIB_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include <gdk_imlib.h>
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding IMLIB or finding the wrong"
+          echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means IMLIB was incorrectly installed"
+          echo "*** or that you have moved IMLIB since it was installed. In the latter case, you"
+          echo "*** may want to edit the imlib-config script: $IMLIBCONF" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     IMLIB_CFLAGS=""
+     IMLIB_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(IMLIB_CFLAGS)
+  AC_SUBST(IMLIB_LIBS)
+  rm -f conf.imlibtest
+])
+
 # Check for gdk-imlib
 AC_DEFUN([AM_PATH_GDK_IMLIB],
 [dnl
--- fvwm-2.5.18.orig/perllib/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/perllib/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.687
--- fvwm-2.5.18.orig/perllib/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/perllib/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.654
--- fvwm-2.5.18.orig/perllib/.arch-ids/=id
+++ fvwm-2.5.18/perllib/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.653
--- fvwm-2.5.18.orig/perllib/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/perllib/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.688
--- fvwm-2.5.18.orig/perllib/Makefile.in
+++ fvwm-2.5.18/perllib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = perllib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
@@ -41,7 +42,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -192,6 +193,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -294,7 +297,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -306,7 +315,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -314,7 +323,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -335,7 +350,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -434,15 +449,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -471,7 +488,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/perllib/General/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/perllib/General/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.684
--- fvwm-2.5.18.orig/perllib/General/.arch-ids/Parse.pm.id
+++ fvwm-2.5.18/perllib/General/.arch-ids/Parse.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.686
--- fvwm-2.5.18.orig/perllib/General/.arch-ids/FileSystem.pm.id
+++ fvwm-2.5.18/perllib/General/.arch-ids/FileSystem.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.683
--- fvwm-2.5.18.orig/perllib/General/.arch-ids/=id
+++ fvwm-2.5.18/perllib/General/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.682
--- fvwm-2.5.18.orig/perllib/General/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/perllib/General/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.685
--- fvwm-2.5.18.orig/perllib/General/Makefile.in
+++ fvwm-2.5.18/perllib/General/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = perllib/General
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,11 +43,17 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(configdir)"
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
@@ -187,6 +194,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -288,7 +297,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -296,7 +305,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -360,7 +369,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.674
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/WindowList.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/WindowList.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.679
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/PageInfo.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/PageInfo.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.677
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/ModuleConfig.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/ModuleConfig.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.676
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/Colorsets.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/Colorsets.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.672
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/Scheduler.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/Scheduler.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.678
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/GlobalConfig.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/GlobalConfig.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.673
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/=id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.670
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/perllib/FVWM/Tracker/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.675
--- fvwm-2.5.18.orig/perllib/FVWM/Tracker/Makefile.in
+++ fvwm-2.5.18/perllib/FVWM/Tracker/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = perllib/FVWM/Tracker
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,11 +43,17 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(configdir)"
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
@@ -187,6 +194,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -291,7 +300,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -299,7 +308,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -363,7 +372,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.660
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/EventNames.pm.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/EventNames.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.659
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Commands.pm.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Commands.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.656
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Event.pm.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Event.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.658
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/create-constants.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/create-constants.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.681
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Module.pm.in.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Module.pm.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.663
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/=id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.655
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Constants.pm.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Constants.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.657
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.661
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/create-commands.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/create-commands.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.680
--- fvwm-2.5.18.orig/perllib/FVWM/.arch-ids/Tracker.pm.id
+++ fvwm-2.5.18/perllib/FVWM/.arch-ids/Tracker.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.671
--- fvwm-2.5.18.orig/perllib/FVWM/Makefile.in
+++ fvwm-2.5.18/perllib/FVWM/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = perllib/FVWM
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -43,7 +44,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = Module.pm
 SOURCES =
@@ -54,6 +55,12 @@
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(configdir)"
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
@@ -197,6 +204,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -304,7 +313,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -312,7 +321,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -324,7 +333,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -336,7 +351,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -344,7 +359,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -365,7 +386,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -464,15 +485,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -504,7 +527,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.666
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Gtk2.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Gtk2.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.665
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Gtk.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Gtk.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.664
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Terminal.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Terminal.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Apr  6 13:37:26 2004 3026.0
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Toolkit.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Toolkit.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.669
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/=id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.662
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Tk.pm.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Tk.pm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.668
--- fvwm-2.5.18.orig/perllib/FVWM/Module/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/perllib/FVWM/Module/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.667
--- fvwm-2.5.18.orig/perllib/FVWM/Module/Makefile.in
+++ fvwm-2.5.18/perllib/FVWM/Module/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = perllib/FVWM/Module
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,11 +43,17 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(configdir)"
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
@@ -187,6 +194,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -288,7 +297,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -296,7 +305,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -360,7 +369,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/configure
+++ fvwm-2.5.18/configure
@@ -1,8 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.60a.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -16,11 +17,35 @@
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -29,8 +54,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +104,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +124,386 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -222,7 +512,19 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,39 +533,27 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
 
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
@@ -275,42 +565,256 @@
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ISRELEASED VERSIONINFO RELDATELONG RELDATESHORT RELDATENUM FVWMNAMEUCASE FVWMNAMELONG FVWMHOMEPAGE FVWMFTP FVWMFTPDIR FVWMALTFTP FVWMALTFTPDIR FVWMLIST FVWMWORKERSLIST FVWMWORKERSLISTLONG MANPAGE_PREAMBLE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot FVWM_MODULEDIR FVWM_DATADIR FVWM_PERLLIBDIR FVWM_CONFDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS FVWM_IMAGEPATH EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKG_CONFIG Xinerama_LIBS Xinerama_CFLAGS Xrender_LIBS Xrender_CFLAGS FT2_CONFIG FT2_CFLAGS FT2_LIBS FC_CONFIG FC_CFLAGS FC_LIBS XFT_CONFIG XFT_CFLAGS XFT_LIBS Xft_LIBS Xft_CFLAGS xpm_LIBS xpm_CFLAGS png_LIBS png_CFLAGS rplay_LIBS rplay_CFLAGS stroke_LIBS stroke_CFLAGS readline_LIBS readline_CFLAGS iconv_LIBS iconv_CFLAGS FRIBIDI_CONFIG Bidi_LIBS Bidi_CFLAGS FVWM_PERLLIB ALL_LINGUAS FVWM_DOMAIN FVWMTASKBAR_DOMAIN FVWMSCRIPT_DOMAIN ALL_DOMAINS MSGFMT GMSGFMT XGETTEXT MSGMERGE MSGUNIQ intl_LIBS intl_CFLAGS USE_NLS POSUB LOCALEDIR MKINSTALLDIRS INST_LINGUAS CATALOGS POFILES GMOFILES UPDATEPOFILES DUMMYPOFILES CATOBJEXT FVWM_CPP LN_S RANLIB ac_ct_RANLIB REQUIRED_PERL_VERSION PERL ALLOCA LIBOBJS GTK_CONFIG FVWMGTK MANFVWMGTK GTK_CFLAGS GTK_LIBS IMLIBCONF GDK_IMLIB_CFLAGS GDK_IMLIB_LIBS GNOME_LIBS GNOMEUI_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG with_bidi with_gtk with_gdkimlib with_gettext with_gnomelibs with_iconv with_perllib with_png with_readline with_rplay with_shape with_shm with_sm with_stroke with_xft with_xinerama with_xrender with_xpm LOCAL_BUGADDR LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+ISRELEASED
+VERSIONINFO
+RELDATELONG
+RELDATESHORT
+RELDATENUM
+FVWMNAMEUCASE
+FVWMNAMELONG
+FVWMHOMEPAGE
+FVWMFTP
+FVWMFTPDIR
+FVWMALTFTP
+FVWMALTFTPDIR
+FVWMLIST
+FVWMWORKERSLIST
+FVWMWORKERSLISTLONG
+MANPAGE_PREAMBLE
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+FVWM_MODULEDIR
+FVWM_DATADIR
+FVWM_PERLLIBDIR
+FVWM_CONFDIR
+XMKMF
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+CPP
+X_CFLAGS
+X_PRE_LIBS
+X_LIBS
+X_EXTRA_LIBS
+FVWM_IMAGEPATH
+GREP
+EGREP
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+PKG_CONFIG
+Xinerama_LIBS
+Xinerama_CFLAGS
+Xrender_LIBS
+Xrender_CFLAGS
+FT2_CONFIG
+FT2_CFLAGS
+FT2_LIBS
+FC_CONFIG
+FC_CFLAGS
+FC_LIBS
+XFT_CONFIG
+XFT_CFLAGS
+XFT_LIBS
+Xft_LIBS
+Xft_CFLAGS
+xpm_LIBS
+xpm_CFLAGS
+png_LIBS
+png_CFLAGS
+rplay_LIBS
+rplay_CFLAGS
+stroke_LIBS
+stroke_CFLAGS
+readline_LIBS
+readline_CFLAGS
+iconv_LIBS
+iconv_CFLAGS
+FRIBIDI_CONFIG
+Bidi_LIBS
+Bidi_CFLAGS
+FVWM_PERLLIB
+ALL_LINGUAS
+FVWM_DOMAIN
+FVWMTASKBAR_DOMAIN
+FVWMSCRIPT_DOMAIN
+ALL_DOMAINS
+MSGFMT
+GMSGFMT
+XGETTEXT
+MSGMERGE
+MSGUNIQ
+intl_LIBS
+intl_CFLAGS
+USE_NLS
+POSUB
+LOCALEDIR
+MKINSTALLDIRS
+INST_LINGUAS
+CATALOGS
+POFILES
+GMOFILES
+UPDATEPOFILES
+DUMMYPOFILES
+CATOBJEXT
+FVWM_CPP
+LN_S
+RANLIB
+REQUIRED_PERL_VERSION
+PERL
+ALLOCA
+LIBOBJS
+GTK_CONFIG
+FVWMGTK
+MANFVWMGTK
+GTK_CFLAGS
+GTK_LIBS
+IMLIBCONF
+GDK_IMLIB_CFLAGS
+GDK_IMLIB_LIBS
+GNOME_LIBS
+GNOMEUI_LIBS
+GNOME_LIBDIR
+GNOME_INCLUDEDIR
+GNOME_CONFIG
+with_bidi
+with_gtk
+with_gdkimlib
+with_gettext
+with_gnomelibs
+with_iconv
+with_perllib
+with_png
+with_readline
+with_rplay
+with_shape
+with_shm
+with_sm
+with_stroke
+with_xft
+with_xinerama
+with_xrender
+with_xpm
+LOCAL_BUGADDR
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+XMKMF
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+CPP'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -337,34 +841,48 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -386,12 +904,18 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
@@ -399,7 +923,17 @@
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    eval enable_$ac_feature=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
@@ -408,11 +942,7 @@
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -439,6 +969,12 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -463,13 +999,16 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -534,6 +1073,16 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -590,11 +1139,7 @@
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
@@ -603,7 +1148,7 @@
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -634,8 +1179,7 @@
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -655,27 +1199,19 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -702,76 +1238,78 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
@@ -798,9 +1336,6 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -818,15 +1353,22 @@
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -922,130 +1464,99 @@
   --with-gnome            no, yes or prefix for GNOME files (for FvwmGtk only)
 
 Some influential environment variables:
+  XMKMF       Path to xmkmf, Makefile generator for X Window System
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.60a
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1064,7 +1575,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1078,6 +1589,7 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1099,7 +1611,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1110,7 +1621,7 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1132,9 +1643,7 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1145,8 +1654,8 @@
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1159,20 +1668,34 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1183,22 +1706,28 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1210,26 +1739,24 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1260,14 +1787,17 @@
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1283,8 +1813,8 @@
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1296,12 +1826,11 @@
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1326,8 +1855,7 @@
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1344,12 +1872,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
 
 
@@ -1366,6 +1888,11 @@
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1436,31 +1963,37 @@
 
 
 
-am__api_version="1.8"
+am__api_version="1.9"
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1475,8 +2008,8 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1498,7 +2031,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1517,21 +2050,22 @@
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1541,8 +2075,8 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1584,20 +2118,20 @@
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed
 s/[\\$]/&&/g;s/;s,x,x,$//
 _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1613,13 +2147,21 @@
 fi
 
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -1641,8 +2183,8 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1655,54 +2197,57 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1763,9 +2308,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
@@ -1776,8 +2318,8 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1790,32 +2332,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1828,27 +2372,41 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -1858,22 +2416,29 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
 
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
-          ac_config_headers="$ac_config_headers config.h"
+
+
+
+ac_config_headers="$ac_config_headers config.h"
 
 
 # installation paths
 FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
 FVWM_DATASUBDIR=/${PACKAGE}
 
-# Check whether --enable-package-subdirs or --disable-package-subdirs was given.
+# Check whether --enable-package-subdirs was given.
 if test "${enable_package_subdirs+set}" = set; then
-  enableval="$enable_package_subdirs"
-  if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
+  enableval=$enable_package_subdirs; if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
   fi
-fi;
+fi
+
 
 FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
 FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
@@ -1900,80 +2465,80 @@
 
 # Various configure-time options
 
-# Check whether --enable-dmalloc or --disable-dmalloc was given.
+# Check whether --enable-dmalloc was given.
 if test "${enable_dmalloc+set}" = set; then
-  enableval="$enable_dmalloc"
-  ac_cv_dmalloc="$enableval"
+  enableval=$enable_dmalloc; ac_cv_dmalloc="$enableval"
 else
   ac_cv_dmalloc="no"
-fi;
+fi
 
-# Check whether --enable-efence or --disable-efence was given.
+
+# Check whether --enable-efence was given.
 if test "${enable_efence+set}" = set; then
-  enableval="$enable_efence"
-  ac_cv_efence="$enableval"
+  enableval=$enable_efence; ac_cv_efence="$enableval"
 else
   ac_cv_efence="no"
-fi;
+fi
 
 
-    echo "$as_me:$LINENO: checking whether to enable command logging" >&5
-echo $ECHO_N "checking whether to enable command logging... $ECHO_C" >&6
-    # Check whether --enable-command-log or --disable-command-log was given.
-if test "${enable_command_log+set}" = set; then
-  enableval="$enable_command_log"
 
+    { echo "$as_me:$LINENO: checking whether to enable command logging" >&5
+echo $ECHO_N "checking whether to enable command logging... $ECHO_C" >&6; }
+    # Check whether --enable-command-log was given.
+if test "${enable_command_log+set}" = set; then
+  enableval=$enable_command_log;
 
 
          if test "$enableval" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             cat >>confdefs.h <<\_ACEOF
 #define FVWM_COMMAND_LOG 1
 _ACEOF
 
         else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
         fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
 
-fi;
+fi
 
 
 
 
 
-    echo "$as_me:$LINENO: checking whether to enable debugging messages" >&5
-echo $ECHO_N "checking whether to enable debugging messages... $ECHO_C" >&6
-    # Check whether --enable-debug-msgs or --disable-debug-msgs was given.
-if test "${enable_debug_msgs+set}" = set; then
-  enableval="$enable_debug_msgs"
 
+    { echo "$as_me:$LINENO: checking whether to enable debugging messages" >&5
+echo $ECHO_N "checking whether to enable debugging messages... $ECHO_C" >&6; }
+    # Check whether --enable-debug-msgs was given.
+if test "${enable_debug_msgs+set}" = set; then
+  enableval=$enable_debug_msgs;
 
 
          if test "$enableval" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             cat >>confdefs.h <<\_ACEOF
 #define FVWM_DEBUG_MSGS 1
 _ACEOF
 
         else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
         fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
 
+fi
 
-fi;
 
 
 
@@ -1983,7 +2548,7 @@
 no_x=""
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
@@ -1993,8 +2558,8 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -2021,15 +2586,15 @@
 fi
 
 
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
 rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+# Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
+  enableval=$enable_dependency_tracking;
+fi
 
-fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -2054,8 +2619,8 @@
 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2068,32 +2633,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2106,36 +2673,51 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2148,74 +2730,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2229,7 +2771,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2240,6 +2782,7 @@
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -2257,22 +2800,23 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2285,36 +2829,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2327,29 +2873,45 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -2362,21 +2924,35 @@
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2401,47 +2977,77 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2453,19 +3059,21 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2484,22 +3092,27 @@
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2510,9 +3123,8 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2526,14 +3138,14 @@
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2553,14 +3165,20 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2578,12 +3196,12 @@
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2606,24 +3224,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2632,24 +3262,139 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2665,24 +3410,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2691,12 +3448,20 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2712,12 +3477,12 @@
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2751,12 +3516,17 @@
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2771,205 +3541,74 @@
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2978,8 +3617,8 @@
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3068,8 +3707,8 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
@@ -3091,8 +3730,8 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3126,8 +3765,13 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3152,9 +3796,10 @@
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3164,8 +3809,13 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3192,6 +3842,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3209,8 +3860,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3233,8 +3884,13 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3259,9 +3915,10 @@
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3271,8 +3928,13 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3299,6 +3961,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -3321,44 +3984,49 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
 
 
-# Check whether --with-x or --without-x was given.
+# Check whether --with-x was given.
 if test "${with_x+set}" = set; then
-  withval="$with_x"
+  withval=$with_x;
+fi
 
-fi;
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
+  case $x_includes,$x_libraries in #(
+    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+   { (exit 1); exit 1; }; };; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+incroot:
+	@echo incroot='${INCROOT}'
+usrlibdir:
+	@echo usrlibdir='${USRLIBDIR}'
+libdir:
+	@echo libdir='${LIBDIR}'
 _ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    for ac_var in incroot usrlibdir libdir; do
+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+    done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -3366,7 +4034,7 @@
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ;;
+	/usr/include) ac_x_includes= ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
@@ -3375,7 +4043,7 @@
     esac
   fi
   cd ..
-  rm -fr conftest.dir
+  rm -f -r conftest.dir
 fi
 
 # Standard set of common directories for X headers.
@@ -3416,7 +4084,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3424,10 +4092,15 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3451,12 +4124,13 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
 done
 fi
+
 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
@@ -3465,41 +4139,53 @@
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3510,49 +4196,54 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-LIBS=$ac_save_LIBS
+	LIBS=$ac_save_LIBS
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
+    if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
+case $ac_x_includes,$ac_x_libraries in #(
+  no,* | *,no | *\'*)
+    # Didn't find X, or a directory has "'" in its name.
+    ac_cv_have_x="have_x=no";; #(
+  *)
+    # Record where we found X for the cache.
+    ac_cv_have_x="have_x=yes\
+	ac_x_includes='$ac_x_includes'\
+	ac_x_libraries='$ac_x_libraries'"
+esac
 fi
-
-  fi
+;; #(
+    *) have_x=yes;;
+  esac
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+  { echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  ac_cv_have_x="have_x=yes\
+	ac_x_includes='$x_includes'\
+	ac_x_libraries='$x_libraries'"
+  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 if test "$no_x" = yes; then
@@ -3573,12 +4264,12 @@
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
-      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-      cat >conftest.$ac_ext <<_ACEOF
+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+    ac_xsave_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3594,43 +4285,48 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_R_nospace=yes
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+       X_LIBS="$X_LIBS -R$x_libraries"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_R_nospace=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-      if test $ac_R_nospace = yes; then
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3646,47 +4342,58 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_R_space=yes
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	  X_LIBS="$X_LIBS -R $x_libraries"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_R_space=no
+	{ echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6; }
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-	if test $ac_R_space = yes; then
-	  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
-	fi
-      fi
-      LIBS=$ac_xsave_LIBS
-    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    ac_c_werror_flag=$ac_xsave_c_werror_flag
+    LIBS=$ac_xsave_LIBS
   fi
 
   # Check for system-dependent libraries X programs must link with.
@@ -3707,40 +4414,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XOpenDisplay ();
 int
 main ()
 {
-XOpenDisplay ();
+return XOpenDisplay ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3749,8 +4468,8 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3763,40 +4482,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
 main ()
 {
-dnet_ntoa ();
+return dnet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3805,21 +4536,22 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dnet_dnet_ntoa=no
+	ac_cv_lib_dnet_dnet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3832,40 +4564,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dnet_ntoa ();
 int
 main ()
 {
-dnet_ntoa ();
+return dnet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3874,21 +4618,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
@@ -3900,8 +4646,8 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3928,53 +4674,59 @@
 
 #undef gethostbyname
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
 choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != gethostbyname;
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3983,17 +4735,18 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_gethostbyname=no
+	ac_cv_func_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4006,40 +4759,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
 main ()
 {
-gethostbyname ();
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4048,21 +4813,22 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_nsl_gethostbyname=no
+	ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4075,40 +4841,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyname ();
 int
 main ()
 {
-gethostbyname ();
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4117,14 +4895,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_bsd_gethostbyname=no
+	ac_cv_lib_bsd_gethostbyname=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
@@ -4139,8 +4918,8 @@
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4167,53 +4946,59 @@
 
 #undef connect
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_connect) || defined (__stub___connect)
+#if defined __stub_connect || defined __stub___connect
 choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != connect;
+return connect ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4222,17 +5007,18 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_connect=no
+	ac_cv_func_connect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4245,40 +5031,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char connect ();
 int
 main ()
 {
-connect ();
+return connect ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4287,14 +5085,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_socket_connect=no
+	ac_cv_lib_socket_connect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
@@ -4302,8 +5101,8 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4330,53 +5129,59 @@
 
 #undef remove
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char remove ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_remove) || defined (__stub___remove)
+#if defined __stub_remove || defined __stub___remove
 choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != remove;
+return remove ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4385,17 +5190,18 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_remove=no
+	ac_cv_func_remove=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4408,40 +5214,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char remove ();
 int
 main ()
 {
-remove ();
+return remove ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4450,14 +5268,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_posix_remove=no
+	ac_cv_lib_posix_remove=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
@@ -4465,8 +5284,8 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4493,53 +5312,59 @@
 
 #undef shmat
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shmat ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shmat) || defined (__stub___shmat)
+#if defined __stub_shmat || defined __stub___shmat
 choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != shmat;
+return shmat ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4548,17 +5373,18 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_shmat=no
+	ac_cv_func_shmat=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4571,40 +5397,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shmat ();
 int
 main ()
 {
-shmat ();
+return shmat ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4613,14 +5451,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ipc_shmat=no
+	ac_cv_lib_ipc_shmat=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
@@ -4637,8 +5476,8 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4651,40 +5490,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char IceConnectionNumber ();
 int
 main ()
 {
-IceConnectionNumber ();
+return IceConnectionNumber ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4693,14 +5544,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ICE_IceConnectionNumber=no
+	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
@@ -4727,14 +5579,13 @@
 # at all: it is settable at runtime, and only confuses the issue to
 # have it settable here too.
 #
-echo "$as_me:$LINENO: checking imagepath" >&5
-echo $ECHO_N "checking imagepath... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking imagepath" >&5
+echo $ECHO_N "checking imagepath... $ECHO_C" >&6; }
 val="/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
 
-# Check whether --with-imagepath or --without-imagepath was given.
+# Check whether --with-imagepath was given.
 if test "${with_imagepath+set}" = set; then
-  withval="$with_imagepath"
-   case "$withval" in
+  withval=$with_imagepath;  case "$withval" in
   no)
     { { echo "$as_me:$LINENO: error: Can not disable image path." >&5
 echo "$as_me: error: Can not disable image path." >&2;}
@@ -4746,7 +5597,8 @@
     val="$withval"
     ;;
   esac
-fi;
+fi
+
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4756,8 +5608,8 @@
 
 FVWM_IMAGEPATH="$val"
 
-echo "$as_me:$LINENO: result: $val" >&5
-echo "${ECHO_T}$val" >&6
+{ echo "$as_me:$LINENO: result: $val" >&5
+echo "${ECHO_T}$val" >&6; }
 
 # Minimal checks for programs: enough to enable checking for
 # optional libraries.
@@ -4769,8 +5621,8 @@
 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
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4783,32 +5635,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4821,36 +5675,51 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4863,98 +5732,59 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
+  fi
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
+if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
+  ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -4972,22 +5802,23 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5000,36 +5831,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5042,29 +5875,45 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -5077,27 +5926,41 @@
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5120,24 +5983,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -5146,24 +6021,139 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5179,24 +6169,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -5205,12 +6207,20 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -5226,12 +6236,12 @@
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5265,12 +6275,17 @@
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -5285,205 +6300,74 @@
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5492,8 +6376,8 @@
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5582,8 +6466,8 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
@@ -5604,8 +6488,8 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -5639,8 +6523,13 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5665,9 +6554,10 @@
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5677,8 +6567,13 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5705,6 +6600,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5722,8 +6618,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -5746,8 +6642,13 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5772,9 +6673,10 @@
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5784,8 +6686,13 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5812,6 +6719,7 @@
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5840,13 +6748,12 @@
 fi
 
 # Help finding POSIX functions on some systems
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
 if test "${ac_cv_search_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5854,135 +6761,256 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strerror ();
 int
 main ()
 {
-strerror ();
+return strerror ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
+  ac_cv_search_strerror=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_GREP_found && break 3
   done
+done
+
+done
+IFS=$as_save_IFS
+
+
 fi
-LIBS=$ac_func_search_save_LIBS
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
 
 fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+  ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_EGREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+
+   fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6006,24 +7034,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6032,9 +7072,10 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -6090,6 +7131,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -6109,18 +7151,27 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6133,12 +7184,14 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6161,9 +7214,9 @@
 		  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6177,24 +7230,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6203,12 +7268,14 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+	eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -6220,17 +7287,17 @@
 
 
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6241,24 +7308,36 @@
 #include <minix/config.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6267,15 +7346,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6284,8 +7364,13 @@
 /* end confdefs.h.  */
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -6309,9 +7394,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -6335,25 +7421,18 @@
 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_minix_config_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
 
 fi
 if test $ac_cv_header_minix_config_h = yes; then
@@ -6403,24 +7482,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6429,7 +7520,7 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: \"
+	{ { echo "$as_me:$LINENO: error: \"
 configure is not able to compile programs with warnings.  Please
 remove all offending options like -Werror from the CFLAGS and
 CPPFLAGS variables and run configure again.\"" >&5
@@ -6439,13 +7530,14 @@
 CPPFLAGS variables and run configure again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 # check size of some types
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS"
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6456,36 +7548,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef int ac__type_new_;
 int
 main ()
 {
-if ((int *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (int))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6494,23 +7599,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_int=no
+	ac_cv_type_int=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6; }
 
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -6520,10 +7625,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef int ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -6531,24 +7638,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6561,10 +7680,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef int ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6572,24 +7693,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6598,30 +7731,33 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef int ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -6629,24 +7765,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6659,10 +7807,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef int ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6670,24 +7820,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6696,24 +7858,27 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -6724,10 +7889,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef int ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6735,24 +7902,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6761,26 +7940,24 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+'') if test "$ac_cv_type_int" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_int=0
+	       fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6788,8 +7965,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
+	        typedef int ac__type_sizeof_;
+
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -6798,35 +7977,44 @@
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6837,29 +8025,32 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+if test "$ac_cv_type_int" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_int=0
+	       fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6870,36 +8061,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef long ac__type_new_;
 int
 main ()
 {
-if ((long *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (long))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6908,23 +8112,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_long=no
+	ac_cv_type_long=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6; }
 
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -6934,10 +8138,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef long ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -6945,24 +8151,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -6975,10 +8193,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef long ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -6986,24 +8206,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7012,30 +8244,33 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef long ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7043,24 +8278,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7073,10 +8320,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef long ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7084,24 +8333,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7110,24 +8371,27 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7138,10 +8402,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef long ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7149,24 +8415,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7175,26 +8453,24 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+'') if test "$ac_cv_type_long" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_long=0
+	       fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7202,8 +8478,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
+	        typedef long ac__type_sizeof_;
+
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -7212,35 +8490,44 @@
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7251,29 +8538,32 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+if test "$ac_cv_type_long" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_long=0
+	       fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for Window" >&5
-echo $ECHO_N "checking for Window... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Window" >&5
+echo $ECHO_N "checking for Window... $ECHO_C" >&6; }
 if test "${ac_cv_type_Window+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7286,36 +8576,49 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+typedef Window ac__type_new_;
 int
 main ()
 {
-if ((Window *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (Window))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7324,23 +8627,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_Window=no
+	ac_cv_type_Window=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_Window" >&5
-echo "${ECHO_T}$ac_cv_type_Window" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_Window" >&5
+echo "${ECHO_T}$ac_cv_type_Window" >&6; }
 
-echo "$as_me:$LINENO: checking size of Window" >&5
-echo $ECHO_N "checking size of Window... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of Window" >&5
+echo $ECHO_N "checking size of Window... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_Window+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_Window" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -7352,10 +8655,12 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+	        typedef Window ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Window))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -7363,24 +8668,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7395,10 +8712,12 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+	        typedef Window ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Window))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7406,24 +8725,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7432,20 +8763,21 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7454,10 +8786,12 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+	        typedef Window ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Window))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7465,24 +8799,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7497,10 +8843,12 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+	        typedef Window ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Window))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7508,24 +8856,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7534,24 +8894,27 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7564,10 +8927,12 @@
 #include <stdio.h>
 #include <X11/X.h>
 
+	        typedef Window ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Window))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7575,24 +8940,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7601,26 +8978,24 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_Window=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (Window), 77
+'') if test "$ac_cv_type_Window" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (Window)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (Window), 77
+echo "$as_me: error: cannot compute sizeof (Window)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_Window=0
+	       fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7630,8 +9005,10 @@
 #include <stdio.h>
 #include <X11/X.h>
 
-long longval () { return (long) (sizeof (Window)); }
-unsigned long ulongval () { return (long) (sizeof (Window)); }
+	        typedef Window ac__type_sizeof_;
+
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -7640,35 +9017,44 @@
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (Window))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (Window))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (Window))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7679,29 +9065,32 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (Window), 77
+if test "$ac_cv_type_Window" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (Window)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (Window), 77
+echo "$as_me: error: cannot compute sizeof (Window)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_Window=0
+	       fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_Window=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_Window" >&5
-echo "${ECHO_T}$ac_cv_sizeof_Window" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_Window" >&5
+echo "${ECHO_T}$ac_cv_sizeof_Window" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_WINDOW $ac_cv_sizeof_Window
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for Pixel" >&5
-echo $ECHO_N "checking for Pixel... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Pixel" >&5
+echo $ECHO_N "checking for Pixel... $ECHO_C" >&6; }
 if test "${ac_cv_type_Pixel+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7714,36 +9103,49 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+typedef Pixel ac__type_new_;
 int
 main ()
 {
-if ((Pixel *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (Pixel))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7752,23 +9154,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_Pixel=no
+	ac_cv_type_Pixel=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_Pixel" >&5
-echo "${ECHO_T}$ac_cv_type_Pixel" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_Pixel" >&5
+echo "${ECHO_T}$ac_cv_type_Pixel" >&6; }
 
-echo "$as_me:$LINENO: checking size of Pixel" >&5
-echo $ECHO_N "checking size of Pixel... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of Pixel" >&5
+echo $ECHO_N "checking size of Pixel... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_Pixel+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_Pixel" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -7780,10 +9182,12 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+	        typedef Pixel ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Pixel))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -7791,24 +9195,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7823,10 +9239,12 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+	        typedef Pixel ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Pixel))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7834,24 +9252,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7860,20 +9290,21 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -7882,10 +9313,12 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+	        typedef Pixel ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Pixel))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -7893,24 +9326,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7925,10 +9370,12 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+	        typedef Pixel ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Pixel))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -7936,24 +9383,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7962,24 +9421,27 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -7992,10 +9454,12 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
+	        typedef Pixel ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (Pixel))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8003,24 +9467,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8029,26 +9505,24 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_Pixel=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (Pixel), 77
+'') if test "$ac_cv_type_Pixel" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (Pixel)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (Pixel), 77
+echo "$as_me: error: cannot compute sizeof (Pixel)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_Pixel=0
+	       fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8058,8 +9532,10 @@
 #include <stdio.h>
 #include <X11/Intrinsic.h>
 
-long longval () { return (long) (sizeof (Pixel)); }
-unsigned long ulongval () { return (long) (sizeof (Pixel)); }
+	        typedef Pixel ac__type_sizeof_;
+
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -8068,35 +9544,44 @@
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (Pixel))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (Pixel))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (Pixel))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8107,29 +9592,32 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (Pixel), 77
+if test "$ac_cv_type_Pixel" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (Pixel)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (Pixel), 77
+echo "$as_me: error: cannot compute sizeof (Pixel)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_Pixel=0
+	       fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_Pixel=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_Pixel" >&5
-echo "${ECHO_T}$ac_cv_sizeof_Pixel" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_Pixel" >&5
+echo "${ECHO_T}$ac_cv_sizeof_Pixel" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_PIXEL $ac_cv_sizeof_Pixel
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking for void *" >&5
-echo $ECHO_N "checking for void *... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
 if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8140,36 +9628,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef void * ac__type_new_;
 int
 main ()
 {
-if ((void * *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (void *))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8178,23 +9679,23 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_void_p=no
+	ac_cv_type_void_p=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
-echo "${ECHO_T}$ac_cv_type_void_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
 
-echo "$as_me:$LINENO: checking size of void *" >&5
-echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$ac_cv_type_void_p" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -8204,10 +9705,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef void * ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -8215,24 +9718,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8245,10 +9760,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef void * ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8256,24 +9773,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8282,30 +9811,33 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef void * ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -8313,24 +9845,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8343,10 +9887,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef void * ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8354,24 +9900,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8380,24 +9938,27 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo= ac_hi=
+	ac_lo= ac_hi=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
@@ -8408,10 +9969,12 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+	        typedef void * ac__type_sizeof_;
+
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -8419,24 +9982,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8445,26 +10020,24 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_lo=`expr '(' $ac_mid ')' + 1`
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_void_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+'') if test "$ac_cv_type_void_p" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *), 77
+echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_void_p=0
+	       fi ;;
 esac
 else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8472,8 +10045,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-long longval () { return (long) (sizeof (void *)); }
-unsigned long ulongval () { return (long) (sizeof (void *)); }
+	        typedef void * ac__type_sizeof_;
+
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -8482,35 +10057,44 @@
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
-    exit (1);
-  if (((long) (sizeof (void *))) < 0)
+    return 1;
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
-      long i = longval ();
-      if (i != ((long) (sizeof (void *))))
-	exit (1);
+      long int i = longval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%ld\n", i);
     }
   else
     {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (void *))))
-	exit (1);
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+	return 1;
       fprintf (f, "%lu\n", i);
     }
-  exit (ferror (f) || fclose (f) != 0);
+  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8521,22 +10105,25 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+if test "$ac_cv_type_void_p" = yes; then
+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *), 77
+echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+   { (exit 77); exit 77; }; }
+	       else
+	         ac_cv_sizeof_void_p=0
+	       fi
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_void_p=0
-fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
@@ -8573,63 +10160,92 @@
 # ********* multibyte
 # FreeBSD has libxpg4, check this and use if found.
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 case $host_os in
 freebsd*)
-	echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
-echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
+echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6; }
 if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8642,40 +10258,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char setlocale ();
 int
 main ()
 {
-setlocale ();
+return setlocale ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8684,14 +10312,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_xpg4_setlocale=no
+	ac_cv_lib_xpg4_setlocale=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
-echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
+echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6; }
 if test $ac_cv_lib_xpg4_setlocale = yes; then
   LIBS="$LIBS -lxpg4"
 fi
@@ -8704,21 +10333,21 @@
 # unfortunately, we need pkg-config for the detection of certain libs:
 # - certain version of fontconfig (without fontconfig-config
 
-# Check whether --with-pkgconfig-prefix or --without-pkgconfig-prefix was given.
+# Check whether --with-pkgconfig-prefix was given.
 if test "${with_pkgconfig_prefix+set}" = set; then
-  withval="$with_pkgconfig_prefix"
-  pkgconfig_config_prefix="$withval"
+  withval=$with_pkgconfig_prefix; pkgconfig_config_prefix="$withval"
 else
   pkgconfig_config_prefix=""
-fi;
+fi
 
-# Check whether --with-pkgconfig-exec-prefix or --without-pkgconfig-exec-prefix was given.
+
+# Check whether --with-pkgconfig-exec-prefix was given.
 if test "${with_pkgconfig_exec_prefix+set}" = set; then
-  withval="$with_pkgconfig_exec_prefix"
-  pkgconfig_config_exec_prefix="$withval"
+  withval=$with_pkgconfig_exec_prefix; pkgconfig_config_exec_prefix="$withval"
 else
   pkgconfig_config_exec_prefix=""
-fi;
+fi
+
 
 if test x$pkgconfig_config_exec_prefix != x ; then
   pkgconfig_config_args="$pkgconfig_config_args --exec-prefix=$pkgconfig_config_exec_prefix"
@@ -8734,8 +10363,8 @@
 fi
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8750,40 +10379,40 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 
+
 # ********* session management
 # Check the availability of SM; we don't have to add any extra libraries,
 # since -lSM -lICE are in X_PRE_LIBS when they exist.
 
 problem_sm=""
 
-# Check whether --enable-sm or --disable-sm was given.
+# Check whether --enable-sm was given.
 if test "${enable_sm+set}" = set; then
-  enableval="$enable_sm"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_sm;  if test x"$enableval" = xyes; then
     with_sm="yes, check"
   else
     with_sm="no"
@@ -8792,15 +10421,16 @@
 else
    with_sm="not specified, check"
 
-fi;
+fi
+
 
 if test x"$with_sm" != xno; then
 
   $UNSET ac_cv_lib_SM_SmcOpenConnection
 
 
-  echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
-echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
+echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8813,40 +10443,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char SmcOpenConnection ();
 int
 main ()
 {
-SmcOpenConnection ();
+return SmcOpenConnection ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8855,14 +10497,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_SM_SmcOpenConnection=no
+	ac_cv_lib_SM_SmcOpenConnection=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
-echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6; }
 if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
   with_sm=yes; cat >>confdefs.h <<\_ACEOF
 #define SESSION 1
@@ -8882,10 +10525,9 @@
 
 
 # ********* shape extension
-# Check whether --enable-shape or --disable-shape was given.
+# Check whether --enable-shape was given.
 if test "${enable_shape+set}" = set; then
-  enableval="$enable_shape"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_shape;  if test x"$enableval" = xyes; then
     with_shape="yes, check"
   else
     with_shape="no"
@@ -8894,14 +10536,15 @@
 else
    with_shape="not specified, check"
 
-fi;
+fi
+
 
 
 
 if test x"$with_shape" != xno; then
   $UNSET ac_cv_lib_Xext_XShapeQueryExtension
-  echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
-echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8914,40 +10557,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XShapeQueryExtension ();
 int
 main ()
 {
-XShapeQueryExtension ();
+return XShapeQueryExtension ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8956,14 +10611,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xext_XShapeQueryExtension=no
+	ac_cv_lib_Xext_XShapeQueryExtension=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
 if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
   with_shape=yes; cat >>confdefs.h <<\_ACEOF
 #define SHAPE 1
@@ -8977,10 +10633,9 @@
 fi
 
 # ********* MIT Shared Memory Extension
-# Check whether --enable-shm or --disable-shm was given.
+# Check whether --enable-shm was given.
 if test "${enable_shm+set}" = set; then
-  enableval="$enable_shm"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_shm;  if test x"$enableval" = xyes; then
     with_shm="yes, check"
   else
     with_shm="no"
@@ -8989,14 +10644,15 @@
 else
    with_shm="not specified, check"
 
-fi;
+fi
+
 
 
 
 if test x"$with_shm" != xno; then
   $UNSET ac_cv_lib_Xext_XShmQueryExtension
-  echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5
-echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5
+echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9009,40 +10665,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XShmQueryExtension ();
 int
 main ()
 {
-XShmQueryExtension ();
+return XShmQueryExtension ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9051,14 +10719,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xext_XShmQueryExtension=no
+	ac_cv_lib_Xext_XShmQueryExtension=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6; }
 if test $ac_cv_lib_Xext_XShmQueryExtension = yes; then
   with_shm=yes; cat >>confdefs.h <<\_ACEOF
 #define HAVE_XSHM 1
@@ -9074,10 +10743,9 @@
 # ********* xinerama
 problem_xinerama=""
 
-# Check whether --enable-xinerama or --disable-xinerama was given.
+# Check whether --enable-xinerama was given.
 if test "${enable_xinerama+set}" = set; then
-  enableval="$enable_xinerama"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_xinerama;  if test x"$enableval" = xyes; then
     with_xinerama="yes, check"
   else
     with_xinerama="no"
@@ -9086,7 +10754,8 @@
 else
    with_xinerama="not specified, check"
 
-fi;
+fi
+
 
 
 
@@ -9097,8 +10766,8 @@
 if test x"$with_xinerama" != xno; then
   $UNSET ac_cv_lib_Xinerama_XineramaIsActive
   _check_solaris_xinerama=no
-  echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
-echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5
+echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9111,40 +10780,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XineramaIsActive ();
 int
 main ()
 {
-XineramaIsActive ();
+return XineramaIsActive ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9153,14 +10834,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xinerama_XineramaIsActive=no
+	ac_cv_lib_Xinerama_XineramaIsActive=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5
+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6; }
 if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then
   with_xinerama=yes; Xinerama_LIBS=-lXinerama; cat >>confdefs.h <<\_ACEOF
 #define HAVE_XINERAMA 1
@@ -9171,8 +10853,8 @@
 fi
 
   if test x"$_check_solaris_xinerama" = xyes; then
-    echo "$as_me:$LINENO: checking for XineramaGetState in -lXext" >&5
-echo $ECHO_N "checking for XineramaGetState in -lXext... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for XineramaGetState in -lXext" >&5
+echo $ECHO_N "checking for XineramaGetState in -lXext... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xext_XineramaGetState+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9185,40 +10867,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XineramaGetState ();
 int
 main ()
 {
-XineramaGetState ();
+return XineramaGetState ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9227,14 +10921,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xext_XineramaGetState=no
+	ac_cv_lib_Xext_XineramaGetState=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XineramaGetState" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XineramaGetState" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XineramaGetState" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XineramaGetState" >&6; }
 if test $ac_cv_lib_Xext_XineramaGetState = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_XINERAMA 1
@@ -9247,18 +10942,19 @@
       my_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$X_CPPFLAGS $CPPFLAGS"
       my_hdr="X11/extensions/xinerama.h"
       as_ac_Header=`echo "ac_cv_header_$my_hdr" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $my_hdr" >&5
-echo $ECHO_N "checking for $my_hdr... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $my_hdr" >&5
+echo $ECHO_N "checking for $my_hdr... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $my_hdr usability" >&5
-echo $ECHO_N "checking $my_hdr usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $my_hdr usability" >&5
+echo $ECHO_N "checking $my_hdr usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9269,24 +10965,36 @@
 #include <$my_hdr>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9295,15 +11003,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $my_hdr presence" >&5
-echo $ECHO_N "checking $my_hdr presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $my_hdr presence" >&5
+echo $ECHO_N "checking $my_hdr presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9312,8 +11021,13 @@
 /* end confdefs.h.  */
 #include <$my_hdr>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -9337,9 +11051,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -9363,25 +11078,19 @@
 echo "$as_me: WARNING: $my_hdr: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $my_hdr: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $my_hdr: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $my_hdr" >&5
-echo $ECHO_N "checking for $my_hdr... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $my_hdr" >&5
+echo $ECHO_N "checking for $my_hdr... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -9409,32 +11118,32 @@
 
 # ********* xinerama-emulation
 
-    echo "$as_me:$LINENO: checking whether to enable Xinerama emulation on one screen (useful only for developers)" >&5
-echo $ECHO_N "checking whether to enable Xinerama emulation on one screen (useful only for developers)... $ECHO_C" >&6
-    # Check whether --enable-xinerama-emulation or --disable-xinerama-emulation was given.
+    { echo "$as_me:$LINENO: checking whether to enable Xinerama emulation on one screen (useful only for developers)" >&5
+echo $ECHO_N "checking whether to enable Xinerama emulation on one screen (useful only for developers)... $ECHO_C" >&6; }
+    # Check whether --enable-xinerama-emulation was given.
 if test "${enable_xinerama_emulation+set}" = set; then
-  enableval="$enable_xinerama_emulation"
-
+  enableval=$enable_xinerama_emulation;
 
 
          if test "$enableval" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             cat >>confdefs.h <<\_ACEOF
 #define USE_XINERAMA_EMULATION 1
 _ACEOF
 
         else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
         fi
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
 
+fi
 
-fi;
 
 if test x"$enable_xinerama_emulation" = xyes; then
   with_xinerama_emulation=yes
@@ -9444,10 +11153,9 @@
 
 # ********* xrender
 problem_xrender=""
-# Check whether --enable-xrender or --disable-xrender was given.
+# Check whether --enable-xrender was given.
 if test "${enable_xrender+set}" = set; then
-  enableval="$enable_xrender"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_xrender;  if test x"$enableval" = xyes; then
     with_xrender="yes, check"
   else
     with_xrender="no"
@@ -9456,14 +11164,15 @@
 else
    with_xrender="not specified, check"
 
-fi;
+fi
+
 
 
 
 if test x"$with_xrender" != xno; then
   $UNSET ac_cv_lib_Xrender_XRenderComposite
-  echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
-echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
+echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9476,40 +11185,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XRenderComposite ();
 int
 main ()
 {
-XRenderComposite ();
+return XRenderComposite ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9518,14 +11239,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xrender_XRenderComposite=no
+	ac_cv_lib_Xrender_XRenderComposite=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
+echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; }
 if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
   with_xrender=yes; Xrender_LIBS=-lXrender;
     cat >>confdefs.h <<\_ACEOF
@@ -9544,10 +11266,9 @@
 # ********* xft
 problem_xft=""
 
-# Check whether --enable-xft or --disable-xft was given.
+# Check whether --enable-xft was given.
 if test "${enable_xft+set}" = set; then
-  enableval="$enable_xft"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_xft;  if test x"$enableval" = xyes; then
     with_xft="yes, check"
   else
     with_xft="no"
@@ -9558,7 +11279,8 @@
     with_xft="not specified, check"
 
 
-fi;
+fi
+
 
 
 
@@ -9571,28 +11293,28 @@
   # first check for freetype2
   have_freetype=no
 
-# Check whether --with-freetype-prefix or --without-freetype-prefix was given.
+# Check whether --with-freetype-prefix was given.
 if test "${with_freetype_prefix+set}" = set; then
-  withval="$with_freetype_prefix"
-  ft_config_prefix="$withval"
+  withval=$with_freetype_prefix; ft_config_prefix="$withval"
 else
   ft_config_prefix=""
-fi;
+fi
 
-# Check whether --with-freetype-exec-prefix or --without-freetype-exec-prefix was given.
+
+# Check whether --with-freetype-exec-prefix was given.
 if test "${with_freetype_exec_prefix+set}" = set; then
-  withval="$with_freetype_exec_prefix"
-  ft_config_exec_prefix="$withval"
+  withval=$with_freetype_exec_prefix; ft_config_exec_prefix="$withval"
 else
   ft_config_exec_prefix=""
-fi;
-# Check whether --enable-freetypetest or --disable-freetypetest was given.
-if test "${enable_freetypetest+set}" = set; then
-  enableval="$enable_freetypetest"
+fi
 
+# Check whether --enable-freetypetest was given.
+if test "${enable_freetypetest+set}" = set; then
+  enableval=$enable_freetypetest;
 else
   enable_fttest=yes
-fi;
+fi
+
 
 if test x$ft_config_exec_prefix != x ; then
   ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
@@ -9608,8 +11330,8 @@
 fi
 # Extract the first word of "freetype-config", so it can be a program name with args.
 set dummy freetype-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FT2_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9624,32 +11346,33 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FT2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_FT2_CONFIG" && ac_cv_path_FT2_CONFIG="no"
   ;;
 esac
 fi
 FT2_CONFIG=$ac_cv_path_FT2_CONFIG
-
 if test -n "$FT2_CONFIG"; then
-  echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
-echo "${ECHO_T}$FT2_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
+echo "${ECHO_T}$FT2_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
 min_ft_version=6.1.0
-echo "$as_me:$LINENO: checking for FreeType - version >= $min_ft_version" >&5
-echo $ECHO_N "checking for FreeType - version >= $min_ft_version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for FreeType - version >= $min_ft_version" >&5
+echo $ECHO_N "checking for FreeType - version >= $min_ft_version... $ECHO_C" >&6; }
 no_ft=""
 if test "$FT2_CONFIG" = "no" ; then
   no_ft=yes
@@ -9726,13 +11449,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9745,20 +11477,22 @@
 ( exit $ac_status )
 no_ft=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
       CFLAGS="$ac_save_CFLAGS"
       LIBS="$ac_save_LIBS"
     fi             # test $ft_config_version -lt $ft_min_version
   fi               # test "x$enable_fttest" = "xyes"
 fi                 # test "$FT2_CONFIG" = "no"
 if test "x$no_ft" = x ; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
    :
 else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
    if test "$FT2_CONFIG" = "no" ; then
      echo "*** The freetype-config script installed by FreeType 2 could not be found."
      echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
@@ -9788,28 +11522,28 @@
   have_fontconfig=no
   if test x"$have_freetype" != xno ; then
 
-# Check whether --with-fontconfig-prefix or --without-fontconfig-prefix was given.
+# Check whether --with-fontconfig-prefix was given.
 if test "${with_fontconfig_prefix+set}" = set; then
-  withval="$with_fontconfig_prefix"
-  fc_config_prefix="$withval"
+  withval=$with_fontconfig_prefix; fc_config_prefix="$withval"
 else
   fc_config_prefix=""
-fi;
+fi
+
 
-# Check whether --with-fontconfig-exec-prefix or --without-fontconfig-exec-prefix was given.
+# Check whether --with-fontconfig-exec-prefix was given.
 if test "${with_fontconfig_exec_prefix+set}" = set; then
-  withval="$with_fontconfig_exec_prefix"
-  fc_config_exec_prefix="$withval"
+  withval=$with_fontconfig_exec_prefix; fc_config_exec_prefix="$withval"
 else
   fc_config_exec_prefix=""
-fi;
-# Check whether --enable-fontconfigtest or --disable-fontconfigtest was given.
-if test "${enable_fontconfigtest+set}" = set; then
-  enableval="$enable_fontconfigtest"
+fi
 
+# Check whether --enable-fontconfigtest was given.
+if test "${enable_fontconfigtest+set}" = set; then
+  enableval=$enable_fontconfigtest;
 else
   enable_fctest=yes
-fi;
+fi
+
 
 if test x$fc_config_exec_prefix != x ; then
   fc_config_args="$fc_config_args --exec-prefix=$fc_config_exec_prefix"
@@ -9825,8 +11559,8 @@
 fi
 # Extract the first word of "fontconfig-config", so it can be a program name with args.
 set dummy fontconfig-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FC_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9841,32 +11575,33 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FC_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_FC_CONFIG" && ac_cv_path_FC_CONFIG="no"
   ;;
 esac
 fi
 FC_CONFIG=$ac_cv_path_FC_CONFIG
-
 if test -n "$FC_CONFIG"; then
-  echo "$as_me:$LINENO: result: $FC_CONFIG" >&5
-echo "${ECHO_T}$FC_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $FC_CONFIG" >&5
+echo "${ECHO_T}$FC_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
 min_fc_version=1.0.1
-echo "$as_me:$LINENO: checking for Fontconfig - version >= $min_fc_version" >&5
-echo $ECHO_N "checking for Fontconfig - version >= $min_fc_version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Fontconfig - version >= $min_fc_version" >&5
+echo $ECHO_N "checking for Fontconfig - version >= $min_fc_version... $ECHO_C" >&6; }
 no_fc=""
 pkg_config_fontconfig_exists=""
 
@@ -9962,13 +11697,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -9981,20 +11725,22 @@
 ( exit $ac_status )
 no_fc=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
     CFLAGS="$ac_save_CFLAGS"
     LIBS="$ac_save_LIBS"
   fi
 fi
 
 if test "x$no_fc" = x; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   :
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   if test "x$fc_config_is_lt" = "xyes"; then
     echo "*** Your Fontconfig package version is < 1.0.1"
   elif test "x$pkg_config_fontconfig_exists" = "xmaybe"; then
@@ -10028,28 +11774,28 @@
   if test x"$have_fontconfig" != xno ; then
     # Xft 2
 
-# Check whether --with-xft-prefix or --without-xft-prefix was given.
+# Check whether --with-xft-prefix was given.
 if test "${with_xft_prefix+set}" = set; then
-  withval="$with_xft_prefix"
-  xft_config_prefix="$withval"
+  withval=$with_xft_prefix; xft_config_prefix="$withval"
 else
   xft_config_prefix=""
-fi;
+fi
 
-# Check whether --with-xft-exec-prefix or --without-xft-exec-prefix was given.
+
+# Check whether --with-xft-exec-prefix was given.
 if test "${with_xft_exec_prefix+set}" = set; then
-  withval="$with_xft_exec_prefix"
-  xft_config_exec_prefix="$withval"
+  withval=$with_xft_exec_prefix; xft_config_exec_prefix="$withval"
 else
   xft_config_exec_prefix=""
-fi;
-# Check whether --enable-xfttest or --disable-xfttest was given.
-if test "${enable_xfttest+set}" = set; then
-  enableval="$enable_xfttest"
+fi
 
+# Check whether --enable-xfttest was given.
+if test "${enable_xfttest+set}" = set; then
+  enableval=$enable_xfttest;
 else
   enable_xfttest=yes
-fi;
+fi
+
 
 if test x$xft_config_exec_prefix != x ; then
   xft_config_args="$xft_config_args --exec-prefix=$xft_config_exec_prefix"
@@ -10065,8 +11811,8 @@
 fi
 # Extract the first word of "xft-config", so it can be a program name with args.
 set dummy xft-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10081,32 +11827,33 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_XFT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XFT_CONFIG" && ac_cv_path_XFT_CONFIG="no"
   ;;
 esac
 fi
 XFT_CONFIG=$ac_cv_path_XFT_CONFIG
-
 if test -n "$XFT_CONFIG"; then
-  echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5
-echo "${ECHO_T}$XFT_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5
+echo "${ECHO_T}$XFT_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
 min_xft_version=2.0.0
-echo "$as_me:$LINENO: checking for Xft - version >= $min_xft_version" >&5
-echo $ECHO_N "checking for Xft - version >= $min_xft_version... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for Xft - version >= $min_xft_version" >&5
+echo $ECHO_N "checking for Xft - version >= $min_xft_version... $ECHO_C" >&6; }
 no_xft=""
 pkg_config_xft_exists=""
 
@@ -10202,13 +11949,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10221,20 +11977,22 @@
 ( exit $ac_status )
 no_xft=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
     CFLAGS="$ac_save_CFLAGS"
     LIBS="$ac_save_LIBS"
   fi
 fi
 
 if test "x$no_xft" = x; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   :
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   if test "x$xft_config_is_lt" = "xyes"; then
     echo "*** Your xft2 package version is < 2.0.0"
   elif test "x$pkg_config_fontconfig_exists" = "xmaybe" ; then
@@ -10288,8 +12046,8 @@
     $UNSET ac_cv_lib_XftConfigSubstitute
     $UNSET ac_cv_lib_Xft_XftFontOpen
     $UNSET ac_cv_lib_Xft_XftDrawStringUtf8
-    echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
-echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
+echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10302,40 +12060,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XftFontOpen ();
 int
 main ()
 {
-XftFontOpen ();
+return XftFontOpen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10344,14 +12114,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xft_XftFontOpen=no
+	ac_cv_lib_Xft_XftFontOpen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6; }
 if test $ac_cv_lib_Xft_XftFontOpen = yes; then
   with_xft=yes
 else
@@ -10359,8 +12130,8 @@
 fi
 
     if test x"$with_xft" = xyes ; then
-      echo "$as_me:$LINENO: checking for XftConfigSubstitute in -lXft" >&5
-echo $ECHO_N "checking for XftConfigSubstitute in -lXft... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for XftConfigSubstitute in -lXft" >&5
+echo $ECHO_N "checking for XftConfigSubstitute in -lXft... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xft_XftConfigSubstitute+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10373,40 +12144,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XftConfigSubstitute ();
 int
 main ()
 {
-XftConfigSubstitute ();
+return XftConfigSubstitute ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10415,14 +12198,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xft_XftConfigSubstitute=no
+	ac_cv_lib_Xft_XftConfigSubstitute=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftConfigSubstitute" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftConfigSubstitute" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftConfigSubstitute" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftConfigSubstitute" >&6; }
 if test $ac_cv_lib_Xft_XftConfigSubstitute = yes; then
   is_xft1=yes
 else
@@ -10445,8 +12229,8 @@
       problem_xft=": Can't detect Xft 1 or 2 and fontconfig"
     fi
     if test x"$with_xft" = xyes; then
-      echo "$as_me:$LINENO: checking for XftDrawStringUtf8 in -lXft" >&5
-echo $ECHO_N "checking for XftDrawStringUtf8 in -lXft... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for XftDrawStringUtf8 in -lXft" >&5
+echo $ECHO_N "checking for XftDrawStringUtf8 in -lXft... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xft_XftDrawStringUtf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10459,40 +12243,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XftDrawStringUtf8 ();
 int
 main ()
 {
-XftDrawStringUtf8 ();
+return XftDrawStringUtf8 ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10501,14 +12297,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xft_XftDrawStringUtf8=no
+	ac_cv_lib_Xft_XftDrawStringUtf8=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawStringUtf8" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawStringUtf8" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawStringUtf8" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawStringUtf8" >&6; }
 if test $ac_cv_lib_Xft_XftDrawStringUtf8 = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_XFT_UTF8 1
@@ -10536,10 +12333,9 @@
 smr_lib=Xpm
 
 
-# Check whether --with-xpm-library or --without-xpm-library was given.
+# Check whether --with-xpm-library was given.
 if test "${with_xpm_library+set}" = set; then
-  withval="$with_xpm_library"
-
+  withval=$with_xpm_library;
     if test "$withval" = yes; then
         with_xpm=yes
         xpm_LIBS="-l${smr_lib}"
@@ -10564,10 +12360,11 @@
     with_xpm=maybe
     xpm_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_xpm" != no; then
-    echo "$as_me:$LINENO: checking for XpmReadFileToXpmImage in -lXpm" >&5
-echo $ECHO_N "checking for XpmReadFileToXpmImage in -lXpm... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for XpmReadFileToXpmImage in -lXpm" >&5
+echo $ECHO_N "checking for XpmReadFileToXpmImage in -lXpm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xpm_XpmReadFileToXpmImage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10580,40 +12377,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XpmReadFileToXpmImage ();
 int
 main ()
 {
-XpmReadFileToXpmImage ();
+return XpmReadFileToXpmImage ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10622,14 +12431,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_Xpm_XpmReadFileToXpmImage=no
+	ac_cv_lib_Xpm_XpmReadFileToXpmImage=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&5
-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&5
+echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToXpmImage" >&6; }
 if test $ac_cv_lib_Xpm_XpmReadFileToXpmImage = yes; then
   smr_havelib=yes
 else
@@ -10640,10 +12450,9 @@
 
 
 
-# Check whether --with-xpm-includes or --without-xpm-includes was given.
+# Check whether --with-xpm-includes was given.
 if test "${with_xpm_includes+set}" = set; then
-  withval="$with_xpm_includes"
-
+  withval=$with_xpm_includes;
     if test -d "$withval"; then
         xpm_CFLAGS="-I${withval}"
     else
@@ -10651,7 +12460,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${xpm_CFLAGS}"
@@ -10661,18 +12471,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10683,24 +12494,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10709,15 +12532,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -10726,8 +12550,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -10751,9 +12580,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -10777,25 +12607,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -10830,8 +12654,8 @@
 
 if test x"$xpm_LIBS" != x; then
   # Check for proper version of Xpm -- from XEmacs 21.x configure.in
-  echo "$as_me:$LINENO: checking for Xpm 3.4g or better" >&5
-echo $ECHO_N "checking for Xpm 3.4g or better... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for Xpm 3.4g or better" >&5
+echo $ECHO_N "checking for Xpm 3.4g or better... $ECHO_C" >&6; }
   my_CPPFLAGS="$CPPFLAGS"
   my_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $xpm_CFLAGS $X_CFLAGS"
@@ -10856,13 +12680,22 @@
      XpmIncludeVersion < 30407 ? 2 : 0 ;}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10888,10 +12721,12 @@
 ( exit $ac_status )
 with_xpm=no; problem_xpm=": Xpm test error, see config.log"
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-  echo "$as_me:$LINENO: result: $with_xpm" >&5
-echo "${ECHO_T}$with_xpm" >&6
+
+
+  { echo "$as_me:$LINENO: result: $with_xpm" >&5
+echo "${ECHO_T}$with_xpm" >&6; }
   CPPFLAGS="$my_CPPFLAGS"
   LIBS="$my_LIBS"
 
@@ -10926,10 +12761,9 @@
 smr_lib=png
 
 
-# Check whether --with-png-library or --without-png-library was given.
+# Check whether --with-png-library was given.
 if test "${with_png_library+set}" = set; then
-  withval="$with_png_library"
-
+  withval=$with_png_library;
     if test "$withval" = yes; then
         with_png=yes
         png_LIBS="-l${smr_lib}"
@@ -10954,10 +12788,11 @@
     with_png=maybe
     png_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_png" != no; then
-    echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
-echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
+echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_read_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10970,40 +12805,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char png_read_info ();
 int
 main ()
 {
-png_read_info ();
+return png_read_info ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11012,14 +12859,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_png_png_read_info=no
+	ac_cv_lib_png_png_read_info=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; }
 if test $ac_cv_lib_png_png_read_info = yes; then
   smr_havelib=yes
 else
@@ -11030,10 +12878,9 @@
 
 
 
-# Check whether --with-png-includes or --without-png-includes was given.
+# Check whether --with-png-includes was given.
 if test "${with_png_includes+set}" = set; then
-  withval="$with_png_includes"
-
+  withval=$with_png_includes;
     if test -d "$withval"; then
         png_CFLAGS="-I${withval}"
     else
@@ -11041,7 +12888,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${png_CFLAGS}"
@@ -11051,18 +12899,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11073,24 +12922,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11099,15 +12960,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11116,8 +12978,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -11141,9 +13008,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -11167,25 +13035,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -11220,8 +13082,8 @@
 
 if test x"$png_LIBS" != x; then
   # Check for proper version of png
-  echo "$as_me:$LINENO: checking for libpng 1.0.4a or better" >&5
-echo $ECHO_N "checking for libpng 1.0.4a or better... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for libpng 1.0.4a or better" >&5
+echo $ECHO_N "checking for libpng 1.0.4a or better... $ECHO_C" >&6; }
   my_CPPFLAGS="$CPPFLAGS"
   my_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $png_CFLAGS"
@@ -11244,13 +13106,22 @@
    return c == 1 ? 0 : (PNG_LIBPNG_VER < 10005) ? 2 : 0 ;}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11273,10 +13144,12 @@
 ( exit $ac_status )
 with_png="no"; problem_png=": png test error, see config.log"
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-  echo "$as_me:$LINENO: result: $with_png" >&5
-echo "${ECHO_T}$with_png" >&6
+
+
+  { echo "$as_me:$LINENO: result: $with_png" >&5
+echo "${ECHO_T}$with_png" >&6; }
   CPPFLAGS="$my_CPPFLAGS"
   LIBS="$my_LIBS"
 fi
@@ -11297,8 +13170,8 @@
 
 
 # ** needed by the png support
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11315,7 +13188,8 @@
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
  bogus endian macros
 #endif
 
@@ -11324,24 +13198,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11367,24 +13253,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11393,14 +13291,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_bigendian=no
+	ac_cv_c_bigendian=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-# It does not; compile a test program.
+	# It does not; compile a test program.
 if test "$cross_compiling" = yes; then
   # try to guess the endianness by grepping values into an object file
   ac_cv_c_bigendian=unknown
@@ -11410,11 +13309,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
 int
 main ()
@@ -11425,24 +13324,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11461,8 +13372,10 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11470,27 +13383,41 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
+
   /* Are we little or big endian?  From Harbison&Steele.  */
   union
   {
-    long l;
-    char c[sizeof (long)];
+    long int l;
+    char c[sizeof (long int)];
   } u;
   u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
+  return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11503,13 +13430,16 @@
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
 case $ac_cv_c_bigendian in
   yes)
 
@@ -11540,10 +13470,9 @@
 smr_lib=rplay
 
 
-# Check whether --with-rplay-library or --without-rplay-library was given.
+# Check whether --with-rplay-library was given.
 if test "${with_rplay_library+set}" = set; then
-  withval="$with_rplay_library"
-
+  withval=$with_rplay_library;
     if test "$withval" = yes; then
         with_rplay=yes
         rplay_LIBS="-l${smr_lib}"
@@ -11568,10 +13497,11 @@
     with_rplay=maybe
     rplay_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_rplay" != no; then
-    echo "$as_me:$LINENO: checking for rplay_create in -lrplay" >&5
-echo $ECHO_N "checking for rplay_create in -lrplay... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for rplay_create in -lrplay" >&5
+echo $ECHO_N "checking for rplay_create in -lrplay... $ECHO_C" >&6; }
 if test "${ac_cv_lib_rplay_rplay_create+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11584,40 +13514,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char rplay_create ();
 int
 main ()
 {
-rplay_create ();
+return rplay_create ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11626,14 +13568,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_rplay_rplay_create=no
+	ac_cv_lib_rplay_rplay_create=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rplay_rplay_create" >&5
-echo "${ECHO_T}$ac_cv_lib_rplay_rplay_create" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rplay_rplay_create" >&5
+echo "${ECHO_T}$ac_cv_lib_rplay_rplay_create" >&6; }
 if test $ac_cv_lib_rplay_rplay_create = yes; then
   smr_havelib=yes
 else
@@ -11644,10 +13587,9 @@
 
 
 
-# Check whether --with-rplay-includes or --without-rplay-includes was given.
+# Check whether --with-rplay-includes was given.
 if test "${with_rplay_includes+set}" = set; then
-  withval="$with_rplay_includes"
-
+  withval=$with_rplay_includes;
     if test -d "$withval"; then
         rplay_CFLAGS="-I${withval}"
     else
@@ -11655,7 +13597,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${rplay_CFLAGS}"
@@ -11665,18 +13608,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11687,24 +13631,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11713,15 +13669,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11730,8 +13687,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -11755,9 +13717,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -11781,25 +13744,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -11854,10 +13811,9 @@
 smr_lib=stroke
 
 
-# Check whether --with-stroke-library or --without-stroke-library was given.
+# Check whether --with-stroke-library was given.
 if test "${with_stroke_library+set}" = set; then
-  withval="$with_stroke_library"
-
+  withval=$with_stroke_library;
     if test "$withval" = yes; then
         with_stroke=yes
         stroke_LIBS="-l${smr_lib}"
@@ -11882,10 +13838,11 @@
     with_stroke=maybe
     stroke_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_stroke" != no; then
-    echo "$as_me:$LINENO: checking for stroke_init in -lstroke" >&5
-echo $ECHO_N "checking for stroke_init in -lstroke... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for stroke_init in -lstroke" >&5
+echo $ECHO_N "checking for stroke_init in -lstroke... $ECHO_C" >&6; }
 if test "${ac_cv_lib_stroke_stroke_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11898,40 +13855,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char stroke_init ();
 int
 main ()
 {
-stroke_init ();
+return stroke_init ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -11940,14 +13909,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_stroke_stroke_init=no
+	ac_cv_lib_stroke_stroke_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_stroke_stroke_init" >&5
-echo "${ECHO_T}$ac_cv_lib_stroke_stroke_init" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_stroke_stroke_init" >&5
+echo "${ECHO_T}$ac_cv_lib_stroke_stroke_init" >&6; }
 if test $ac_cv_lib_stroke_stroke_init = yes; then
   smr_havelib=yes
 else
@@ -11958,10 +13928,9 @@
 
 
 
-# Check whether --with-stroke-includes or --without-stroke-includes was given.
+# Check whether --with-stroke-includes was given.
 if test "${with_stroke_includes+set}" = set; then
-  withval="$with_stroke_includes"
-
+  withval=$with_stroke_includes;
     if test -d "$withval"; then
         stroke_CFLAGS="-I${withval}"
     else
@@ -11969,7 +13938,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${stroke_CFLAGS}"
@@ -11979,18 +13949,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12001,24 +13972,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12027,15 +14010,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12044,8 +14028,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -12069,9 +14058,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12095,25 +14085,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -12165,10 +14149,9 @@
 smr_lib=termcap
 
 
-# Check whether --with-termcap-library or --without-termcap-library was given.
+# Check whether --with-termcap-library was given.
 if test "${with_termcap_library+set}" = set; then
-  withval="$with_termcap_library"
-
+  withval=$with_termcap_library;
     if test "$withval" = yes; then
         with_termcap=yes
         termcap_LIBS="-l${smr_lib}"
@@ -12193,15 +14176,16 @@
     with_termcap=maybe
     termcap_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 
 
 if test x"$with_termcap" != xno; then
   # Forget cached values, so user can re-run configure
   $UNSET ac_cv_header_readline_history_h
   $UNSET ac_cv_lib_readline_readline
-  echo "$as_me:$LINENO: checking with termcap" >&5
-echo $ECHO_N "checking with termcap... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking with termcap" >&5
+echo $ECHO_N "checking with termcap... $ECHO_C" >&6; }
 
 smr_lib=readline
 smr_header=readline/history.h
@@ -12210,10 +14194,9 @@
 smr_lib=readline
 
 
-# Check whether --with-readline-library or --without-readline-library was given.
+# Check whether --with-readline-library was given.
 if test "${with_readline_library+set}" = set; then
-  withval="$with_readline_library"
-
+  withval=$with_readline_library;
     if test "$withval" = yes; then
         with_readline=yes
         readline_LIBS="-l${smr_lib}"
@@ -12238,10 +14221,11 @@
     with_readline=maybe
     readline_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_readline" != no; then
-    echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12254,40 +14238,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12296,14 +14292,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   smr_havelib=yes
 else
@@ -12314,10 +14311,9 @@
 
 
 
-# Check whether --with-readline-includes or --without-readline-includes was given.
+# Check whether --with-readline-includes was given.
 if test "${with_readline_includes+set}" = set; then
-  withval="$with_readline_includes"
-
+  withval=$with_readline_includes;
     if test -d "$withval"; then
         readline_CFLAGS="-I${withval}"
     else
@@ -12325,7 +14321,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${readline_CFLAGS}"
@@ -12335,18 +14332,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12357,24 +14355,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12383,15 +14393,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12400,8 +14411,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -12425,9 +14441,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12451,25 +14468,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -12515,10 +14526,9 @@
 smr_lib=ncurses
 
 
-# Check whether --with-ncurses-library or --without-ncurses-library was given.
+# Check whether --with-ncurses-library was given.
 if test "${with_ncurses_library+set}" = set; then
-  withval="$with_ncurses_library"
-
+  withval=$with_ncurses_library;
     if test "$withval" = yes; then
         with_ncurses=yes
         ncurses_LIBS="-l${smr_lib}"
@@ -12543,15 +14553,16 @@
     with_ncurses=maybe
     ncurses_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test x"$with_ncurses" != xno -a ! "$readline_LIBS"; then
   # We couldn't use readline with termcap; try with ncurses?
   # Doesn't this seem a hacky way to do this??
   # unset cached values from last check...
   $UNSET ac_cv_header_readline_history_h
   $UNSET ac_cv_lib_readline_readline
-  echo "$as_me:$LINENO: checking with ncurses" >&5
-echo $ECHO_N "checking with ncurses... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking with ncurses" >&5
+echo $ECHO_N "checking with ncurses... $ECHO_C" >&6; }
 
 smr_lib=readline
 smr_header=readline/history.h
@@ -12560,10 +14571,9 @@
 smr_lib=readline
 
 
-# Check whether --with-readline-library or --without-readline-library was given.
+# Check whether --with-readline-library was given.
 if test "${with_readline_library+set}" = set; then
-  withval="$with_readline_library"
-
+  withval=$with_readline_library;
     if test "$withval" = yes; then
         with_readline=yes
         readline_LIBS="-l${smr_lib}"
@@ -12588,10 +14598,11 @@
     with_readline=maybe
     readline_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_readline" != no; then
-    echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12604,40 +14615,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12646,14 +14669,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   smr_havelib=yes
 else
@@ -12664,10 +14688,9 @@
 
 
 
-# Check whether --with-readline-includes or --without-readline-includes was given.
+# Check whether --with-readline-includes was given.
 if test "${with_readline_includes+set}" = set; then
-  withval="$with_readline_includes"
-
+  withval=$with_readline_includes;
     if test -d "$withval"; then
         readline_CFLAGS="-I${withval}"
     else
@@ -12675,7 +14698,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${readline_CFLAGS}"
@@ -12685,18 +14709,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12707,24 +14732,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12733,15 +14770,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12750,8 +14788,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -12775,9 +14818,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -12801,25 +14845,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -12867,8 +14905,8 @@
 # Check if Xsetlocale() is available or not.
 
 
-echo "$as_me:$LINENO: checking for _Xsetlocale in -lX11" >&5
-echo $ECHO_N "checking for _Xsetlocale in -lX11... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for _Xsetlocale in -lX11" >&5
+echo $ECHO_N "checking for _Xsetlocale in -lX11... $ECHO_C" >&6; }
 if test "${ac_cv_lib_X11__Xsetlocale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12881,40 +14919,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char _Xsetlocale ();
 int
 main ()
 {
-_Xsetlocale ();
+return _Xsetlocale ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12923,14 +14973,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_X11__Xsetlocale=no
+	ac_cv_lib_X11__Xsetlocale=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_X11__Xsetlocale" >&5
-echo "${ECHO_T}$ac_cv_lib_X11__Xsetlocale" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11__Xsetlocale" >&5
+echo "${ECHO_T}$ac_cv_lib_X11__Xsetlocale" >&6; }
 if test $ac_cv_lib_X11__Xsetlocale = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define X_LOCALE 1
@@ -12942,8 +14993,8 @@
 # Check if Xsetlocale() is available or not.
 
 
-echo "$as_me:$LINENO: checking for XOpenOM in -lX11" >&5
-echo $ECHO_N "checking for XOpenOM in -lX11... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for XOpenOM in -lX11" >&5
+echo $ECHO_N "checking for XOpenOM in -lX11... $ECHO_C" >&6; }
 if test "${ac_cv_lib_X11_XOpenOM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -12956,40 +15007,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XOpenOM ();
 int
 main ()
 {
-XOpenOM ();
+return XOpenOM ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -12998,14 +15061,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_X11_XOpenOM=no
+	ac_cv_lib_X11_XOpenOM=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenOM" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XOpenOM" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenOM" >&5
+echo "${ECHO_T}$ac_cv_lib_X11_XOpenOM" >&6; }
 if test $ac_cv_lib_X11_XOpenOM = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_XOUTPUT_METHOD 1
@@ -13021,13 +15085,13 @@
 with_sys_iconv=no
 problem_iconv=": Explicitly disabled"
 
-# Check whether --enable-iconv or --disable-iconv was given.
+# Check whether --enable-iconv was given.
 if test "${enable_iconv+set}" = set; then
-  enableval="$enable_iconv"
-  ac_cv_iconv="$enableval"
+  enableval=$enable_iconv; ac_cv_iconv="$enableval"
 else
   ac_cv_iconv="yes"
-fi;
+fi
+
 
 
 
@@ -13045,10 +15109,9 @@
 smr_lib=iconv
 
 
-# Check whether --with-iconv-library or --without-iconv-library was given.
+# Check whether --with-iconv-library was given.
 if test "${with_iconv_library+set}" = set; then
-  withval="$with_iconv_library"
-
+  withval=$with_iconv_library;
     if test "$withval" = yes; then
         with_iconv=yes
         iconv_LIBS="-l${smr_lib}"
@@ -13073,10 +15136,11 @@
     with_iconv=maybe
     iconv_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_iconv" != no; then
-    echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13089,40 +15153,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char libiconv_open ();
 int
 main ()
 {
-libiconv_open ();
+return libiconv_open ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13131,14 +15207,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_iconv_libiconv_open=no
+	ac_cv_lib_iconv_libiconv_open=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
 if test $ac_cv_lib_iconv_libiconv_open = yes; then
   smr_havelib=yes
 else
@@ -13149,10 +15226,9 @@
 
 
 
-# Check whether --with-iconv-includes or --without-iconv-includes was given.
+# Check whether --with-iconv-includes was given.
 if test "${with_iconv_includes+set}" = set; then
-  withval="$with_iconv_includes"
-
+  withval=$with_iconv_includes;
     if test -d "$withval"; then
         iconv_CFLAGS="-I${withval}"
     else
@@ -13160,7 +15236,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${iconv_CFLAGS}"
@@ -13170,18 +15247,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13192,24 +15270,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13218,15 +15308,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13235,8 +15326,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -13260,9 +15356,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -13286,25 +15383,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -13348,8 +15439,8 @@
 
   # * check for system iconv
 
-  echo "$as_me:$LINENO: checking for iconv_open" >&5
-echo $ECHO_N "checking for iconv_open... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for iconv_open" >&5
+echo $ECHO_N "checking for iconv_open... $ECHO_C" >&6; }
 if test "${ac_cv_func_iconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13376,53 +15467,59 @@
 
 #undef iconv_open
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char iconv_open ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_iconv_open) || defined (__stub___iconv_open)
+#if defined __stub_iconv_open || defined __stub___iconv_open
 choke me
-#else
-char (*f) () = iconv_open;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != iconv_open;
+return iconv_open ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13431,13 +15528,14 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_iconv_open=no
+	ac_cv_func_iconv_open=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_iconv_open" >&5
-echo "${ECHO_T}$ac_cv_func_iconv_open" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv_open" >&5
+echo "${ECHO_T}$ac_cv_func_iconv_open" >&6; }
 if test $ac_cv_func_iconv_open = yes; then
   with_sys_iconv=yes
 fi
@@ -13453,8 +15551,8 @@
   # * libiconv found check for libcharset to get the good iconv charset
   if test x"$with_lib_iconv" = xyes; then
 
-	echo "$as_me:$LINENO: checking check for libcharset" >&5
-echo $ECHO_N "checking check for libcharset... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking check for libcharset" >&5
+echo $ECHO_N "checking check for libcharset... $ECHO_C" >&6; }
 	ac_save_CFLAGS="$CFLAGS"
       	ac_save_LIBS="$LIBS"
       	CFLAGS="$CFLAGS $iconv_CFLAGS"
@@ -13478,24 +15576,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13504,12 +15614,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-r=no
+	r=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-	echo "$as_me:$LINENO: result: $r" >&5
-echo "${ECHO_T}$r" >&6
+	{ echo "$as_me:$LINENO: result: $r" >&5
+echo "${ECHO_T}$r" >&6; }
 	if test "x$r" = "xyes"; then
        		cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBCHARSET 1
@@ -13543,8 +15654,8 @@
 _ACEOF
 
 
-	echo "$as_me:$LINENO: checking check if second arg of iconv is const" >&5
-echo $ECHO_N "checking check if second arg of iconv is const... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking check if second arg of iconv is const" >&5
+echo $ECHO_N "checking check if second arg of iconv is const... $ECHO_C" >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13570,24 +15681,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13596,11 +15719,12 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-use_const=yes
+	use_const=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:$LINENO: result: $use_const" >&5
-echo "${ECHO_T}$use_const" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	{ echo "$as_me:$LINENO: result: $use_const" >&5
+echo "${ECHO_T}$use_const" >&6; }
 
 
 	if test "x$use_const" = "xyes"; then
@@ -13624,8 +15748,8 @@
 # ******** nl_langinfo and CODESET
 
 
-echo "$as_me:$LINENO: checking for nl_langinfo (CODESET)" >&5
-echo $ECHO_N "checking for nl_langinfo (CODESET)... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for nl_langinfo (CODESET)" >&5
+echo $ECHO_N "checking for nl_langinfo (CODESET)... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13643,24 +15767,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13673,18 +15809,18 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_codeset=no
+	have_codeset=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $have_codeset" >&5
-echo "${ECHO_T}$have_codeset" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $have_codeset" >&5
+echo "${ECHO_T}$have_codeset" >&6; }
 
 
 # ********* fribidi
-# Check whether --enable-bidi or --disable-bidi was given.
+# Check whether --enable-bidi was given.
 if test "${enable_bidi+set}" = set; then
-  enableval="$enable_bidi"
-   if test x"$enableval" = xyes; then
+  enableval=$enable_bidi;  if test x"$enableval" = xyes; then
 		with_bidi="yes, check"
 	else
 		with_bidi="no"
@@ -13693,21 +15829,22 @@
 else
    with_bidi="not specified, check"
 
-fi;
+fi
+
 
 if test x"$with_bidi" != xno; then
 
-# Check whether --with-fribidi-bindir or --without-fribidi-bindir was given.
+# Check whether --with-fribidi-bindir was given.
 if test "${with_fribidi_bindir+set}" = set; then
-  withval="$with_fribidi_bindir"
-  FRIBIDI_BINDIR="$withval"
+  withval=$with_fribidi_bindir; FRIBIDI_BINDIR="$withval"
 else
   FRIBIDI_BINDIR="."
-fi;
+fi
+
 	# Extract the first word of "fribidi-config", so it can be a program name with args.
 set dummy fribidi-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FRIBIDI_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13723,36 +15860,37 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FRIBIDI_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FRIBIDI_CONFIG=$ac_cv_path_FRIBIDI_CONFIG
-
 if test -n "$FRIBIDI_CONFIG"; then
-  echo "$as_me:$LINENO: result: $FRIBIDI_CONFIG" >&5
-echo "${ECHO_T}$FRIBIDI_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $FRIBIDI_CONFIG" >&5
+echo "${ECHO_T}$FRIBIDI_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
 	if test x"$FRIBIDI_CONFIG" = x; then
 		with_bidi=no
 		problem_bidi=": No fribidi-config found in PATH"
 	else
 		Bidi_CFLAGS=`$FRIBIDI_CONFIG --cflags`
 		Bidi_LIBS=`$FRIBIDI_CONFIG --libs`
-		echo "$as_me:$LINENO: checking for fribidi_log2vis in -lfribidi" >&5
-echo $ECHO_N "checking for fribidi_log2vis in -lfribidi... $ECHO_C" >&6
+		{ echo "$as_me:$LINENO: checking for fribidi_log2vis in -lfribidi" >&5
+echo $ECHO_N "checking for fribidi_log2vis in -lfribidi... $ECHO_C" >&6; }
 if test "${ac_cv_lib_fribidi_fribidi_log2vis+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13765,40 +15903,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char fribidi_log2vis ();
 int
 main ()
 {
-fribidi_log2vis ();
+return fribidi_log2vis ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13807,14 +15957,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_fribidi_fribidi_log2vis=no
+	ac_cv_lib_fribidi_fribidi_log2vis=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fribidi_fribidi_log2vis" >&5
-echo "${ECHO_T}$ac_cv_lib_fribidi_fribidi_log2vis" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fribidi_fribidi_log2vis" >&5
+echo "${ECHO_T}$ac_cv_lib_fribidi_fribidi_log2vis" >&6; }
 if test $ac_cv_lib_fribidi_fribidi_log2vis = yes; then
   with_bidi=yes; problem_bidi=
 else
@@ -13855,13 +16006,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13874,8 +16034,10 @@
 ( exit $ac_status )
 fribidi_in_path=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 	LIBS="$ac_save_LIBS"
 	if test x"$fribidi_in_path" != xyes; then
 		ac_save_CFLAGS="$CFLAGS"
@@ -13909,13 +16071,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13928,8 +16099,10 @@
 ( exit $ac_status )
 with_bidi=no; problem_bidi=": Bad fribidi version, see config.log"
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 		CFLAGS="$ac_save_CFLAGS"
 		LIBS="$ac_save_LIBS"
 	fi
@@ -13971,13 +16144,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13991,8 +16173,10 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 
 
@@ -14005,15 +16189,15 @@
 with_perllib="yes"
 problem_perllib=""
 FVWM_PERLLIB=perllib
-# Check whether --enable-perllib or --disable-perllib was given.
+# Check whether --enable-perllib was given.
 if test "${enable_perllib+set}" = set; then
-  enableval="$enable_perllib"
-   if test x"$enableval" = xno; then
+  enableval=$enable_perllib;  if test x"$enableval" = xno; then
 		with_perllib="no"
 		problem_perllib=": Explicitly disabled"
 		FVWM_PERLLIB=""
 	fi
-fi;
+fi
+
 
 
 # ******* gettext
@@ -14033,14 +16217,14 @@
 with_gettext="yes"
 problem_gettext=""
 
-# Check whether --enable-nls or --disable-nls was given.
+# Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-   if test x"$enableval" = xno; then
+  enableval=$enable_nls;  if test x"$enableval" = xno; then
 		with_gettext="no"
 		problem_gettext=": Explicitly disabled"
 	fi
-fi;
+fi
+
 
 
 
@@ -14059,8 +16243,8 @@
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14087,17 +16271,17 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14112,33 +16296,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
-
 if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14165,19 +16350,19 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
     rm -f messages.po
 
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14203,11 +16388,11 @@
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -14217,8 +16402,8 @@
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+      { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
       GMSGFMT=":"
     fi
   fi
@@ -14228,8 +16413,8 @@
        (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+      { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
       XGETTEXT=":"
     fi
         rm -f messages.po
@@ -14237,8 +16422,8 @@
 
   # Extract the first word of "msguniq", so it can be a program name with args.
 set dummy msguniq; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGUNIQ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14253,33 +16438,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSGUNIQ="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MSGUNIQ" && ac_cv_path_MSGUNIQ="$MSGUNIQ"
   ;;
 esac
 fi
 MSGUNIQ=$ac_cv_path_MSGUNIQ
-
 if test -n "$MSGUNIQ"; then
-  echo "$as_me:$LINENO: result: $MSGUNIQ" >&5
-echo "${ECHO_T}$MSGUNIQ" >&6
+  { echo "$as_me:$LINENO: result: $MSGUNIQ" >&5
+echo "${ECHO_T}$MSGUNIQ" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
-  echo "$as_me:$LINENO: checking for NLS fvwm messages catalogs" >&5
-echo $ECHO_N "checking for NLS fvwm messages catalogs... $ECHO_C" >&6
-  echo "$as_me:$LINENO: result: $ALL_LINGUAS" >&5
-echo "${ECHO_T}$ALL_LINGUAS" >&6
+
+  { echo "$as_me:$LINENO: checking for NLS fvwm messages catalogs" >&5
+echo $ECHO_N "checking for NLS fvwm messages catalogs... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: result: $ALL_LINGUAS" >&5
+echo "${ECHO_T}$ALL_LINGUAS" >&6; }
   POFILES=
   GMOFILES=
   UPDATEPOFILES=
@@ -14294,19 +16480,19 @@
   done
   # CATALOGS depends on both $ac_dir and the user's LINGUAS environment variable.
   INST_LINGUAS=
-  echo "$as_me:$LINENO: checking for NLS desired catalogs to be installed" >&5
-echo $ECHO_N "checking for NLS desired catalogs to be installed... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for NLS desired catalogs to be installed" >&5
+echo $ECHO_N "checking for NLS desired catalogs to be installed... $ECHO_C" >&6; }
   #if test "%UNSET%" != "$LINGUAS"; then
   # FIXME: How to check if LINGUAS has been *set* to ""
   if test -n "$LINGUAS"; then
-    echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+    { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
   else
-    echo "$as_me:$LINENO: result: all" >&5
-echo "${ECHO_T}all" >&6
+    { echo "$as_me:$LINENO: result: all" >&5
+echo "${ECHO_T}all" >&6; }
   fi
-  echo "$as_me:$LINENO: checking for NLS messages catalogs to be installed" >&5
-echo $ECHO_N "checking for NLS messages catalogs to be installed... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for NLS messages catalogs to be installed" >&5
+echo $ECHO_N "checking for NLS messages catalogs to be installed... $ECHO_C" >&6; }
   if test -n "$ALL_LINGUAS"; then
     for presentlang in $ALL_LINGUAS; do
       useit=no
@@ -14331,8 +16517,8 @@
       fi
     done
   fi
-  echo "$as_me:$LINENO: result: $INST_LINGUAS" >&5
-echo "${ECHO_T}$INST_LINGUAS" >&6
+  { echo "$as_me:$LINENO: result: $INST_LINGUAS" >&5
+echo "${ECHO_T}$INST_LINGUAS" >&6; }
   CATALOGS=
   if test -n "$INST_LINGUAS"; then
     for lang in $INST_LINGUAS; do
@@ -14356,17 +16542,17 @@
     $UNSET ac_cv_func_dgettext
   #bind_textdomain_codeset
   if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14377,24 +16563,36 @@
 #include <libintl.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -14403,15 +16601,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14420,8 +16619,13 @@
 /* end confdefs.h.  */
 #include <libintl.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -14445,9 +16649,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -14471,25 +16676,18 @@
 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_libintl_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
 
 fi
 if test $ac_cv_header_libintl_h = yes; then
@@ -14500,9 +16698,9 @@
 for ac_func in gettext bindtextdomain textdomain dgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14528,53 +16726,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -14583,13 +16787,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -14606,14 +16812,14 @@
 
 
 
-  echo "$as_me:$LINENO: checking for gnu gettext in libc" >&5
-echo $ECHO_N "checking for gnu gettext in libc... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for gnu gettext in libc" >&5
+echo $ECHO_N "checking for gnu gettext in libc... $ECHO_C" >&6; }
   if test x"$found_gettext" = "xyes"; then
     problem_gettext=" (libc)"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-    echo "$as_me:$LINENO: checking if a simple gettext program link" >&5
-echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+    { echo "$as_me:$LINENO: checking if a simple gettext program link" >&5
+echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14632,24 +16838,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -14658,15 +16876,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-found_gettext=no
+	found_gettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-    echo "$as_me:$LINENO: result: $found_gettext" >&5
-echo "${ECHO_T}$found_gettext" >&6
+    { echo "$as_me:$LINENO: result: $found_gettext" >&5
+echo "${ECHO_T}$found_gettext" >&6; }
   else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   fi
 
   if test x"$found_gettext" = xno; then
@@ -14682,10 +16901,9 @@
 smr_lib=intl
 
 
-# Check whether --with-intl-library or --without-intl-library was given.
+# Check whether --with-intl-library was given.
 if test "${with_intl_library+set}" = set; then
-  withval="$with_intl_library"
-
+  withval=$with_intl_library;
     if test "$withval" = yes; then
         with_intl=yes
         intl_LIBS="-l${smr_lib}"
@@ -14710,10 +16928,11 @@
     with_intl=maybe
     intl_LIBS="-l${smr_lib}"
 
-fi;
+fi
+
 if test "$with_intl" != no; then
-    echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14726,40 +16945,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char bindtextdomain ();
 int
 main ()
 {
-bindtextdomain ();
+return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -14768,14 +16999,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_bindtextdomain=no
+	ac_cv_lib_intl_bindtextdomain=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
 if test $ac_cv_lib_intl_bindtextdomain = yes; then
   smr_havelib=yes
 else
@@ -14786,10 +17018,9 @@
 
 
 
-# Check whether --with-intl-includes or --without-intl-includes was given.
+# Check whether --with-intl-includes was given.
 if test "${with_intl_includes+set}" = set; then
-  withval="$with_intl_includes"
-
+  withval=$with_intl_includes;
     if test -d "$withval"; then
         intl_CFLAGS="-I${withval}"
     else
@@ -14797,7 +17028,8 @@
 echo "$as_me: error: argument must be a directory" >&2;}
    { (exit 1); exit 1; }; }
     fi
-fi;
+fi
+
 
                 smr_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS ${intl_CFLAGS}"
@@ -14807,18 +17039,19 @@
 for ac_header in $smr_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14829,24 +17062,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -14855,15 +17100,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14872,8 +17118,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -14897,9 +17148,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -14923,25 +17175,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -14979,8 +17225,8 @@
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
 
-echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
-echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
+echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_textdomain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -14993,40 +17239,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char textdomain ();
 int
 main ()
 {
-textdomain ();
+return textdomain ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15035,14 +17293,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_textdomain=no
+	ac_cv_lib_intl_textdomain=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6; }
 if test $ac_cv_lib_intl_textdomain = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
@@ -15056,8 +17315,8 @@
 
       if test "$no_textdomain" != "yes"; then
 
-echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_dgettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15070,40 +17329,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dgettext ();
 int
 main ()
 {
-dgettext ();
+return dgettext ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15112,14 +17383,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_dgettext=no
+	ac_cv_lib_intl_dgettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
 if test $ac_cv_lib_intl_dgettext = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
@@ -15134,8 +17406,8 @@
         if test "$no_dgettext" != "yes"; then
           CFLAGS="$CFLAGS $intl_LIBS $iconv_LIBS"
           LIBS="$LIBS $intl_LIBS $iconv_LIBS"
-          echo "$as_me:$LINENO: checking if a simple gettext program link" >&5
-echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6
+          { echo "$as_me:$LINENO: checking if a simple gettext program link" >&5
+echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6; }
           cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15154,24 +17426,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15180,12 +17464,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-found_gettext=no
+	found_gettext=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-          echo "$as_me:$LINENO: result: $found_gettext" >&5
-echo "${ECHO_T}$found_gettext" >&6
+          { echo "$as_me:$LINENO: result: $found_gettext" >&5
+echo "${ECHO_T}$found_gettext" >&6; }
         fi
       fi
       CFLAGS="$ac_save_CFLAGS"
@@ -15245,18 +17530,19 @@
 for ac_header in stdarg.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15267,24 +17553,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15293,15 +17591,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15310,8 +17609,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -15335,9 +17639,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -15361,25 +17666,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -15395,9 +17694,9 @@
 for ac_func in vfprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15423,53 +17722,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15478,13 +17783,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -15506,9 +17813,9 @@
 for ac_func in waitpid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15534,53 +17841,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15589,13 +17902,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -15610,9 +17925,9 @@
 for ac_func in wait3 wait4
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15638,53 +17953,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15693,13 +18014,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -15721,9 +18044,9 @@
 for ac_func in sigsetjmp siglongjmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15749,53 +18072,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -15804,13 +18133,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -15823,8 +18154,8 @@
 # Look harder for a C preprocessor for FvwmCpp
 # Extract the first word of "cpp", so it can be a program name with args.
 set dummy cpp; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FVWM_CPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15840,28 +18171,29 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FVWM_CPP="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_FVWM_CPP" && ac_cv_path_FVWM_CPP="no"
   ;;
 esac
 fi
 FVWM_CPP=$ac_cv_path_FVWM_CPP
-
 if test -n "$FVWM_CPP"; then
-  echo "$as_me:$LINENO: result: $FVWM_CPP" >&5
-echo "${ECHO_T}$FVWM_CPP" >&6
+  { echo "$as_me:$LINENO: result: $FVWM_CPP" >&5
+echo "${ECHO_T}$FVWM_CPP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x"$FVWM_CPP" = xno; then
   FVWM_CPP=
   { echo "$as_me:$LINENO: WARNING: cannot locate a C preprocessor: run FvwmCpp with -cppprog" >&5
@@ -15882,8 +18214,8 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15905,7 +18237,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -15924,21 +18256,22 @@
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -15948,51 +18281,52 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16005,32 +18339,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16043,27 +18379,41 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -16075,8 +18425,8 @@
 if test x"$PERL" = x; then
 	# Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16091,37 +18441,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
-
 if test -n "$PERL"; then
-  echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
+  { echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test x"$PERL" != x; then
-	echo "$as_me:$LINENO: checking for perl $REQUIRED_PERL_VERSION or better" >&5
-echo $ECHO_N "checking for perl $REQUIRED_PERL_VERSION or better... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking for perl $REQUIRED_PERL_VERSION or better" >&5
+echo $ECHO_N "checking for perl $REQUIRED_PERL_VERSION or better... $ECHO_C" >&6; }
 	if ("$PERL" -e "require $REQUIRED_PERL_VERSION;") 2>/dev/null; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 		{ echo "$as_me:$LINENO: WARNING: $PERL not found or too old" >&5
 echo "$as_me: WARNING: $PERL not found or too old" >&2;}
 	fi
@@ -16132,13 +18483,13 @@
 echo "$as_me: WARNING: It is recommended to install perl $REQUIRED_PERL_VERSION or better later" >&2;}
 	PERL=/usr/bin/perl
 fi
-echo "$as_me:$LINENO: result: assuming $PERL as perl location" >&5
-echo "${ECHO_T}assuming $PERL as perl location" >&6
+{ echo "$as_me:$LINENO: result: assuming $PERL as perl location" >&5
+echo "${ECHO_T}assuming $PERL as perl location" >&6; }
 
 
 # Checks for header files.
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16162,24 +18513,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16188,9 +18551,10 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -16246,6 +18610,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -16265,18 +18630,27 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16289,12 +18663,14 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16303,8 +18679,8 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16317,7 +18693,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
 #endif
 #ifndef WIFEXITED
 # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
@@ -16334,24 +18710,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16360,12 +18748,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_sys_wait_h=no
+	ac_cv_header_sys_wait_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16384,18 +18773,19 @@
 for ac_header in stdlib.h fcntl.h limits.h malloc.h string.h memory.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16406,24 +18796,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16432,15 +18834,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16449,8 +18852,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -16474,9 +18882,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -16500,25 +18909,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -16537,18 +18940,19 @@
 for ac_header in getopt.h sys/select.h sys/systeminfo.h sys/time.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16559,24 +18963,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16585,15 +19001,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16602,8 +19019,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -16627,9 +19049,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -16653,25 +19076,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -16685,8 +19102,8 @@
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16704,10 +19121,10 @@
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -16716,16 +19133,17 @@
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+    if (s) return 0;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
@@ -16744,7 +19162,9 @@
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+    if (!foo) return 0;
   }
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -16752,24 +19172,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16778,12 +19210,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_const=no
+	ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16792,8 +19225,8 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16813,39 +19246,54 @@
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
+  ac_cv_c_inline=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -16863,8 +19311,8 @@
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16875,36 +19323,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((off_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (off_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16913,24 +19374,25 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_off_t=no
+	ac_cv_type_off_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
 if test $ac_cv_type_off_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define off_t long
+#define off_t long int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16941,36 +19403,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef pid_t ac__type_new_;
 int
 main ()
 {
-if ((pid_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (pid_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16979,12 +19454,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_pid_t=no
+	ac_cv_type_pid_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
 if test $ac_cv_type_pid_t = yes; then
   :
 else
@@ -16995,8 +19471,8 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17007,36 +19483,49 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((size_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (size_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17045,24 +19534,25 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_size_t=no
+	ac_cv_type_size_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17086,24 +19576,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17112,12 +19614,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_time=no
+	ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -17126,8 +19629,8 @@
 
 fi
 
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17139,56 +19642,61 @@
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
 
 int
 main ()
 {
-int i;
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
+  ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_signal=int
+	ac_cv_type_signal=void
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -17199,8 +19707,8 @@
 # Checks for library functions.
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17215,29 +19723,42 @@
 main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17246,13 +19767,14 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_working_alloca_h=no
+	ac_cv_working_alloca_h=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -17261,8 +19783,8 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for alloca" >&5
+echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17279,7 +19801,7 @@
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  if HAVE_ALLOCA_H
+#  ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
@@ -17297,29 +19819,42 @@
 main ()
 {
 char *p = (char *) alloca (1);
+				    if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17328,13 +19863,14 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_alloca_works=no
+	ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
@@ -17348,15 +19884,15 @@
 # contain a buggy version.  If you still want to use their alloca,
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 
-ALLOCA=alloca.$ac_objext
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
 cat >>confdefs.h <<\_ACEOF
 #define C_ALLOCA 1
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17366,7 +19902,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if defined(CRAY) && ! defined(CRAY2)
+#if defined CRAY && ! defined CRAY2
 webecray
 #else
 wenotbecray
@@ -17382,14 +19918,14 @@
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+echo "${ECHO_T}$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17415,53 +19951,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17470,13 +20012,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -17489,8 +20033,8 @@
   done
 fi
 
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17503,6 +20047,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
 int
 find_stack_direction ()
 {
@@ -17520,17 +20065,26 @@
 int
 main ()
 {
-  exit (find_stack_direction () < 0);
+  return find_stack_direction () < 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17543,11 +20097,13 @@
 ( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -17560,9 +20116,9 @@
 for ac_func in strftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17588,53 +20144,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17643,13 +20205,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -17657,8 +20221,8 @@
 
 else
   # strftime is in -lintl on SCO UNIX.
-echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
+echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_intl_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17671,40 +20235,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strftime ();
 int
 main ()
 {
-strftime ();
+return strftime ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17713,14 +20289,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_intl_strftime=no
+	ac_cv_lib_intl_strftime=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; }
 if test $ac_cv_lib_intl_strftime = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRFTIME 1
@@ -17732,8 +20309,8 @@
 fi
 done
 
-echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
+echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
 if test "${ac_cv_func_setpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -17748,29 +20325,35 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
+$ac_includes_default
 int
 main ()
 {
 /* If this system has a BSD-style setpgrp which takes arguments,
   setpgrp(1, 1) will fail with ESRCH and return -1, in that case
   exit successfully. */
-  exit (setpgrp (1,1) == -1 ? 0 : 1);
+  return setpgrp (1,1) != -1;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17783,11 +20366,13 @@
 ( exit $ac_status )
 ac_cv_func_setpgrp_void=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
+echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
 if test $ac_cv_func_setpgrp_void = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -17805,9 +20390,9 @@
 for ac_func in gettimeofday mkfifo putenv setvbuf socket waitpid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17833,53 +20418,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17888,13 +20479,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -17915,9 +20508,9 @@
 for ac_func in strdup strstr strtol memmove memcpy strchr sysconf uname div
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17943,53 +20536,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -17998,13 +20597,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -18019,9 +20620,9 @@
 for ac_func in sigaction siginterrupt getpwuid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18047,53 +20648,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18102,13 +20709,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -18122,9 +20731,9 @@
 for ac_func in setpgrp setpgid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18150,53 +20759,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18205,13 +20820,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -18224,9 +20841,9 @@
 for ac_func in lstat
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18252,53 +20869,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18307,13 +20930,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -18325,8 +20950,8 @@
 
 
 
-echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
-echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
+echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18352,8 +20977,8 @@
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
-echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
+echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6; }
 if test $ac_cv_type_sig_atomic_t = no; then
 
 
@@ -18365,11 +20990,11 @@
 
 
 if test x$ac_cv_func_setvbuf = xyes; then
-  echo "$as_me:$LINENO: checking for function prototypes" >&5
-echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
-if test "$ac_cv_prog_cc_stdc" != no; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: checking for function prototypes" >&5
+echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; }
+if test "$ac_cv_prog_cc_c89" != no; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define PROTOTYPES 1
@@ -18381,12 +21006,12 @@
 _ACEOF
 
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking whether setvbuf arguments are reversed" >&5
-echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether setvbuf arguments are reversed" >&5
+echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6; }
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18398,7 +21023,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdio.h>
-#	  if PROTOTYPES
+#	  ifdef PROTOTYPES
 	   int (setvbuf) (FILE *, int, char *, size_t);
 #	  endif
 int
@@ -18410,24 +21035,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18438,7 +21075,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdio.h>
-#	     if PROTOTYPES
+#	     ifdef PROTOTYPES
 	      int (setvbuf) (FILE *, int, char *, size_t);
 #	     endif
 int
@@ -18450,24 +21087,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18483,7 +21132,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+$ac_includes_default
 int
 main ()
 {
@@ -18492,21 +21141,30 @@
 		   is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
 		char buf;
 		if (setvbuf (stdout, _IOLBF, &buf, 1) != 0)
-		  exit (1);
+		  return 1;
 		putchar ('\r');
-		exit (0); /* Non-reversed systems SEGV here.  */
+		return 0; /* Non-reversed systems SEGV here.  */
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18516,29 +21174,33 @@
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-rm -f core *.core
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 	ac_cv_func_setvbuf_reversed=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_setvbuf_reversed" >&5
-echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6; }
 if test $ac_cv_func_setvbuf_reversed = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -18553,9 +21215,9 @@
 for ac_func in select
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18581,53 +21243,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18636,13 +21304,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -18660,18 +21330,19 @@
 for ac_header in unistd.h sys/types.h sys/time.h sys/select.h sys/socket.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18682,24 +21353,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18708,15 +21391,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18725,8 +21409,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -18750,9 +21439,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -18776,25 +21466,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -18806,8 +21490,8 @@
 
 done
 
-  echo "$as_me:$LINENO: checking argument types of select()" >&5
-echo $ECHO_N "checking argument types of select()... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking argument types of select()" >&5
+echo $ECHO_N "checking argument types of select()... $ECHO_C" >&6; }
   if test "${ac_cv_type_fd_set_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18849,24 +21533,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -18875,9 +21571,10 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_found=no
+	ac_found=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
           done
         done
       done
@@ -18891,8 +21588,8 @@
    { (exit 1); exit 1; }; }
   fi
 
-  echo "$as_me:$LINENO: result: select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" >&5
-echo "${ECHO_T}select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" >&6
+  { echo "$as_me:$LINENO: result: select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" >&5
+echo "${ECHO_T}select($ac_cv_type_fd_set_size_t,$ac_cv_type_fd_set *,...)" >&6; }
 
 
   cat >>confdefs.h <<_ACEOF
@@ -18967,9 +21664,9 @@
 for ac_func in gethostname strcasecmp strncasecmp strdup strerror usleep atexit
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18995,53 +21692,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19050,25 +21753,25 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  case $LIBOBJS in
-    "$ac_func.$ac_objext"   | \
-  *" $ac_func.$ac_objext"   | \
-    "$ac_func.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
 esac
 
 fi
@@ -19083,9 +21786,9 @@
 for ac_func in mkstemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19111,53 +21814,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19166,13 +21875,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -19182,8 +21893,8 @@
 done
 
   has_safety_mkstemp=no
-  echo "$as_me:$LINENO: checking if mkstemp is safe" >&5
-echo $ECHO_N "checking if mkstemp is safe... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if mkstemp is safe" >&5
+echo $ECHO_N "checking if mkstemp is safe... $ECHO_C" >&6; }
   if test x$ac_cv_func_mkstemp != xno; then
     if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -19236,13 +21947,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19255,17 +21975,19 @@
 ( exit $ac_status )
 has_safety_mkstemp=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
   fi
 
 
   if test x$has_safety_mkstemp = xno; then
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   else
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_SAFETY_MKSTEMP 1
 _ACEOF
@@ -19279,9 +22001,9 @@
 for ac_func in on_exit
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19307,53 +22029,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19362,13 +22090,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -19384,9 +22114,9 @@
 for ac_func in unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -19412,53 +22142,59 @@
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19467,13 +22203,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -19488,37 +22226,37 @@
 # Check the availability of gtk
 FVWMGTK=""
 MANFVWMGTK=""
-# Check whether --enable-gtk or --disable-gtk was given.
+# Check whether --enable-gtk was given.
 if test "${enable_gtk+set}" = set; then
-  enableval="$enable_gtk"
-  enable_gtktest="$enableval"
+  enableval=$enable_gtk; enable_gtktest="$enableval"
 else
   enable_gtktest=yes
-fi;
+fi
+
 if test x"$enable_gtktest" = xyes; then
 
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+# Check whether --with-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
-fi;
+fi
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+
+# Check whether --with-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
-fi;
-# Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
+fi
 
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval=$enable_gtktest;
 else
   enable_gtktest=yes
-fi;
+fi
+
 
   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
@@ -19535,8 +22273,8 @@
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19551,31 +22289,32 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-
 if test -n "$GTK_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_gtk_version=1.1.0
-  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -19680,13 +22419,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19699,22 +22447,24 @@
 ( exit $ac_status )
 no_gtk=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 		FVWMGTK="FvwmGtk$EXEEXT"
 		MANFVWMGTK=FvwmGtk.1
 
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
@@ -19746,24 +22496,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19785,12 +22547,13 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -19822,28 +22585,28 @@
 
 
 
-# Check whether --with-imlib-prefix or --without-imlib-prefix was given.
+# Check whether --with-imlib-prefix was given.
 if test "${with_imlib_prefix+set}" = set; then
-  withval="$with_imlib_prefix"
-  imlib_prefix="$withval"
+  withval=$with_imlib_prefix; imlib_prefix="$withval"
 else
   imlib_prefix=""
-fi;
+fi
+
 
-# Check whether --with-imlib-exec-prefix or --without-imlib-exec-prefix was given.
+# Check whether --with-imlib-exec-prefix was given.
 if test "${with_imlib_exec_prefix+set}" = set; then
-  withval="$with_imlib_exec_prefix"
-  imlib_exec_prefix="$withval"
+  withval=$with_imlib_exec_prefix; imlib_exec_prefix="$withval"
 else
   imlib_exec_prefix=""
-fi;
-# Check whether --enable-imlibtest or --disable-imlibtest was given.
-if test "${enable_imlibtest+set}" = set; then
-  enableval="$enable_imlibtest"
+fi
 
+# Check whether --enable-imlibtest was given.
+if test "${enable_imlibtest+set}" = set; then
+  enableval=$enable_imlibtest;
 else
   enable_imlibtest=yes
-fi;
+fi
+
 
   if test x$imlib_exec_prefix != x ; then
      imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix"
@@ -19860,8 +22623,8 @@
 
   # Extract the first word of "imlib-config", so it can be a program name with args.
 set dummy imlib-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_IMLIBCONF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19876,31 +22639,32 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_IMLIBCONF="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_IMLIBCONF" && ac_cv_path_IMLIBCONF="no"
   ;;
 esac
 fi
 IMLIBCONF=$ac_cv_path_IMLIBCONF
-
 if test -n "$IMLIBCONF"; then
-  echo "$as_me:$LINENO: result: $IMLIBCONF" >&5
-echo "${ECHO_T}$IMLIBCONF" >&6
+  { echo "$as_me:$LINENO: result: $IMLIBCONF" >&5
+echo "${ECHO_T}$IMLIBCONF" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_imlib_version=1.8.0
-  echo "$as_me:$LINENO: checking for GDK IMLIB - version >= $min_imlib_version" >&5
-echo $ECHO_N "checking for GDK IMLIB - version >= $min_imlib_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GDK IMLIB - version >= $min_imlib_version" >&5
+echo $ECHO_N "checking for GDK IMLIB - version >= $min_imlib_version... $ECHO_C" >&6; }
   no_imlib=""
   if test "$IMLIBCONF" = "no" ; then
     no_imlib=yes
@@ -19969,13 +22733,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19988,22 +22761,24 @@
 ( exit $ac_status )
 no_imlib=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_imlib" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      cat >>confdefs.h <<\_ACEOF
 #define GDK_IMLIB 1
 _ACEOF
 
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$IMLIBCONF" = "no" ; then
                        (echo "*** The imlib-config script installed by IMLIB could not be found" >&5) 2>/dev/null || \
        echo "*** The imlib-config script installed by IMLIB could not be found"
@@ -20040,24 +22815,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20083,7 +22870,7 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-                 (echo "*** The test program failed to compile or link. See the file config.log for the" >&5) 2>/dev/null || \
+	                 (echo "*** The test program failed to compile or link. See the file config.log for the" >&5) 2>/dev/null || \
           echo "*** The test program failed to compile or link. See the file config.log for the"
                           (echo "*** exact error that occured. This usually means IMLIB was incorrectly installed" >&5) 2>/dev/null || \
           echo "*** exact error that occured. This usually means IMLIB was incorrectly installed"
@@ -20092,7 +22879,8 @@
                           (echo "*** may want to edit the imlib-config script: $IMLIBCONF" >&5) 2>/dev/null || \
           echo "*** may want to edit the imlib-config script: $IMLIBCONF"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -20121,31 +22909,30 @@
 
 
 
-# Check whether --with-gnome-includes or --without-gnome-includes was given.
+# Check whether --with-gnome-includes was given.
 if test "${with_gnome_includes+set}" = set; then
-  withval="$with_gnome_includes"
-
+  withval=$with_gnome_includes;
 	CFLAGS="$CFLAGS -I$withval"
 
-fi;
+fi
+
 
 	gnome_prefix=$ac_default_prefix/lib
 
 
-# Check whether --with-gnome-libs or --without-gnome-libs was given.
+# Check whether --with-gnome-libs was given.
 if test "${with_gnome_libs+set}" = set; then
-  withval="$with_gnome_libs"
-
+  withval=$with_gnome_libs;
 	LDFLAGS="$LDFLAGS -L$withval"
 	gnome_prefix=$withval
 
-fi;
+fi
+
 
 
-# Check whether --with-gnome or --without-gnome was given.
+# Check whether --with-gnome was given.
 if test "${with_gnome+set}" = set; then
-  withval="$with_gnome"
-  if test x$withval = xyes; then
+  withval=$with_gnome; if test x$withval = xyes; then
 	    		with_gnomelibs=yes
 	    						    		:
         	else
@@ -20161,15 +22948,16 @@
   		fi
 else
   with_gnomelibs=yes
-fi;
+fi
+
 
 	if test "x$with_gnomelibs" = xyes; then
 	    problem_gnomelibs=": Can't find working gnome-config"
 
 	    # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20184,44 +22972,45 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GNOME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
   ;;
 esac
 fi
 GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
-
 if test -n "$GNOME_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5
-echo "${ECHO_T}$GNOME_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5
+echo "${ECHO_T}$GNOME_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 	    if test "$GNOME_CONFIG" = "no"; then
 	      no_gnome_config="yes"
 	    else
-	      echo "$as_me:$LINENO: checking whether $GNOME_CONFIG works" >&5
-echo $ECHO_N "checking whether $GNOME_CONFIG works... $ECHO_C" >&6
+	      { echo "$as_me:$LINENO: checking whether $GNOME_CONFIG works" >&5
+echo $ECHO_N "checking whether $GNOME_CONFIG works... $ECHO_C" >&6; }
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
-	        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	        GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
 	        GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
 	        GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
 	        GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
 
 	      else
-	        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 	        no_gnome_config="yes"
               fi
             fi
@@ -20238,18 +23027,18 @@
 #	    fi
 
 	    if test "$no_gnome_config" = "yes"; then
-              echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5
-echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6
+              { echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6; }
 	      if test -f $gnome_prefix/gnomeConf.sh; then
-	        echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+	        { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
 	        echo "loading gnome configuration from" \
 		     "$gnome_prefix/gnomeConf.sh"
 	        . $gnome_prefix/gnomeConf.sh
 
 	      else
-	        echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+	        { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 	        if test x = xfail; then
 	          { { echo "$as_me:$LINENO: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5
 echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;}
@@ -20264,8 +23053,8 @@
 	if test "x$with_gnomelibs" = xyes; then
 		problem_gnomelibs=": Can't compile trivial gnome app"
 
-		echo "$as_me:$LINENO: checking whether trivial gnome compilation works" >&5
-echo $ECHO_N "checking whether trivial gnome compilation works... $ECHO_C" >&6
+		{ echo "$as_me:$LINENO: checking whether trivial gnome compilation works" >&5
+echo $ECHO_N "checking whether trivial gnome compilation works... $ECHO_C" >&6; }
 		my_CPPFLAGS="$CPPFLAGS"
 		my_LIBS="$LIBS"
 		CPPFLAGS="$CPPFLAGS $GNOME_INCLUDEDIR $GTK_CFLAGS"
@@ -20292,13 +23081,22 @@
 			}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20312,10 +23110,12 @@
 with_gnomelibs=no
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-		echo "$as_me:$LINENO: result: $with_gnomelibs" >&5
-echo "${ECHO_T}$with_gnomelibs" >&6
+
+
+		{ echo "$as_me:$LINENO: result: $with_gnomelibs" >&5
+echo "${ECHO_T}$with_gnomelibs" >&6; }
 		CPPFLAGS="$my_CPPFLAGS"
 		LIBS="$my_LIBS"
 	else
@@ -20376,13 +23176,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20398,9 +23207,11 @@
 _ACEOF
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
+
 CPPFLAGS="$mg_save_CPPFLAGS"
 
 
@@ -20439,13 +23250,22 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20461,9 +23281,11 @@
 _ACEOF
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
+
 CPPFLAGS="$mg_save_CPPFLAGS"
 
 fi
@@ -20478,18 +23300,19 @@
 for ac_header in dmalloc.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20500,24 +23323,36 @@
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20526,15 +23361,16 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20543,8 +23379,13 @@
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -20568,9 +23409,10 @@
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -20594,25 +23436,19 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -20625,8 +23461,8 @@
 done
 
 
-echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
-echo $ECHO_N "checking for dmalloc_shutdown in -ldmalloc... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
+echo $ECHO_N "checking for dmalloc_shutdown in -ldmalloc... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dmalloc_dmalloc_shutdown+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20639,40 +23475,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dmalloc_shutdown ();
 int
 main ()
 {
-dmalloc_shutdown ();
+return dmalloc_shutdown ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20681,14 +23529,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dmalloc_dmalloc_shutdown=no
+	ac_cv_lib_dmalloc_dmalloc_shutdown=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
-echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
+echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
 if test $ac_cv_lib_dmalloc_dmalloc_shutdown = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDMALLOC 1
@@ -20705,8 +23554,8 @@
 # Allow building with efence.
 case "$ac_cv_efence" in
   yes)
-echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
-echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
+echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6; }
 if test "${ac_cv_lib_efence_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20719,40 +23568,52 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char malloc ();
 int
 main ()
 {
-malloc ();
+return malloc ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20761,14 +23622,15 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_efence_malloc=no
+	ac_cv_lib_efence_malloc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6; }
 if test $ac_cv_lib_efence_malloc = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEFENCE 1
@@ -20807,7 +23669,8 @@
 LOCAL_BUGADDR=${FVWM_BUGADDR-${USER-${LOGNAME-`whoami`}}}
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile libs/Makefile fvwm/Makefile modules/Makefile bin/fvwm-bug.1 bin/fvwm-config.1 bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1 bin/fvwm-root.1 fvwm/fvwm.1 modules/FvwmAnimate/FvwmAnimate.1 modules/FvwmAuto/FvwmAuto.1 modules/FvwmBacker/FvwmBacker.1 modules/FvwmBanner/FvwmBanner.1 modules/FvwmButtons/FvwmButtons.1 modules/FvwmCommand/FvwmCommand.1 modules/FvwmConsole/FvwmConsole.1 modules/FvwmConsole/FvwmConsoleC.pl.1 modules/FvwmCpp/FvwmCpp.1 modules/FvwmDragWell/FvwmDragWell.1 modules/FvwmEvent/FvwmEvent.1 modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1 modules/FvwmIconBox/FvwmIconBox.1 modules/FvwmIconMan/FvwmIconMan.1 modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1 modules/FvwmPager/FvwmPager.1 modules/FvwmProxy/FvwmProxy.1 modules/FvwmRearrange/FvwmRearrange.1 modules/FvwmSave/FvwmSave.1 modules/FvwmSaveDesk/FvwmSaveDesk.1 modules/FvwmScript/FvwmScript.1 modules/FvwmScroll/FvwmScroll.1 modules/FvwmTaskBar/FvwmTaskBar.1 modules/FvwmTheme/FvwmTheme.1 modules/FvwmWharf/FvwmWharf.1 modules/FvwmWinList/FvwmWinList.1 bin/Makefile bin/fvwm-config bin/fvwm-bug bin/fvwm-perllib bin/fvwm-menu-xlock bin/fvwm-menu-directory bin/fvwm-menu-desktop bin/fvwm-menu-headlines bin/fvwm-convert-2.4 bin/fvwm-convert-2.6 utils/Makefile perllib/Makefile perllib/General/Makefile perllib/FVWM/Makefile perllib/FVWM/Module/Makefile perllib/FVWM/Tracker/Makefile perllib/FVWM/Module.pm rpm/Makefile rpm/fvwm.spec debian/Makefile debian/control docs/fvwm.lsm docs/Makefile sample.fvwmrc/Makefile tests/Makefile tests/hints/Makefile po/Makefile modules/FvwmAnimate/Makefile modules/FvwmAuto/Makefile modules/FvwmBacker/Makefile modules/FvwmBanner/Makefile modules/FvwmButtons/Makefile modules/FvwmCommand/Makefile modules/FvwmCommand/scripts/Makefile modules/FvwmConsole/Makefile modules/FvwmConsole/FvwmConsoleC.pl modules/FvwmCpp/Makefile modules/FvwmDebug/Makefile modules/FvwmDebug/FvwmDebug modules/FvwmDebug/FvwmGtkDebug modules/FvwmDragWell/Makefile modules/FvwmEvent/Makefile modules/FvwmForm/Makefile modules/FvwmIconBox/Makefile modules/FvwmIconMan/Makefile modules/FvwmIdent/Makefile modules/FvwmM4/Makefile modules/FvwmPager/Makefile modules/FvwmPerl/Makefile modules/FvwmPerl/FvwmPerl modules/FvwmProxy/Makefile modules/FvwmRearrange/Makefile modules/FvwmSave/Makefile modules/FvwmSaveDesk/Makefile modules/FvwmScript/Makefile modules/FvwmScript/Scripts/Makefile modules/FvwmScript/Widgets/Makefile modules/FvwmScroll/Makefile modules/FvwmTabs/Makefile modules/FvwmTabs/FvwmTabs modules/FvwmTaskBar/Makefile modules/FvwmTheme/Makefile modules/FvwmWharf/Makefile modules/FvwmWinList/Makefile modules/FvwmWindowMenu/Makefile modules/FvwmWindowMenu/FvwmWindowMenu modules/FvwmGtk/Makefile"
+ac_config_files="$ac_config_files Makefile libs/Makefile fvwm/Makefile modules/Makefile bin/fvwm-bug.1 bin/fvwm-config.1 bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1 bin/fvwm-root.1 fvwm/fvwm.1 modules/FvwmAnimate/FvwmAnimate.1 modules/FvwmAuto/FvwmAuto.1 modules/FvwmBacker/FvwmBacker.1 modules/FvwmBanner/FvwmBanner.1 modules/FvwmButtons/FvwmButtons.1 modules/FvwmCommand/FvwmCommand.1 modules/FvwmConsole/FvwmConsole.1 modules/FvwmConsole/FvwmConsoleC.pl.1 modules/FvwmCpp/FvwmCpp.1 modules/FvwmDragWell/FvwmDragWell.1 modules/FvwmEvent/FvwmEvent.1 modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1 modules/FvwmIconBox/FvwmIconBox.1 modules/FvwmIconMan/FvwmIconMan.1 modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1 modules/FvwmPager/FvwmPager.1 modules/FvwmProxy/FvwmProxy.1 modules/FvwmRearrange/FvwmRearrange.1 modules/FvwmSave/FvwmSave.1 modules/FvwmSaveDesk/FvwmSaveDesk.1 modules/FvwmScript/FvwmScript.1 modules/FvwmScroll/FvwmScroll.1 modules/FvwmTaskBar/FvwmTaskBar.1 modules/FvwmTheme/FvwmTheme.1 modules/FvwmWharf/FvwmWharf.1 modules/FvwmWinList/FvwmWinList.1 bin/Makefile bin/fvwm-config bin/fvwm-bug bin/fvwm-perllib bin/fvwm-menu-xlock bin/fvwm-menu-directory bin/fvwm-menu-desktop bin/fvwm-menu-headlines bin/fvwm-convert-2.4 bin/fvwm-convert-2.6 utils/Makefile perllib/Makefile perllib/General/Makefile perllib/FVWM/Makefile perllib/FVWM/Module/Makefile perllib/FVWM/Tracker/Makefile perllib/FVWM/Module.pm rpm/Makefile rpm/fvwm.spec docs/fvwm.lsm docs/Makefile sample.fvwmrc/Makefile tests/Makefile tests/hints/Makefile po/Makefile modules/FvwmAnimate/Makefile modules/FvwmAuto/Makefile modules/FvwmBacker/Makefile modules/FvwmBanner/Makefile modules/FvwmButtons/Makefile modules/FvwmCommand/Makefile modules/FvwmCommand/scripts/Makefile modules/FvwmConsole/Makefile modules/FvwmConsole/FvwmConsoleC.pl modules/FvwmCpp/Makefile modules/FvwmDebug/Makefile modules/FvwmDebug/FvwmDebug modules/FvwmDebug/FvwmGtkDebug modules/FvwmDragWell/Makefile modules/FvwmEvent/Makefile modules/FvwmForm/Makefile modules/FvwmIconBox/Makefile modules/FvwmIconMan/Makefile modules/FvwmIdent/Makefile modules/FvwmM4/Makefile modules/FvwmPager/Makefile modules/FvwmPerl/Makefile modules/FvwmPerl/FvwmPerl modules/FvwmProxy/Makefile modules/FvwmRearrange/Makefile modules/FvwmSave/Makefile modules/FvwmSaveDesk/Makefile modules/FvwmScript/Makefile modules/FvwmScript/Scripts/Makefile modules/FvwmScript/Widgets/Makefile modules/FvwmScroll/Makefile modules/FvwmTabs/Makefile modules/FvwmTabs/FvwmTabs modules/FvwmTaskBar/Makefile modules/FvwmTheme/Makefile modules/FvwmWharf/Makefile modules/FvwmWinList/Makefile modules/FvwmWindowMenu/Makefile modules/FvwmWindowMenu/FvwmWindowMenu modules/FvwmGtk/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -20826,39 +23689,58 @@
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -20867,32 +23749,18 @@
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -20951,24 +23819,83 @@
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
 
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
 
 # NLS nuisances.
 for as_var in \
@@ -20979,18 +23906,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -20998,159 +23926,120 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -21159,7 +24048,19 @@
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -21168,31 +24069,14 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -21200,30 +24084,20 @@
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
-
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -21231,7 +24105,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -21250,19 +24124,21 @@
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.60a,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -21273,39 +24149,24 @@
 do
   case $1 in
   --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
@@ -21315,18 +24176,24 @@
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -21342,143 +24209,153 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 _ACEOF
 
-
-
 cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
-  "fvwm/Makefile" ) CONFIG_FILES="$CONFIG_FILES fvwm/Makefile" ;;
-  "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
-  "bin/fvwm-bug.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-bug.1" ;;
-  "bin/fvwm-config.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-config.1" ;;
-  "bin/fvwm-convert-2.2.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.2.1" ;;
-  "bin/fvwm-convert-2.4.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.4.1" ;;
-  "bin/fvwm-convert-2.6.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.6.1" ;;
-  "bin/fvwm-menu-desktop.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-desktop.1" ;;
-  "bin/fvwm-root.1" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-root.1" ;;
-  "fvwm/fvwm.1" ) CONFIG_FILES="$CONFIG_FILES fvwm/fvwm.1" ;;
-  "modules/FvwmAnimate/FvwmAnimate.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmAnimate/FvwmAnimate.1" ;;
-  "modules/FvwmAuto/FvwmAuto.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmAuto/FvwmAuto.1" ;;
-  "modules/FvwmBacker/FvwmBacker.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmBacker/FvwmBacker.1" ;;
-  "modules/FvwmBanner/FvwmBanner.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmBanner/FvwmBanner.1" ;;
-  "modules/FvwmButtons/FvwmButtons.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmButtons/FvwmButtons.1" ;;
-  "modules/FvwmCommand/FvwmCommand.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/FvwmCommand.1" ;;
-  "modules/FvwmConsole/FvwmConsole.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsole.1" ;;
-  "modules/FvwmConsole/FvwmConsoleC.pl.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsoleC.pl.1" ;;
-  "modules/FvwmCpp/FvwmCpp.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmCpp/FvwmCpp.1" ;;
-  "modules/FvwmDragWell/FvwmDragWell.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmDragWell/FvwmDragWell.1" ;;
-  "modules/FvwmEvent/FvwmEvent.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmEvent/FvwmEvent.1" ;;
-  "modules/FvwmForm/FvwmForm.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmForm/FvwmForm.1" ;;
-  "modules/FvwmGtk/FvwmGtk.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmGtk/FvwmGtk.1" ;;
-  "modules/FvwmIconBox/FvwmIconBox.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIconBox/FvwmIconBox.1" ;;
-  "modules/FvwmIconMan/FvwmIconMan.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIconMan/FvwmIconMan.1" ;;
-  "modules/FvwmIdent/FvwmIdent.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIdent/FvwmIdent.1" ;;
-  "modules/FvwmM4/FvwmM4.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmM4/FvwmM4.1" ;;
-  "modules/FvwmPager/FvwmPager.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmPager/FvwmPager.1" ;;
-  "modules/FvwmProxy/FvwmProxy.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmProxy/FvwmProxy.1" ;;
-  "modules/FvwmRearrange/FvwmRearrange.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmRearrange/FvwmRearrange.1" ;;
-  "modules/FvwmSave/FvwmSave.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmSave/FvwmSave.1" ;;
-  "modules/FvwmSaveDesk/FvwmSaveDesk.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmSaveDesk/FvwmSaveDesk.1" ;;
-  "modules/FvwmScript/FvwmScript.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/FvwmScript.1" ;;
-  "modules/FvwmScroll/FvwmScroll.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScroll/FvwmScroll.1" ;;
-  "modules/FvwmTaskBar/FvwmTaskBar.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTaskBar/FvwmTaskBar.1" ;;
-  "modules/FvwmTheme/FvwmTheme.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTheme/FvwmTheme.1" ;;
-  "modules/FvwmWharf/FvwmWharf.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWharf/FvwmWharf.1" ;;
-  "modules/FvwmWinList/FvwmWinList.1" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWinList/FvwmWinList.1" ;;
-  "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
-  "bin/fvwm-config" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-config" ;;
-  "bin/fvwm-bug" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-bug" ;;
-  "bin/fvwm-perllib" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-perllib" ;;
-  "bin/fvwm-menu-xlock" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-xlock" ;;
-  "bin/fvwm-menu-directory" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-directory" ;;
-  "bin/fvwm-menu-desktop" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-desktop" ;;
-  "bin/fvwm-menu-headlines" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-headlines" ;;
-  "bin/fvwm-convert-2.4" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.4" ;;
-  "bin/fvwm-convert-2.6" ) CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.6" ;;
-  "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
-  "perllib/Makefile" ) CONFIG_FILES="$CONFIG_FILES perllib/Makefile" ;;
-  "perllib/General/Makefile" ) CONFIG_FILES="$CONFIG_FILES perllib/General/Makefile" ;;
-  "perllib/FVWM/Makefile" ) CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Makefile" ;;
-  "perllib/FVWM/Module/Makefile" ) CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Module/Makefile" ;;
-  "perllib/FVWM/Tracker/Makefile" ) CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Tracker/Makefile" ;;
-  "perllib/FVWM/Module.pm" ) CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Module.pm" ;;
-  "rpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;;
-  "rpm/fvwm.spec" ) CONFIG_FILES="$CONFIG_FILES rpm/fvwm.spec" ;;
-  "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
-  "debian/control" ) CONFIG_FILES="$CONFIG_FILES debian/control" ;;
-  "docs/fvwm.lsm" ) CONFIG_FILES="$CONFIG_FILES docs/fvwm.lsm" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "sample.fvwmrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES sample.fvwmrc/Makefile" ;;
-  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-  "tests/hints/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/hints/Makefile" ;;
-  "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
-  "modules/FvwmAnimate/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmAnimate/Makefile" ;;
-  "modules/FvwmAuto/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmAuto/Makefile" ;;
-  "modules/FvwmBacker/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmBacker/Makefile" ;;
-  "modules/FvwmBanner/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmBanner/Makefile" ;;
-  "modules/FvwmButtons/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmButtons/Makefile" ;;
-  "modules/FvwmCommand/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/Makefile" ;;
-  "modules/FvwmCommand/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/scripts/Makefile" ;;
-  "modules/FvwmConsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/Makefile" ;;
-  "modules/FvwmConsole/FvwmConsoleC.pl" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsoleC.pl" ;;
-  "modules/FvwmCpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmCpp/Makefile" ;;
-  "modules/FvwmDebug/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/Makefile" ;;
-  "modules/FvwmDebug/FvwmDebug" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/FvwmDebug" ;;
-  "modules/FvwmDebug/FvwmGtkDebug" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/FvwmGtkDebug" ;;
-  "modules/FvwmDragWell/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmDragWell/Makefile" ;;
-  "modules/FvwmEvent/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmEvent/Makefile" ;;
-  "modules/FvwmForm/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmForm/Makefile" ;;
-  "modules/FvwmIconBox/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIconBox/Makefile" ;;
-  "modules/FvwmIconMan/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIconMan/Makefile" ;;
-  "modules/FvwmIdent/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmIdent/Makefile" ;;
-  "modules/FvwmM4/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmM4/Makefile" ;;
-  "modules/FvwmPager/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmPager/Makefile" ;;
-  "modules/FvwmPerl/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmPerl/Makefile" ;;
-  "modules/FvwmPerl/FvwmPerl" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmPerl/FvwmPerl" ;;
-  "modules/FvwmProxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmProxy/Makefile" ;;
-  "modules/FvwmRearrange/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmRearrange/Makefile" ;;
-  "modules/FvwmSave/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmSave/Makefile" ;;
-  "modules/FvwmSaveDesk/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmSaveDesk/Makefile" ;;
-  "modules/FvwmScript/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Makefile" ;;
-  "modules/FvwmScript/Scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Scripts/Makefile" ;;
-  "modules/FvwmScript/Widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Widgets/Makefile" ;;
-  "modules/FvwmScroll/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmScroll/Makefile" ;;
-  "modules/FvwmTabs/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTabs/Makefile" ;;
-  "modules/FvwmTabs/FvwmTabs" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTabs/FvwmTabs" ;;
-  "modules/FvwmTaskBar/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTaskBar/Makefile" ;;
-  "modules/FvwmTheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmTheme/Makefile" ;;
-  "modules/FvwmWharf/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWharf/Makefile" ;;
-  "modules/FvwmWinList/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWinList/Makefile" ;;
-  "modules/FvwmWindowMenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWindowMenu/Makefile" ;;
-  "modules/FvwmWindowMenu/FvwmWindowMenu" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmWindowMenu/FvwmWindowMenu" ;;
-  "modules/FvwmGtk/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/FvwmGtk/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
+    "fvwm/Makefile") CONFIG_FILES="$CONFIG_FILES fvwm/Makefile" ;;
+    "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
+    "bin/fvwm-bug.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-bug.1" ;;
+    "bin/fvwm-config.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-config.1" ;;
+    "bin/fvwm-convert-2.2.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.2.1" ;;
+    "bin/fvwm-convert-2.4.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.4.1" ;;
+    "bin/fvwm-convert-2.6.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.6.1" ;;
+    "bin/fvwm-menu-desktop.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-desktop.1" ;;
+    "bin/fvwm-root.1") CONFIG_FILES="$CONFIG_FILES bin/fvwm-root.1" ;;
+    "fvwm/fvwm.1") CONFIG_FILES="$CONFIG_FILES fvwm/fvwm.1" ;;
+    "modules/FvwmAnimate/FvwmAnimate.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmAnimate/FvwmAnimate.1" ;;
+    "modules/FvwmAuto/FvwmAuto.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmAuto/FvwmAuto.1" ;;
+    "modules/FvwmBacker/FvwmBacker.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmBacker/FvwmBacker.1" ;;
+    "modules/FvwmBanner/FvwmBanner.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmBanner/FvwmBanner.1" ;;
+    "modules/FvwmButtons/FvwmButtons.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmButtons/FvwmButtons.1" ;;
+    "modules/FvwmCommand/FvwmCommand.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/FvwmCommand.1" ;;
+    "modules/FvwmConsole/FvwmConsole.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsole.1" ;;
+    "modules/FvwmConsole/FvwmConsoleC.pl.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsoleC.pl.1" ;;
+    "modules/FvwmCpp/FvwmCpp.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmCpp/FvwmCpp.1" ;;
+    "modules/FvwmDragWell/FvwmDragWell.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmDragWell/FvwmDragWell.1" ;;
+    "modules/FvwmEvent/FvwmEvent.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmEvent/FvwmEvent.1" ;;
+    "modules/FvwmForm/FvwmForm.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmForm/FvwmForm.1" ;;
+    "modules/FvwmGtk/FvwmGtk.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmGtk/FvwmGtk.1" ;;
+    "modules/FvwmIconBox/FvwmIconBox.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmIconBox/FvwmIconBox.1" ;;
+    "modules/FvwmIconMan/FvwmIconMan.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmIconMan/FvwmIconMan.1" ;;
+    "modules/FvwmIdent/FvwmIdent.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmIdent/FvwmIdent.1" ;;
+    "modules/FvwmM4/FvwmM4.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmM4/FvwmM4.1" ;;
+    "modules/FvwmPager/FvwmPager.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmPager/FvwmPager.1" ;;
+    "modules/FvwmProxy/FvwmProxy.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmProxy/FvwmProxy.1" ;;
+    "modules/FvwmRearrange/FvwmRearrange.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmRearrange/FvwmRearrange.1" ;;
+    "modules/FvwmSave/FvwmSave.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmSave/FvwmSave.1" ;;
+    "modules/FvwmSaveDesk/FvwmSaveDesk.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmSaveDesk/FvwmSaveDesk.1" ;;
+    "modules/FvwmScript/FvwmScript.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/FvwmScript.1" ;;
+    "modules/FvwmScroll/FvwmScroll.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmScroll/FvwmScroll.1" ;;
+    "modules/FvwmTaskBar/FvwmTaskBar.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmTaskBar/FvwmTaskBar.1" ;;
+    "modules/FvwmTheme/FvwmTheme.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmTheme/FvwmTheme.1" ;;
+    "modules/FvwmWharf/FvwmWharf.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmWharf/FvwmWharf.1" ;;
+    "modules/FvwmWinList/FvwmWinList.1") CONFIG_FILES="$CONFIG_FILES modules/FvwmWinList/FvwmWinList.1" ;;
+    "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
+    "bin/fvwm-config") CONFIG_FILES="$CONFIG_FILES bin/fvwm-config" ;;
+    "bin/fvwm-bug") CONFIG_FILES="$CONFIG_FILES bin/fvwm-bug" ;;
+    "bin/fvwm-perllib") CONFIG_FILES="$CONFIG_FILES bin/fvwm-perllib" ;;
+    "bin/fvwm-menu-xlock") CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-xlock" ;;
+    "bin/fvwm-menu-directory") CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-directory" ;;
+    "bin/fvwm-menu-desktop") CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-desktop" ;;
+    "bin/fvwm-menu-headlines") CONFIG_FILES="$CONFIG_FILES bin/fvwm-menu-headlines" ;;
+    "bin/fvwm-convert-2.4") CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.4" ;;
+    "bin/fvwm-convert-2.6") CONFIG_FILES="$CONFIG_FILES bin/fvwm-convert-2.6" ;;
+    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+    "perllib/Makefile") CONFIG_FILES="$CONFIG_FILES perllib/Makefile" ;;
+    "perllib/General/Makefile") CONFIG_FILES="$CONFIG_FILES perllib/General/Makefile" ;;
+    "perllib/FVWM/Makefile") CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Makefile" ;;
+    "perllib/FVWM/Module/Makefile") CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Module/Makefile" ;;
+    "perllib/FVWM/Tracker/Makefile") CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Tracker/Makefile" ;;
+    "perllib/FVWM/Module.pm") CONFIG_FILES="$CONFIG_FILES perllib/FVWM/Module.pm" ;;
+    "rpm/Makefile") CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;;
+    "rpm/fvwm.spec") CONFIG_FILES="$CONFIG_FILES rpm/fvwm.spec" ;;
+    "docs/fvwm.lsm") CONFIG_FILES="$CONFIG_FILES docs/fvwm.lsm" ;;
+    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+    "sample.fvwmrc/Makefile") CONFIG_FILES="$CONFIG_FILES sample.fvwmrc/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/hints/Makefile") CONFIG_FILES="$CONFIG_FILES tests/hints/Makefile" ;;
+    "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+    "modules/FvwmAnimate/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmAnimate/Makefile" ;;
+    "modules/FvwmAuto/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmAuto/Makefile" ;;
+    "modules/FvwmBacker/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmBacker/Makefile" ;;
+    "modules/FvwmBanner/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmBanner/Makefile" ;;
+    "modules/FvwmButtons/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmButtons/Makefile" ;;
+    "modules/FvwmCommand/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/Makefile" ;;
+    "modules/FvwmCommand/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmCommand/scripts/Makefile" ;;
+    "modules/FvwmConsole/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/Makefile" ;;
+    "modules/FvwmConsole/FvwmConsoleC.pl") CONFIG_FILES="$CONFIG_FILES modules/FvwmConsole/FvwmConsoleC.pl" ;;
+    "modules/FvwmCpp/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmCpp/Makefile" ;;
+    "modules/FvwmDebug/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/Makefile" ;;
+    "modules/FvwmDebug/FvwmDebug") CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/FvwmDebug" ;;
+    "modules/FvwmDebug/FvwmGtkDebug") CONFIG_FILES="$CONFIG_FILES modules/FvwmDebug/FvwmGtkDebug" ;;
+    "modules/FvwmDragWell/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmDragWell/Makefile" ;;
+    "modules/FvwmEvent/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmEvent/Makefile" ;;
+    "modules/FvwmForm/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmForm/Makefile" ;;
+    "modules/FvwmIconBox/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmIconBox/Makefile" ;;
+    "modules/FvwmIconMan/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmIconMan/Makefile" ;;
+    "modules/FvwmIdent/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmIdent/Makefile" ;;
+    "modules/FvwmM4/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmM4/Makefile" ;;
+    "modules/FvwmPager/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmPager/Makefile" ;;
+    "modules/FvwmPerl/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmPerl/Makefile" ;;
+    "modules/FvwmPerl/FvwmPerl") CONFIG_FILES="$CONFIG_FILES modules/FvwmPerl/FvwmPerl" ;;
+    "modules/FvwmProxy/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmProxy/Makefile" ;;
+    "modules/FvwmRearrange/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmRearrange/Makefile" ;;
+    "modules/FvwmSave/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmSave/Makefile" ;;
+    "modules/FvwmSaveDesk/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmSaveDesk/Makefile" ;;
+    "modules/FvwmScript/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Makefile" ;;
+    "modules/FvwmScript/Scripts/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Scripts/Makefile" ;;
+    "modules/FvwmScript/Widgets/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmScript/Widgets/Makefile" ;;
+    "modules/FvwmScroll/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmScroll/Makefile" ;;
+    "modules/FvwmTabs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmTabs/Makefile" ;;
+    "modules/FvwmTabs/FvwmTabs") CONFIG_FILES="$CONFIG_FILES modules/FvwmTabs/FvwmTabs" ;;
+    "modules/FvwmTaskBar/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmTaskBar/Makefile" ;;
+    "modules/FvwmTheme/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmTheme/Makefile" ;;
+    "modules/FvwmWharf/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmWharf/Makefile" ;;
+    "modules/FvwmWinList/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmWinList/Makefile" ;;
+    "modules/FvwmWindowMenu/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmWindowMenu/Makefile" ;;
+    "modules/FvwmWindowMenu/FvwmWindowMenu") CONFIG_FILES="$CONFIG_FILES modules/FvwmWindowMenu/FvwmWindowMenu" ;;
+    "modules/FvwmGtk/Makefile") CONFIG_FILES="$CONFIG_FILES modules/FvwmGtk/Makefile" ;;
+
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
 
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -21490,700 +24367,733 @@
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
 #
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
 #
 
 # No need to generate the scripts if there are no CONFIG_FILES.
 # This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@ISRELEASED@,$ISRELEASED,;t t
-s,@VERSIONINFO@,$VERSIONINFO,;t t
-s,@RELDATELONG@,$RELDATELONG,;t t
-s,@RELDATESHORT@,$RELDATESHORT,;t t
-s,@RELDATENUM@,$RELDATENUM,;t t
-s,@FVWMNAMEUCASE@,$FVWMNAMEUCASE,;t t
-s,@FVWMNAMELONG@,$FVWMNAMELONG,;t t
-s,@FVWMHOMEPAGE@,$FVWMHOMEPAGE,;t t
-s,@FVWMFTP@,$FVWMFTP,;t t
-s,@FVWMFTPDIR@,$FVWMFTPDIR,;t t
-s,@FVWMALTFTP@,$FVWMALTFTP,;t t
-s,@FVWMALTFTPDIR@,$FVWMALTFTPDIR,;t t
-s,@FVWMLIST@,$FVWMLIST,;t t
-s,@FVWMWORKERSLIST@,$FVWMWORKERSLIST,;t t
-s,@FVWMWORKERSLISTLONG@,$FVWMWORKERSLISTLONG,;t t
-s,@MANPAGE_PREAMBLE@,$MANPAGE_PREAMBLE,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@FVWM_MODULEDIR@,$FVWM_MODULEDIR,;t t
-s,@FVWM_DATADIR@,$FVWM_DATADIR,;t t
-s,@FVWM_PERLLIBDIR@,$FVWM_PERLLIBDIR,;t t
-s,@FVWM_CONFDIR@,$FVWM_CONFDIR,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CPP@,$CPP,;t t
-s,@X_CFLAGS@,$X_CFLAGS,;t t
-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
-s,@X_LIBS@,$X_LIBS,;t t
-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@FVWM_IMAGEPATH@,$FVWM_IMAGEPATH,;t t
-s,@EGREP@,$EGREP,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@Xinerama_LIBS@,$Xinerama_LIBS,;t t
-s,@Xinerama_CFLAGS@,$Xinerama_CFLAGS,;t t
-s,@Xrender_LIBS@,$Xrender_LIBS,;t t
-s,@Xrender_CFLAGS@,$Xrender_CFLAGS,;t t
-s,@FT2_CONFIG@,$FT2_CONFIG,;t t
-s,@FT2_CFLAGS@,$FT2_CFLAGS,;t t
-s,@FT2_LIBS@,$FT2_LIBS,;t t
-s,@FC_CONFIG@,$FC_CONFIG,;t t
-s,@FC_CFLAGS@,$FC_CFLAGS,;t t
-s,@FC_LIBS@,$FC_LIBS,;t t
-s,@XFT_CONFIG@,$XFT_CONFIG,;t t
-s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
-s,@XFT_LIBS@,$XFT_LIBS,;t t
-s,@Xft_LIBS@,$Xft_LIBS,;t t
-s,@Xft_CFLAGS@,$Xft_CFLAGS,;t t
-s,@xpm_LIBS@,$xpm_LIBS,;t t
-s,@xpm_CFLAGS@,$xpm_CFLAGS,;t t
-s,@png_LIBS@,$png_LIBS,;t t
-s,@png_CFLAGS@,$png_CFLAGS,;t t
-s,@rplay_LIBS@,$rplay_LIBS,;t t
-s,@rplay_CFLAGS@,$rplay_CFLAGS,;t t
-s,@stroke_LIBS@,$stroke_LIBS,;t t
-s,@stroke_CFLAGS@,$stroke_CFLAGS,;t t
-s,@readline_LIBS@,$readline_LIBS,;t t
-s,@readline_CFLAGS@,$readline_CFLAGS,;t t
-s,@iconv_LIBS@,$iconv_LIBS,;t t
-s,@iconv_CFLAGS@,$iconv_CFLAGS,;t t
-s,@FRIBIDI_CONFIG@,$FRIBIDI_CONFIG,;t t
-s,@Bidi_LIBS@,$Bidi_LIBS,;t t
-s,@Bidi_CFLAGS@,$Bidi_CFLAGS,;t t
-s,@FVWM_PERLLIB@,$FVWM_PERLLIB,;t t
-s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
-s,@FVWM_DOMAIN@,$FVWM_DOMAIN,;t t
-s,@FVWMTASKBAR_DOMAIN@,$FVWMTASKBAR_DOMAIN,;t t
-s,@FVWMSCRIPT_DOMAIN@,$FVWMSCRIPT_DOMAIN,;t t
-s,@ALL_DOMAINS@,$ALL_DOMAINS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@MSGUNIQ@,$MSGUNIQ,;t t
-s,@intl_LIBS@,$intl_LIBS,;t t
-s,@intl_CFLAGS@,$intl_CFLAGS,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@POSUB@,$POSUB,;t t
-s,@LOCALEDIR@,$LOCALEDIR,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@INST_LINGUAS@,$INST_LINGUAS,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@POFILES@,$POFILES,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@UPDATEPOFILES@,$UPDATEPOFILES,;t t
-s,@DUMMYPOFILES@,$DUMMYPOFILES,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@FVWM_CPP@,$FVWM_CPP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@REQUIRED_PERL_VERSION@,$REQUIRED_PERL_VERSION,;t t
-s,@PERL@,$PERL,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@GTK_CONFIG@,$GTK_CONFIG,;t t
-s,@FVWMGTK@,$FVWMGTK,;t t
-s,@MANFVWMGTK@,$MANFVWMGTK,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@IMLIBCONF@,$IMLIBCONF,;t t
-s,@GDK_IMLIB_CFLAGS@,$GDK_IMLIB_CFLAGS,;t t
-s,@GDK_IMLIB_LIBS@,$GDK_IMLIB_LIBS,;t t
-s,@GNOME_LIBS@,$GNOME_LIBS,;t t
-s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t
-s,@GNOME_LIBDIR@,$GNOME_LIBDIR,;t t
-s,@GNOME_INCLUDEDIR@,$GNOME_INCLUDEDIR,;t t
-s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t
-s,@with_bidi@,$with_bidi,;t t
-s,@with_gtk@,$with_gtk,;t t
-s,@with_gdkimlib@,$with_gdkimlib,;t t
-s,@with_gettext@,$with_gettext,;t t
-s,@with_gnomelibs@,$with_gnomelibs,;t t
-s,@with_iconv@,$with_iconv,;t t
-s,@with_perllib@,$with_perllib,;t t
-s,@with_png@,$with_png,;t t
-s,@with_readline@,$with_readline,;t t
-s,@with_rplay@,$with_rplay,;t t
-s,@with_shape@,$with_shape,;t t
-s,@with_shm@,$with_shm,;t t
-s,@with_sm@,$with_sm,;t t
-s,@with_stroke@,$with_stroke,;t t
-s,@with_xft@,$with_xft,;t t
-s,@with_xinerama@,$with_xinerama,;t t
-s,@with_xrender@,$with_xrender,;t t
-s,@with_xpm@,$with_xpm,;t t
-s,@LOCAL_BUGADDR@,$LOCAL_BUGADDR,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+ISRELEASED!$ISRELEASED$ac_delim
+VERSIONINFO!$VERSIONINFO$ac_delim
+RELDATELONG!$RELDATELONG$ac_delim
+RELDATESHORT!$RELDATESHORT$ac_delim
+RELDATENUM!$RELDATENUM$ac_delim
+FVWMNAMEUCASE!$FVWMNAMEUCASE$ac_delim
+FVWMNAMELONG!$FVWMNAMELONG$ac_delim
+FVWMHOMEPAGE!$FVWMHOMEPAGE$ac_delim
+FVWMFTP!$FVWMFTP$ac_delim
+FVWMFTPDIR!$FVWMFTPDIR$ac_delim
+FVWMALTFTP!$FVWMALTFTP$ac_delim
+FVWMALTFTPDIR!$FVWMALTFTPDIR$ac_delim
+FVWMLIST!$FVWMLIST$ac_delim
+FVWMWORKERSLIST!$FVWMWORKERSLIST$ac_delim
+FVWMWORKERSLISTLONG!$FVWMWORKERSLISTLONG$ac_delim
+MANPAGE_PREAMBLE!$MANPAGE_PREAMBLE$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+FVWM_MODULEDIR!$FVWM_MODULEDIR$ac_delim
+FVWM_DATADIR!$FVWM_DATADIR$ac_delim
+FVWM_PERLLIBDIR!$FVWM_PERLLIBDIR$ac_delim
+FVWM_CONFDIR!$FVWM_CONFDIR$ac_delim
+XMKMF!$XMKMF$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+X_CFLAGS!$X_CFLAGS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
 
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+X_LIBS!$X_LIBS$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+FVWM_IMAGEPATH!$FVWM_IMAGEPATH$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+Xinerama_LIBS!$Xinerama_LIBS$ac_delim
+Xinerama_CFLAGS!$Xinerama_CFLAGS$ac_delim
+Xrender_LIBS!$Xrender_LIBS$ac_delim
+Xrender_CFLAGS!$Xrender_CFLAGS$ac_delim
+FT2_CONFIG!$FT2_CONFIG$ac_delim
+FT2_CFLAGS!$FT2_CFLAGS$ac_delim
+FT2_LIBS!$FT2_LIBS$ac_delim
+FC_CONFIG!$FC_CONFIG$ac_delim
+FC_CFLAGS!$FC_CFLAGS$ac_delim
+FC_LIBS!$FC_LIBS$ac_delim
+XFT_CONFIG!$XFT_CONFIG$ac_delim
+XFT_CFLAGS!$XFT_CFLAGS$ac_delim
+XFT_LIBS!$XFT_LIBS$ac_delim
+Xft_LIBS!$Xft_LIBS$ac_delim
+Xft_CFLAGS!$Xft_CFLAGS$ac_delim
+xpm_LIBS!$xpm_LIBS$ac_delim
+xpm_CFLAGS!$xpm_CFLAGS$ac_delim
+png_LIBS!$png_LIBS$ac_delim
+png_CFLAGS!$png_CFLAGS$ac_delim
+rplay_LIBS!$rplay_LIBS$ac_delim
+rplay_CFLAGS!$rplay_CFLAGS$ac_delim
+stroke_LIBS!$stroke_LIBS$ac_delim
+stroke_CFLAGS!$stroke_CFLAGS$ac_delim
+readline_LIBS!$readline_LIBS$ac_delim
+readline_CFLAGS!$readline_CFLAGS$ac_delim
+iconv_LIBS!$iconv_LIBS$ac_delim
+iconv_CFLAGS!$iconv_CFLAGS$ac_delim
+FRIBIDI_CONFIG!$FRIBIDI_CONFIG$ac_delim
+Bidi_LIBS!$Bidi_LIBS$ac_delim
+Bidi_CFLAGS!$Bidi_CFLAGS$ac_delim
+FVWM_PERLLIB!$FVWM_PERLLIB$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+FVWM_DOMAIN!$FVWM_DOMAIN$ac_delim
+FVWMTASKBAR_DOMAIN!$FVWMTASKBAR_DOMAIN$ac_delim
+FVWMSCRIPT_DOMAIN!$FVWMSCRIPT_DOMAIN$ac_delim
+ALL_DOMAINS!$ALL_DOMAINS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGUNIQ!$MSGUNIQ$ac_delim
+intl_LIBS!$intl_LIBS$ac_delim
+intl_CFLAGS!$intl_CFLAGS$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+POSUB!$POSUB$ac_delim
+LOCALEDIR!$LOCALEDIR$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+INST_LINGUAS!$INST_LINGUAS$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+POFILES!$POFILES$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+UPDATEPOFILES!$UPDATEPOFILES$ac_delim
+DUMMYPOFILES!$DUMMYPOFILES$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+FVWM_CPP!$FVWM_CPP$ac_delim
+LN_S!$LN_S$ac_delim
+RANLIB!$RANLIB$ac_delim
+REQUIRED_PERL_VERSION!$REQUIRED_PERL_VERSION$ac_delim
+PERL!$PERL$ac_delim
+ALLOCA!$ALLOCA$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+GTK_CONFIG!$GTK_CONFIG$ac_delim
+FVWMGTK!$FVWMGTK$ac_delim
+MANFVWMGTK!$MANFVWMGTK$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+IMLIBCONF!$IMLIBCONF$ac_delim
+GDK_IMLIB_CFLAGS!$GDK_IMLIB_CFLAGS$ac_delim
+GDK_IMLIB_LIBS!$GDK_IMLIB_LIBS$ac_delim
+GNOME_LIBS!$GNOME_LIBS$ac_delim
+GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim
+GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim
+GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim
+GNOME_CONFIG!$GNOME_CONFIG$ac_delim
+with_bidi!$with_bidi$ac_delim
+with_gtk!$with_gtk$ac_delim
+with_gdkimlib!$with_gdkimlib$ac_delim
+with_gettext!$with_gettext$ac_delim
+with_gnomelibs!$with_gnomelibs$ac_delim
+with_iconv!$with_iconv$ac_delim
+with_perllib!$with_perllib$ac_delim
+with_png!$with_png$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+with_readline!$with_readline$ac_delim
+with_rplay!$with_rplay$ac_delim
+with_shape!$with_shape$ac_delim
+with_shm!$with_shm$ac_delim
+with_sm!$with_sm$ac_delim
+with_stroke!$with_stroke$ac_delim
+with_xft!$with_xft$ac_delim
+with_xinerama!$with_xinerama$ac_delim
+with_xrender!$with_xrender$ac_delim
+with_xpm!$with_xpm$ac_delim
+LOCAL_BUGADDR!$LOCAL_BUGADDR$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
 cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$ac_file_inputs $ac_f"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    esac
+    ;;
   esac
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
   ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+_ACEOF
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  rm -f "$tmp/stdin"
   case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
   esac
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
 
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
 
-# This sed command replaces #undef with comments.  This is necessary, for
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
 _ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
 cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
       rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
+  rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
 _am_stamp_count=1
 for _am_header in $config_headers :; do
@@ -22194,135 +25104,39 @@
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X$ac_file : 'X\(//\)[^/]' \| \
 	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
 echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -22332,92 +25146,123 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # So let's grep whole file.
   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
     continue
   fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+    fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
--- fvwm-2.5.18.orig/fvwm/.arch-ids/eventhandler.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/eventhandler.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.97
--- fvwm-2.5.18.orig/fvwm/.arch-ids/style.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/style.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.165
--- fvwm-2.5.18.orig/fvwm/.arch-ids/colorset.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/colorset.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.86
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.102
--- fvwm-2.5.18.orig/fvwm/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/fvwm/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.72
--- fvwm-2.5.18.orig/fvwm/.arch-ids/colormaps.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/colormaps.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.83
--- fvwm-2.5.18.orig/fvwm/.arch-ids/update.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/update.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.166
--- fvwm-2.5.18.orig/fvwm/.arch-ids/virtual.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/virtual.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.168
--- fvwm-2.5.18.orig/fvwm/.arch-ids/gnome.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/gnome.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.128
--- fvwm-2.5.18.orig/fvwm/.arch-ids/conditional.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/conditional.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.90
--- fvwm-2.5.18.orig/fvwm/.arch-ids/borders.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/borders.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.78
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.101
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menustyle.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menustyle.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.142
--- fvwm-2.5.18.orig/fvwm/.arch-ids/expand.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/expand.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.111
--- fvwm-2.5.18.orig/fvwm/.arch-ids/add_window.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/add_window.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.74
--- fvwm-2.5.18.orig/fvwm/.arch-ids/builtins.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/builtins.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.81
--- fvwm-2.5.18.orig/fvwm/.arch-ids/move_resize.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/move_resize.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.149
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ConfigFvwmDefaults.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ConfigFvwmDefaults.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.70
--- fvwm-2.5.18.orig/fvwm/.arch-ids/repeat.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/repeat.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.156
--- fvwm-2.5.18.orig/fvwm/.arch-ids/geometry.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/geometry.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.126
--- fvwm-2.5.18.orig/fvwm/.arch-ids/icccm2.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/icccm2.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.131
--- fvwm-2.5.18.orig/fvwm/.arch-ids/events.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/events.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.99
--- fvwm-2.5.18.orig/fvwm/.arch-ids/misc.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/misc.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.143
--- fvwm-2.5.18.orig/fvwm/.arch-ids/icccm2.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/icccm2.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.130
--- fvwm-2.5.18.orig/fvwm/.arch-ids/execcontext.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/execcontext.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.109
--- fvwm-2.5.18.orig/fvwm/.arch-ids/modconf.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/modconf.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.146
--- fvwm-2.5.18.orig/fvwm/.arch-ids/read.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/read.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.154
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ConfigFvwmSetup.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ConfigFvwmSetup.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.71
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menuitem.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menuitem.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.138
--- fvwm-2.5.18.orig/fvwm/.arch-ids/add_window.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/add_window.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.75
--- fvwm-2.5.18.orig/fvwm/.arch-ids/execcontext.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/execcontext.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.108
--- fvwm-2.5.18.orig/fvwm/.arch-ids/repeat.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/repeat.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.155
--- fvwm-2.5.18.orig/fvwm/.arch-ids/windowlist.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/windowlist.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.172
--- fvwm-2.5.18.orig/fvwm/.arch-ids/colormaps.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/colormaps.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.82
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh_events.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh_events.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.104
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh_icons.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh_icons.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.105
--- fvwm-2.5.18.orig/fvwm/.arch-ids/borders.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/borders.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.79
--- fvwm-2.5.18.orig/fvwm/.arch-ids/functable.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/functable.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.119
--- fvwm-2.5.18.orig/fvwm/.arch-ids/geometry.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/geometry.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.127
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menus.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menus.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.140
--- fvwm-2.5.18.orig/fvwm/.arch-ids/icons.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/icons.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.132
--- fvwm-2.5.18.orig/fvwm/.arch-ids/session.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/session.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.161
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menustyle.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menustyle.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.141
--- fvwm-2.5.18.orig/fvwm/.arch-ids/stack.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/stack.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.162
--- fvwm-2.5.18.orig/fvwm/.arch-ids/cursor.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/cursor.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.94
--- fvwm-2.5.18.orig/fvwm/.arch-ids/bindings.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/bindings.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.77
--- fvwm-2.5.18.orig/fvwm/.arch-ids/fvwm.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/fvwm.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.124
--- fvwm-2.5.18.orig/fvwm/.arch-ids/frame.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/frame.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.118
--- fvwm-2.5.18.orig/fvwm/.arch-ids/schedule.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/schedule.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.157
--- fvwm-2.5.18.orig/fvwm/.arch-ids/commands.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/commands.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.88
--- fvwm-2.5.18.orig/fvwm/.arch-ids/modconf.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/modconf.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.145
--- fvwm-2.5.18.orig/fvwm/.arch-ids/schedule.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/schedule.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.158
--- fvwm-2.5.18.orig/fvwm/.arch-ids/module_interface.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/module_interface.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.148
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh_names.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh_names.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.107
--- fvwm-2.5.18.orig/fvwm/.arch-ids/read.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/read.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.153
--- fvwm-2.5.18.orig/fvwm/.arch-ids/session.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/session.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.160
--- fvwm-2.5.18.orig/fvwm/.arch-ids/style.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/style.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.164
--- fvwm-2.5.18.orig/fvwm/.arch-ids/module_interface.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/module_interface.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.147
--- fvwm-2.5.18.orig/fvwm/.arch-ids/events.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/events.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.100
--- fvwm-2.5.18.orig/fvwm/.arch-ids/externs.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/externs.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.112
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh_conf.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh_conf.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.103
--- fvwm-2.5.18.orig/fvwm/.arch-ids/colorset.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/colorset.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.87
--- fvwm-2.5.18.orig/fvwm/.arch-ids/functions.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/functions.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.122
--- fvwm-2.5.18.orig/fvwm/.arch-ids/focus.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/focus.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.114
--- fvwm-2.5.18.orig/fvwm/.arch-ids/misc.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/misc.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.144
--- fvwm-2.5.18.orig/fvwm/.arch-ids/frame.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/frame.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.117
--- fvwm-2.5.18.orig/fvwm/.arch-ids/ewmh_intern.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/ewmh_intern.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.106
--- fvwm-2.5.18.orig/fvwm/.arch-ids/decorations.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/decorations.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.95
--- fvwm-2.5.18.orig/fvwm/.arch-ids/fvwm.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/fvwm.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.125
--- fvwm-2.5.18.orig/fvwm/.arch-ids/gnome.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/gnome.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.129
--- fvwm-2.5.18.orig/fvwm/.arch-ids/eventmask.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/eventmask.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.98
--- fvwm-2.5.18.orig/fvwm/.arch-ids/bindings.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/bindings.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.76
--- fvwm-2.5.18.orig/fvwm/.arch-ids/focus_policy.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/focus_policy.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.116
--- fvwm-2.5.18.orig/fvwm/.arch-ids/placement.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/placement.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.152
--- fvwm-2.5.18.orig/fvwm/.arch-ids/focus_policy.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/focus_policy.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.115
--- fvwm-2.5.18.orig/fvwm/.arch-ids/cursor.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/cursor.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.93
--- fvwm-2.5.18.orig/fvwm/.arch-ids/windowlist.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/windowlist.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.171
--- fvwm-2.5.18.orig/fvwm/.arch-ids/virtual.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/virtual.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.169
--- fvwm-2.5.18.orig/fvwm/.arch-ids/move_resize.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/move_resize.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.150
--- fvwm-2.5.18.orig/fvwm/.arch-ids/condrc.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/condrc.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.92
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menudim.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menudim.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.135
--- fvwm-2.5.18.orig/fvwm/.arch-ids/decorations.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/decorations.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.96
--- fvwm-2.5.18.orig/fvwm/.arch-ids/=id
+++ fvwm-2.5.18/fvwm/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.69
--- fvwm-2.5.18.orig/fvwm/.arch-ids/expand.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/expand.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.110
--- fvwm-2.5.18.orig/fvwm/.arch-ids/fvwm.1.in.id
+++ fvwm-2.5.18/fvwm/.arch-ids/fvwm.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.123
--- fvwm-2.5.18.orig/fvwm/.arch-ids/condrc.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/condrc.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.91
--- fvwm-2.5.18.orig/fvwm/.arch-ids/conditional.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/conditional.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.89
--- fvwm-2.5.18.orig/fvwm/.arch-ids/focus.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/focus.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.113
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menus.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menus.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.139
--- fvwm-2.5.18.orig/fvwm/.arch-ids/update.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/update.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.167
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menuitem.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menuitem.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.137
--- fvwm-2.5.18.orig/fvwm/.arch-ids/window_flags.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/window_flags.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.170
--- fvwm-2.5.18.orig/fvwm/.arch-ids/placement.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/placement.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.151
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menudim.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menudim.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.136
--- fvwm-2.5.18.orig/fvwm/.arch-ids/stack.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/stack.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.163
--- fvwm-2.5.18.orig/fvwm/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/fvwm/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.73
--- fvwm-2.5.18.orig/fvwm/.arch-ids/functable.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/functable.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.120
--- fvwm-2.5.18.orig/fvwm/.arch-ids/functions.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/functions.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.121
--- fvwm-2.5.18.orig/fvwm/.arch-ids/screen.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/screen.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.159
--- fvwm-2.5.18.orig/fvwm/.arch-ids/menucmd.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/menucmd.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.134
--- fvwm-2.5.18.orig/fvwm/.arch-ids/icons.h.id
+++ fvwm-2.5.18/fvwm/.arch-ids/icons.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.133
--- fvwm-2.5.18.orig/fvwm/.arch-ids/builtins.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/builtins.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.80
--- fvwm-2.5.18.orig/fvwm/.arch-ids/windowshade.c.id
+++ fvwm-2.5.18/fvwm/.arch-ids/windowshade.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.173
--- fvwm-2.5.18.orig/fvwm/Makefile.in
+++ fvwm-2.5.18/fvwm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(fvwm_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,6 +35,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = fvwm$(EXEEXT)
 subdir = fvwm
@@ -47,10 +46,11 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = fvwm.1
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(configdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_fvwm_OBJECTS = menus.$(OBJEXT) style.$(OBJEXT) events.$(OBJEXT) \
@@ -75,34 +75,6 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/add_window.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/bindings.Po ./$(DEPDIR)/borders.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/builtins.Po ./$(DEPDIR)/colormaps.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/colorset.Po ./$(DEPDIR)/conditional.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/condrc.Po ./$(DEPDIR)/cursor.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/decorations.Po ./$(DEPDIR)/events.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ewmh.Po ./$(DEPDIR)/ewmh_conf.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ewmh_events.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ewmh_icons.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ewmh_names.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/execcontext.Po ./$(DEPDIR)/expand.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/focus.Po ./$(DEPDIR)/focus_policy.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/frame.Po ./$(DEPDIR)/functable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/functions.Po ./$(DEPDIR)/fvwm.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/geometry.Po ./$(DEPDIR)/gnome.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/icccm2.Po ./$(DEPDIR)/icons.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/menucmd.Po ./$(DEPDIR)/menudim.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/menuitem.Po ./$(DEPDIR)/menus.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/menustyle.Po ./$(DEPDIR)/misc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/modconf.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/module_interface.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/move_resize.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/placement.Po ./$(DEPDIR)/read.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/repeat.Po ./$(DEPDIR)/schedule.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/session.Po ./$(DEPDIR)/stack.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/style.Po ./$(DEPDIR)/update.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/virtual.Po ./$(DEPDIR)/windowlist.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/windowshade.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -112,6 +84,12 @@
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
 ETAGS = etags
@@ -253,6 +231,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -478,16 +458,14 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 install-man1: $(man1_MANS) $(man_MANS)
@@ -540,7 +518,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -548,7 +526,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -654,7 +632,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/fvwm/fvwm.c
+++ fvwm-2.5.18/fvwm/fvwm.c
@@ -1358,6 +1358,8 @@
 		{ "TitleStyle Centered -- Raised", "", "" },
 		{ "Style * Color lightgrey/dimgrey", "", "" },
 		{ "Style * HilightFore black, HilightBack grey", "", "" },
+		{ "Read /etc/X11/fvwm/menudefs.hook Quiet", "", "" },
+		{ "Read menudefs.hook Quiet", "", "" },
 		{
 			"AddToMenu MenuFvwmRoot \"",
 			_("Builtin Menu"),
@@ -1380,6 +1382,11 @@
 			"\" Module FvwmConsole"
 		},
 		{
+			"+ \"&D. ",
+			_("Debian Menu"),
+			"\" Popup /Debian"
+		},
+		{
 			"+ \"&R. ",
 			_("Restart FVWM"),
 			"\" Restart"
--- fvwm-2.5.18.orig/fvwm/placement.c
+++ fvwm-2.5.18/fvwm/placement.c
@@ -280,7 +280,7 @@
 		{
 			test_y +=1;
 		}
-	} /* while */
+	} /* for */
 	if (loc_ok == False)
 	{
 		return False;
--- fvwm-2.5.18.orig/fvwm/ConfigFvwmSetup
+++ fvwm-2.5.18/fvwm/ConfigFvwmSetup
@@ -24,6 +24,7 @@
 Style *           IconBox 0 -10 -280 -1
 Style *           FocusFollowsMouse
 Style *           TileCascadePlacement
+Style *           EWMHUseStackingOrderHints
 
 # Styles for various Fvwm modules:
 Style Fvwm*       NoTitle,  Sticky, WindowListSkip
@@ -48,6 +49,7 @@
 Style xmag        Icon mag_glass.xpm, ClickToFocus
 Style xgraph      Icon graphs.xpm, ClickToFocus
 Style xmosaic     Color Green/Yellow, ClickToFocus
+Style OpenOffice* NoFuncHint
 
 
 # some simple default key bindings:
@@ -87,11 +89,16 @@
 + I Nop
 
 ######################## Menus ###################
+Read /etc/X11/fvwm/menudefs.hook Quiet
+Read menudefs.hook Quiet
+
 DestroyMenu MenuFvwmRoot
 AddToMenu MenuFvwmRoot  "$[gt.Root Menu]"             Title
 +                       "&1. XTerm"             Exec exec xterm
 +                       "&2. Rxvt"              Exec exec rxvt
 +                       ""              Nop
++                       "&D. Debian Menu"             Popup "/Debian"
++                       ""              Nop
 +                       "&R. $[gt.Remote Logins]"     Popup MenuFvwmLogins
 +                       ""              Nop
 +                       "&U. $[gt.Utilities]"         Popup MenuFvwmUtilities
--- fvwm-2.5.18.orig/docs/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/docs/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.63
--- fvwm-2.5.18.orig/docs/.arch-ids/DEVELOPERS.id
+++ fvwm-2.5.18/docs/.arch-ids/DEVELOPERS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.61
--- fvwm-2.5.18.orig/docs/.arch-ids/TODO.id
+++ fvwm-2.5.18/docs/.arch-ids/TODO.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.65
--- fvwm-2.5.18.orig/docs/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/docs/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.60
--- fvwm-2.5.18.orig/docs/.arch-ids/ANNOUNCE.id
+++ fvwm-2.5.18/docs/.arch-ids/ANNOUNCE.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.56
--- fvwm-2.5.18.orig/docs/.arch-ids/error_codes.id
+++ fvwm-2.5.18/docs/.arch-ids/error_codes.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.66
--- fvwm-2.5.18.orig/docs/.arch-ids/COMMANDS.id
+++ fvwm-2.5.18/docs/.arch-ids/COMMANDS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.58
--- fvwm-2.5.18.orig/docs/.arch-ids/CONVENTIONS.id
+++ fvwm-2.5.18/docs/.arch-ids/CONVENTIONS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.59
--- fvwm-2.5.18.orig/docs/.arch-ids/BUGS.id
+++ fvwm-2.5.18/docs/.arch-ids/BUGS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.57
--- fvwm-2.5.18.orig/docs/.arch-ids/FAQ.id
+++ fvwm-2.5.18/docs/.arch-ids/FAQ.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.62
--- fvwm-2.5.18.orig/docs/.arch-ids/=id
+++ fvwm-2.5.18/docs/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.55
--- fvwm-2.5.18.orig/docs/.arch-ids/fvwm.lsm.in.id
+++ fvwm-2.5.18/docs/.arch-ids/fvwm.lsm.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.68
--- fvwm-2.5.18.orig/docs/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/docs/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.64
--- fvwm-2.5.18.orig/docs/Makefile.in
+++ fvwm-2.5.18/docs/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = docs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -42,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = fvwm.lsm
 SOURCES =
@@ -184,6 +185,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -340,7 +343,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/.arch-ids/INSTALL.id
+++ fvwm-2.5.18/.arch-ids/INSTALL.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.3
--- fvwm-2.5.18.orig/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.5
--- fvwm-2.5.18.orig/.arch-ids/install-sh.id
+++ fvwm-2.5.18/.arch-ids/install-sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.174
--- fvwm-2.5.18.orig/.arch-ids/depcomp.id
+++ fvwm-2.5.18/.arch-ids/depcomp.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.54
--- fvwm-2.5.18.orig/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.2
--- fvwm-2.5.18.orig/.arch-ids/README.id
+++ fvwm-2.5.18/.arch-ids/README.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.8
--- fvwm-2.5.18.orig/.arch-ids/COPYING.id
+++ fvwm-2.5.18/.arch-ids/COPYING.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.1
--- fvwm-2.5.18.orig/.arch-ids/config.h.in.id
+++ fvwm-2.5.18/.arch-ids/config.h.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.39
--- fvwm-2.5.18.orig/.arch-ids/configure.id
+++ fvwm-2.5.18/.arch-ids/configure.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.41
--- fvwm-2.5.18.orig/.arch-ids/NEWS.id
+++ fvwm-2.5.18/.arch-ids/NEWS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.7
--- fvwm-2.5.18.orig/.arch-ids/INSTALL.fvwm.id
+++ fvwm-2.5.18/.arch-ids/INSTALL.fvwm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.4
--- fvwm-2.5.18.orig/.arch-ids/aclocal.m4.id
+++ fvwm-2.5.18/.arch-ids/aclocal.m4.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.11
--- fvwm-2.5.18.orig/.arch-ids/acinclude.m4.id
+++ fvwm-2.5.18/.arch-ids/acinclude.m4.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.10
--- fvwm-2.5.18.orig/.arch-ids/config.sub.id
+++ fvwm-2.5.18/.arch-ids/config.sub.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.40
--- fvwm-2.5.18.orig/.arch-ids/configure.ac.id
+++ fvwm-2.5.18/.arch-ids/configure.ac.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Sun Jan 22 00:00:05 2006 7546.0
--- fvwm-2.5.18.orig/.arch-ids/missing.id
+++ fvwm-2.5.18/.arch-ids/missing.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.290
--- fvwm-2.5.18.orig/.arch-ids/AUTHORS.id
+++ fvwm-2.5.18/.arch-ids/AUTHORS.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.0
--- fvwm-2.5.18.orig/.arch-ids/ltmain.sh.id
+++ fvwm-2.5.18/.arch-ids/ltmain.sh.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Aug 25 14:18:53 2005 19410.0
--- fvwm-2.5.18.orig/.arch-ids/config.guess.id
+++ fvwm-2.5.18/.arch-ids/config.guess.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.38
--- fvwm-2.5.18.orig/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.6
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.fr.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.fr.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.716
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.ar.po.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.ar.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.713
--- fvwm-2.5.18.orig/po/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/po/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.709
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.ar.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.ar.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.701
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.zh_CN.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.zh_CN.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9156.0
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.ar.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.ar.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.700
--- fvwm-2.5.18.orig/po/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/po/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.690
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.de.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.de.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.703
--- fvwm-2.5.18.orig/po/.arch-ids/README.id
+++ fvwm-2.5.18/po/.arch-ids/README.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.711
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.pot.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.pot.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.706
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.de.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.de.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.693
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.de.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.de.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.702
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.sv_SE.po.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.sv_SE.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.720
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.fr.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.fr.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.696
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.zh_CN.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9159.0
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.fr.po.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.fr.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.717
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.de.po.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.de.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.715
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.ar.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.ar.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.692
--- fvwm-2.5.18.orig/po/.arch-ids/remove-potcdate.sed.id
+++ fvwm-2.5.18/po/.arch-ids/remove-potcdate.sed.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.721
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.fr.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.fr.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.704
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.zh_CN.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.zh_CN.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9160.0
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.pot.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.pot.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.697
--- fvwm-2.5.18.orig/po/.arch-ids/remove-potcdate.sin.id
+++ fvwm-2.5.18/po/.arch-ids/remove-potcdate.sin.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.722
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.sv_SE.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.sv_SE.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.698
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.de.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.de.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.694
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.ar.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.ar.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.712
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.pot.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.pot.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.718
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.fr.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.fr.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.695
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.sv_SE.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.sv_SE.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.708
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.sv_SE.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.sv_SE.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.707
--- fvwm-2.5.18.orig/po/.arch-ids/=id
+++ fvwm-2.5.18/po/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.689
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.de.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.de.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.714
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.sv_SE.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.sv_SE.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.699
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9158.0
--- fvwm-2.5.18.orig/po/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/po/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.710
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.sv_SE.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.sv_SE.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.719
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.ar.gmo.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.ar.gmo.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.691
--- fvwm-2.5.18.orig/po/.arch-ids/fvwm.zh_CN.po.id
+++ fvwm-2.5.18/po/.arch-ids/fvwm.zh_CN.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9161.0
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmTaskBar.fr.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmTaskBar.fr.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.705
--- fvwm-2.5.18.orig/po/.arch-ids/FvwmScript.zh_CN.po.id
+++ fvwm-2.5.18/po/.arch-ids/FvwmScript.zh_CN.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9157.0
--- fvwm-2.5.18.orig/po/Makefile.in
+++ fvwm-2.5.18/po/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = po
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -42,7 +43,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -184,6 +185,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -371,7 +374,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/Makefile.in
+++ fvwm-2.5.18/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -46,7 +47,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -207,6 +208,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -277,7 +280,6 @@
 	$(FVWM_PERLLIB) \
 	docs \
 	rpm \
-	debian \
 	sample.fvwmrc \
 	$(POSUB) \
 	tests
@@ -355,7 +357,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -367,7 +375,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -375,7 +383,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -396,7 +410,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -471,7 +485,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/bin $(distdir)/debian $(distdir)/docs $(distdir)/fvwm $(distdir)/modules/FvwmAnimate $(distdir)/modules/FvwmAuto $(distdir)/modules/FvwmBacker $(distdir)/modules/FvwmBanner $(distdir)/modules/FvwmButtons $(distdir)/modules/FvwmCommand $(distdir)/modules/FvwmConsole $(distdir)/modules/FvwmCpp $(distdir)/modules/FvwmDebug $(distdir)/modules/FvwmDragWell $(distdir)/modules/FvwmEvent $(distdir)/modules/FvwmForm $(distdir)/modules/FvwmGtk $(distdir)/modules/FvwmIconBox $(distdir)/modules/FvwmIconMan $(distdir)/modules/FvwmIdent $(distdir)/modules/FvwmM4 $(distdir)/modules/FvwmPager $(distdir)/modules/FvwmPerl $(distdir)/modules/FvwmProxy $(distdir)/modules/FvwmRearrange $(distdir)/modules/FvwmSave $(distdir)/modules/FvwmSaveDesk $(distdir)/modules/FvwmScript $(distdir)/modules/FvwmScroll $(distdir)/modules/FvwmTabs $(distdir)/modules/FvwmTaskBar $(distdir)/modules/FvwmTheme $(distdir)/modules/FvwmWharf $(distdir)/modules/FvwmWinList $(distdir)/modules/FvwmWindowMenu $(distdir)/perllib/FVWM $(distdir)/rpm $(distdir)/vms
+	$(mkdir_p) $(distdir)/bin $(distdir)/docs $(distdir)/fvwm $(distdir)/modules/FvwmAnimate $(distdir)/modules/FvwmAuto $(distdir)/modules/FvwmBacker $(distdir)/modules/FvwmBanner $(distdir)/modules/FvwmButtons $(distdir)/modules/FvwmCommand $(distdir)/modules/FvwmConsole $(distdir)/modules/FvwmCpp $(distdir)/modules/FvwmDebug $(distdir)/modules/FvwmDragWell $(distdir)/modules/FvwmEvent $(distdir)/modules/FvwmForm $(distdir)/modules/FvwmGtk $(distdir)/modules/FvwmIconBox $(distdir)/modules/FvwmIconMan $(distdir)/modules/FvwmIdent $(distdir)/modules/FvwmM4 $(distdir)/modules/FvwmPager $(distdir)/modules/FvwmPerl $(distdir)/modules/FvwmProxy $(distdir)/modules/FvwmRearrange $(distdir)/modules/FvwmSave $(distdir)/modules/FvwmSaveDesk $(distdir)/modules/FvwmScript $(distdir)/modules/FvwmScroll $(distdir)/modules/FvwmTabs $(distdir)/modules/FvwmTaskBar $(distdir)/modules/FvwmTheme $(distdir)/modules/FvwmWharf $(distdir)/modules/FvwmWinList $(distdir)/modules/FvwmWindowMenu $(distdir)/perllib/FVWM $(distdir)/rpm $(distdir)/vms
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -498,15 +512,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -517,15 +533,15 @@
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 
 dist-shar: distdir
@@ -538,7 +554,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -547,11 +563,11 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
@@ -632,7 +648,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -748,16 +764,16 @@
 #    make deb-dist cparams='--enable-gnome --quiet' mparams='CFLAGS="-O2 -g"'
 #    make deb-inplace release=1.mg fullname=migo # works on sources directly
 
-deb-regenerate:
-	(cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1
+#deb-regenerate:
+#	(cd debian && $(MAKE) $(AM_MAKEFLAGS) Makefile control) || exit 1
 
-deb-dist: dist deb-this
+#deb-dist: dist deb-this
 
-deb-this: deb-regenerate
-	$(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1
+#deb-this: deb-regenerate
+#	$(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) this || exit 1
 
-deb-inplace: deb-regenerate
-	$(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1
+#deb-inplace: deb-regenerate
+#	$(MAKE) -f debian/Makefile $(AM_MAKEFLAGS) inplace || exit 1
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- fvwm-2.5.18.orig/vms/.arch-ids/vms_shareables.opt.id
+++ fvwm-2.5.18/vms/.arch-ids/vms_shareables.opt.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.769
--- fvwm-2.5.18.orig/vms/.arch-ids/README.id
+++ fvwm-2.5.18/vms/.arch-ids/README.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.763
--- fvwm-2.5.18.orig/vms/.arch-ids/make_fvwm.mms.id
+++ fvwm-2.5.18/vms/.arch-ids/make_fvwm.mms.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.766
--- fvwm-2.5.18.orig/vms/.arch-ids/vms.c.id
+++ fvwm-2.5.18/vms/.arch-ids/vms.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.767
--- fvwm-2.5.18.orig/vms/.arch-ids/config.h.id
+++ fvwm-2.5.18/vms/.arch-ids/config.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.764
--- fvwm-2.5.18.orig/vms/.arch-ids/fvwmrc.dat.id
+++ fvwm-2.5.18/vms/.arch-ids/fvwmrc.dat.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.765
--- fvwm-2.5.18.orig/vms/.arch-ids/=id
+++ fvwm-2.5.18/vms/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.762
--- fvwm-2.5.18.orig/vms/.arch-ids/vms.h.id
+++ fvwm-2.5.18/vms/.arch-ids/vms.h.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.768
--- fvwm-2.5.18.orig/bin/fvwm-menu-directory.in
+++ fvwm-2.5.18/bin/fvwm-menu-directory.in
@@ -279,7 +279,7 @@
 	my $itemStr = $dir && $itemF_eval? &evalItem($_name, $dir): $_name;
 	$itemStr = escapeItemName($itemStr);
 	my $act = !$dir || $checkSubdirs && !-x $dir? "Nop": !$reuse?
-		qq(Popup ") . escapeFvwmName($dir) . qq("$submenuPos):
+		qq(Popup ") . escapeFileName($dir) . qq("$submenuPos):
 		qq(PipeRead 'echo ") . escapeFileName($dir) . qq(" >$dirFile; )
 		. qq(echo Menu ") . escapeFvwmName($name) . qq(" WarpTitle');
 	return qq(+ "$iconDStr$itemStr" $act\n);
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-xlock.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-xlock.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.33
--- fvwm-2.5.18.orig/bin/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/bin/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.14
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-config.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-config.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.19
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-root.c.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-root.c.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.37
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.2.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.2.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.20
--- fvwm-2.5.18.orig/bin/.arch-ids/ChangeLog.id
+++ fvwm-2.5.18/bin/.arch-ids/ChangeLog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.13
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-headlines.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-headlines.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.30
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.4.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.4.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9124.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.4.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.4.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.23
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-desktop.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-desktop.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.26
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-root.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-root.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9127.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-bug.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-bug.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.16
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-bug.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-bug.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:53 2004 9121.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-perllib.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-perllib.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.35
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.6.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.6.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.25
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-config.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-config.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9122.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.6.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.6.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.24
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-perllib.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-perllib.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.34
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-xlock.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-xlock.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.32
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-root.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-root.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.36
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.2.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.2.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9123.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.2.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.2.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.21
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-config.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-config.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.18
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-directory.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-directory.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.28
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-desktop.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-desktop.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9126.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.4.1.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.4.1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.22
--- fvwm-2.5.18.orig/bin/.arch-ids/=id
+++ fvwm-2.5.18/bin/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.12
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-convert-2.6.1.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-convert-2.6.1.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Sep 30 17:07:54 2004 9125.0
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-headlines.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-headlines.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.31
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-desktop.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-desktop.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.27
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-bug.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-bug.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.17
--- fvwm-2.5.18.orig/bin/.arch-ids/fvwm-menu-directory.in.id
+++ fvwm-2.5.18/bin/.arch-ids/fvwm-menu-directory.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.29
--- fvwm-2.5.18.orig/bin/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/bin/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.15
--- fvwm-2.5.18.orig/bin/Makefile.in
+++ fvwm-2.5.18/bin/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = fvwm-root.c
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,6 +35,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = fvwm-root$(EXEEXT)
 subdir = bin
@@ -56,14 +55,15 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = fvwm-bug.1 fvwm-config.1 fvwm-convert-2.2.1 \
 	fvwm-convert-2.4.1 fvwm-convert-2.6.1 fvwm-menu-desktop.1 \
 	fvwm-root.1 fvwm-config fvwm-bug fvwm-perllib fvwm-menu-xlock \
 	fvwm-menu-directory fvwm-menu-desktop fvwm-menu-headlines \
 	fvwm-convert-2.4 fvwm-convert-2.6
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 fvwm_root_SOURCES = fvwm-root.c
@@ -75,7 +75,6 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fvwm-root.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -224,6 +223,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -427,16 +428,14 @@
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 install-man1: $(man1_MANS) $(man_MANS)
@@ -587,7 +586,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/Makefile.am.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.732
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/system.fvwm2rc.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/system.fvwm2rc.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.736
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-2.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-2.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.738
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/DecorWin95.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/DecorWin95.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.731
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-95.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-95.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.739
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/new-features.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/new-features.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.735
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/DecorMwm.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/DecorMwm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.730
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-1.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/system.fvwm2rc-sample-1.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.737
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/decor_examples.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/decor_examples.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.734
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/=id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.729
--- fvwm-2.5.18.orig/sample.fvwmrc/.arch-ids/Makefile.in.id
+++ fvwm-2.5.18/sample.fvwmrc/.arch-ids/Makefile.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 12:30:36 2003 10939.733
--- fvwm-2.5.18.orig/sample.fvwmrc/Makefile.in
+++ fvwm-2.5.18/sample.fvwmrc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = sample.fvwmrc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -42,11 +43,17 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(configdir)"
 configDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(config_DATA)
@@ -187,6 +194,8 @@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -291,7 +300,7 @@
 	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -299,7 +308,7 @@
 uninstall-configDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
@@ -363,7 +372,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
--- fvwm-2.5.18.orig/{arch}/.arch-project-tree
+++ fvwm-2.5.18/{arch}/.arch-project-tree
@@ -0,0 +1 @@
+Hackerlab arch project directory, format version 1.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,187 @@
+Revision: fvwm--debian--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:20 CDT 2006
+Standard-date: 2006-09-12 03:29:20 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Continuation-of: srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+Summary: tag of srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,16 @@
+Revision: fvwm--debian--2.5.18--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 01:08:49 CDT 2006
+Standard-date: 2006-09-12 06:08:49 GMT
+Modified-files: libs/FlocaleCharset.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-2
+Summary: Fix sigsegv at startup with bad locale
+Keywords: 
+
+* libs/FlocaleCharset.c (FlocaleInit_X_Charset): The fix for #360418
+  assumes that FLCXOMCharsetList will alway be valid at the end of
+  FlocaleInit_X_Charset(), but in my case the XOpenOM() call failed, so
+  FLCXOMCharsetList was still NULL when the new code tried to read
+  FLCXOMCharsetList[0].
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,13 @@
+Revision: fvwm--debian--2.5.18--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Nov 10 23:34:08 CST 2006
+Standard-date: 2006-11-11 05:34:08 GMT
+Modified-files: bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-3
+Summary: Improve escaping of directory names.
+Keywords: 
+
+* bin/fvwm-menu-directory.in: Escape the directory using escapeFileName,
+  and not escapeFvwmName, since the former also escapes embedded newlines.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,84 @@
+Revision: fvwm--debian--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 23:51:56 CDT 2006
+Standard-date: 2006-09-12 04:51:56 GMT
+Modified-files: ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 utils/ChangeLog
+    utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: Sync with upstream
+Keywords: 
+
+Sync with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+   New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-9
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-9
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Aug 11 14:01:17 CDT 2004
+Standard-date: 2004-08-11 19:01:17 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+Summary: Refreshed fvwm-root.c file from upstream CVS, since it fixes a problem with blanking the screen if the root image specified does not exist.
+Keywords: 
+
+Refreshed fvwm-root.c file from upstream CVS, since it fixes a problem with blanking the screen if the root image specified does not exist.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-10
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-10
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Aug 13 22:35:28 CDT 2004
+Standard-date: 2004-08-14 03:35:28 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+Summary: Refreshed libs/FImage.c from CVS to fix taskbar and buttons crash when handling remote displays
+Keywords: 
+
+Refreshed libs/FImage.c from CVS to fix taskbar and buttons crash when handling remote displays
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,11 @@
+Revision: fvwm--debian--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 12:34:02 CST 2003
+Standard-date: 2003-11-25 18:34:02 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-15
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-15
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 03:00:56 CDT 2004
+Standard-date: 2004-10-01 08:00:56 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-7
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 17:46:02 CDT 2004
+Standard-date: 2004-04-06 22:46:02 GMT
+Modified-files: fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+Summary: Hardcode /etc since the prefix is wrong for an installed version
+Keywords: 
+
+Hardcode /etc since the prefix is wrong for an installed version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-18
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-18
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 12:58:59 CST 2005
+Standard-date: 2005-03-17 18:58:59 GMT
+Modified-files: bin/fvwm-menu-desktop.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+Summary: Fix incorrect manual page
+Keywords: 
+
+* modules/FvwmProxy/FvwmProxy.1.in: .IP takes only a single content
+  argument, the second argument is meant to be an indent. Fixed.
+
+* modules/FvwmProxy/FvwmProxy.1: Ditto.
+
+* bin/fvwm-menu-desktop.1: Separate run on paragraph in the man page.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-16
@@ -0,0 +1,59 @@
+Revision: fvwm--debian--2.5--patch-16
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 10:59:57 CDT 2004
+Standard-date: 2004-10-06 15:59:57 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS fvwm/add_window.c fvwm/builtins.c
+    fvwm/commands.h fvwm/events.c fvwm/frame.c
+    fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c fvwm/screen.h
+    fvwm/update.c fvwm/virtual.c fvwm/window_flags.h
+    libs/envvar.c libs/envvar.h modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: New upstream version
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+   Imported fvwm-2.5.12
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-14
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-14
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:40:40 CDT 2004
+Standard-date: 2004-10-01 07:40:40 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-12
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-12
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Sep 22 19:39:31 CDT 2004
+Standard-date: 2004-09-23 00:39:31 GMT
+Modified-files: fvwm/events.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+Summary: eactivate excessive DEBUG logging of placement.
+Keywords: 
+
+eactivate excessive DEBUG logging of placement.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--debian--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:55:23 CDT 2005
+Standard-date: 2005-05-19 03:55:23 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+Summary: fvwm--debian is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--debian
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
@@ -0,0 +1,128 @@
+Revision: fvwm--debian--2.5--patch-4
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 14:01:22 CDT 2004
+Standard-date: 2004-04-06 19:01:22 GMT
+New-files: debian/.arch-ids/=id
+    debian/.arch-ids/conffiles.id
+    debian/.arch-ids/copyright.id debian/.arch-ids/prerm.id
+    debian/conffiles debian/copyright debian/prerm
+    perllib/FVWM/Module/.arch-ids/Terminal.pm.id
+    perllib/FVWM/Module/Terminal.pm
+New-directories: debian debian/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    acinclude.m4 aclocal.m4 bin/ChangeLog bin/Makefile.in
+    bin/fvwm-bug.in bin/fvwm-config.in bin/fvwm-convert-2.2
+    bin/fvwm-menu-desktop.in bin/fvwm-menu-directory.in
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    config.guess config.h.in config.sub configure configure.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in fvwm/Makefile.in fvwm/add_window.c
+    fvwm/add_window.h fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h
+    fvwm/ewmh_conf.c fvwm/ewmh_events.c fvwm/expand.c
+    fvwm/focus.c fvwm/functable.c fvwm/functions.c
+    fvwm/functions.h fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/icons.c fvwm/menus.c fvwm/menus.h fvwm/menustyle.c
+    fvwm/menustyle.h fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/placement.h
+    fvwm/schedule.c fvwm/screen.h fvwm/session.c fvwm/stack.c
+    fvwm/style.c fvwm/style.h fvwm/virtual.c libs/Bindings.c
+    libs/FImage.c libs/FScreen.c libs/FScreen.h
+    libs/Flocale.c libs/Flocale.h libs/Graphics.c
+    libs/Makefile.in libs/charmap.c libs/defaults.h
+    libs/gravity.c libs/gravity.h libs/wcontext.c
+    libs/wcontext.h modules/ChangeLog
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/findcmd.pl
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmCommand/scripts/ex-auto.pl
+    modules/FvwmCommand/scripts/ex-cascade.pl
+    modules/FvwmCommand/scripts/ex-grpmv.pl
+    modules/FvwmCommand/scripts/focus-Netscape.pl
+    modules/FvwmCommand/scripts/focus-link.pl
+    modules/FvwmCommand/scripts/push-away.pl
+    modules/FvwmCommand/scripts/test1.pl
+    modules/FvwmCommand/scripts/test2.sh
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-Quit
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Scripts/fvwm-script-setup95.pl
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScript/Widgets/Tools.c
+    modules/FvwmScript/Widgets/Tools.h
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/EventNames.pm
+    perllib/FVWM/Makefile.in perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Gtk.pm perllib/FVWM/Module/Gtk2.pm
+    perllib/FVWM/Module/Makefile.am
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/create-commands
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec.in sample.fvwmrc/Makefile.in
+    sample.fvwmrc/system.fvwm2rc-sample-95 tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/test_options utils/ChangeLog utils/Makefile.in
+    utils/build_dev.sh utils/configure_dev.sh
+    utils/fvwm_make_browse_menu.sh
+    utils/fvwm_make_directory_menu.sh
+    utils/quantize_pixmaps utils/rebuild_dev.sh
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: Synched with upstream version
+Keywords: 
+
+Synched with upstream version
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+   Imported fvwm-2.5.10.orig
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-6
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 17:13:03 CDT 2004
+Standard-date: 2004-04-06 22:13:03 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+Summary: Add support for per user update-menu entry.
+Keywords: 
+
+Add support for per user update-menu entry.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,11 @@
+Revision: fvwm--debian--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 13:46:34 CST 2003
+Standard-date: 2003-11-25 19:46:34 GMT
+Modified-files: modules/FvwmWindowMenu/FvwmWindowMenu.1
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+Summary: Added a NAME section to the FvwmWindowMenu.1 man page
+
+Added a Ma,e section to the man page to satisfy lintian
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,10 @@
+Revision: fvwm--debian--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 17:01:19 CST 2003
+Standard-date: 2003-11-25 23:01:19 GMT
+Removed-files: docs/.arch-ids/fvwm.lsm.id docs/fvwm.lsm
+    rpm/.arch-ids/fvwm.spec.id rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+Summary: Remoce autogenerated files that are removed on cleaning anyway
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-11
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-11
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Sep 22 19:05:46 CDT 2004
+Standard-date: 2004-09-23 00:05:46 GMT
+Modified-files: fvwm/placement.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+Summary: Added a fix to the placement problem thanks to Paul Vojta. This fix has also been accepted in upstream CVS.
+Keywords: 
+
+Added a fix to the placement problem thanks to Paul Vojta. This fix has also been accepted in upstream CVS.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-17
@@ -0,0 +1,10 @@
+Revision: fvwm--debian--2.5--patch-17
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Oct 26 11:44:27 CDT 2004
+Standard-date: 2004-10-26 16:44:27 GMT
+Modified-files: modules/FvwmScript/Scripts/FvwmScript-Setup95.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+Summary: Fix kde detection (at least for recent kde)
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-8
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Apr  7 10:35:52 CDT 2004
+Standard-date: 2004-04-07 15:35:52 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+Summary: revert menu location to debian defaults
+Keywords: 
+
+revert menu location to debian defaults
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-13
@@ -0,0 +1,198 @@
+Revision: fvwm--debian--2.5--patch-13
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:21:26 CDT 2004
+Standard-date: 2004-10-01 06:21:26 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS acconfig.h
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-root.1
+    bin/fvwm-root.c config.h.in configure.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    fvwm/add_window.c fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/colorset.h
+    fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menuitem.h fvwm/menus.c fvwm/menus.h
+    fvwm/modconf.c fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/read.c
+    fvwm/screen.h fvwm/session.c fvwm/stack.c fvwm/style.c
+    fvwm/style.h fvwm/virtual.c fvwm/window_flags.h
+    libs/Bindings.c libs/Bindings.h libs/CombineChars.c
+    libs/FEvent.c libs/FEvent.h libs/FImage.c libs/FScreen.c
+    libs/Fft.c libs/Ficonv.c libs/Flocale.c
+    libs/PictureUtils.c libs/System.c libs/defaults.h
+    libs/envvar.c libs/envvar.h libs/fvwmlib.h
+    libs/fvwmsignal.c libs/fvwmsignal.h libs/gravity.h
+    libs/vpacket.h libs/wcontext.h libs/wild.c libs/wild.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm po/ChangeLog
+    sample.fvwmrc/system.fvwm2rc-sample-1 tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: New upstream release. See NEWS file for details
+Keywords: 
+
+New upstream release. See NEWS file for details
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+   Imported fvwm-2.5.11
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,31 @@
+Revision: fvwm--debian--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 12:54:12 CST 2003
+Standard-date: 2003-11-25 18:54:12 GMT
+Removed-files: debian/.arch-ids/=id
+    debian/.arch-ids/ChangeLog.id
+    debian/.arch-ids/Makefile.am.id
+    debian/.arch-ids/Makefile.in.id
+    debian/.arch-ids/control.in.id debian/.arch-ids/dirs.id
+    debian/.arch-ids/docs.id
+    debian/.arch-ids/fvwm.menu-method.id
+    debian/.arch-ids/fvwm.menu.id
+    debian/.arch-ids/postinst.id debian/.arch-ids/postrm.id
+    debian/ChangeLog debian/Makefile.am debian/Makefile.in
+    debian/control.in debian/dirs debian/docs
+    debian/fvwm.menu debian/fvwm.menu-method debian/postinst
+    debian/postrm
+Removed-directories: debian debian/.arch-ids
+Modified-files: Makefile.am Makefile.in configure
+    configure.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+Summary: Remove ./debian directory included in upstream
+Keywords: 
+
+Upstream includes a ./debian directory, which causes an unfortunate
+conflict, since it was not initially fully policy compliant.  Also, I
+would prefer to use a debian directory that is in line with my
+packaging policy, and where the common parts are extracted out to a
+common sub category in arch.  Also included are changes that prevent
+the auto-tools from trying to regenerate the ./debian dir.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5--patch-5
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 16:38:44 CDT 2004
+Standard-date: 2004-04-06 21:38:44 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+Summary: Added support for Debian menus to the initial menu
+Keywords: 
+
+Added support for Debian menus to the initial menu
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,17 @@
+Revision: fvwm--debian--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:16:44 CDT 2005
+Standard-date: 2005-07-08 01:16:44 GMT
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:56 CDT 2005
+Standard-date: 2005-07-08 05:33:56 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+   * Fixed circulate crash.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:49 CDT 2005
+Standard-date: 2005-07-08 05:46:49 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+   * Fixed interective resize (reduction) via the bottom border
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:11 CDT 2005
+Standard-date: 2005-07-08 05:44:11 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+   * NEWS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,20 @@
+Revision: fvwm--debian--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:24 CDT 2005
+Standard-date: 2005-07-08 05:33:24 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+   2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:03 CDT 2005
+Standard-date: 2005-07-08 05:48:03 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+   * Dominik Vogt
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-59
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-59
@@ -0,0 +1,180 @@
+Revision: fvwm--debian--2.5--patch-59
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:47:29 CDT 2005
+Standard-date: 2005-08-09 00:47:29 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog NEWS configure.in docs/ANNOUNCE
+    docs/FAQ fvwm/add_window.c fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/focus.c
+    fvwm/fvwm.c fvwm/geometry.c fvwm/gnome.c fvwm/icons.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/module_interface.c fvwm/stack.c
+    fvwm/style.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/Colorset.c libs/Strings.c
+    libs/vpacket.h modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Synch with upstream branch
+Keywords: 
+
+Synch with upstream branch
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+   * FvwmPerl: support window context in "preprocess" action
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+   * Fixed hang when a gnome application requests a layer < 0.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+   * NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+   * Fixed aspect pixmap size calculations.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+   * Fixed bogus "ewmh_WMIconGeometry" warning message.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+   * Dominik: fixed select/focus button state lost when deiconifying a window
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+   * Minor cleanup.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+   * Fixed hang in button grabbing code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+   * Updated NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+   * Minor update.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+   * Added check for supported system architectures.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+   * Use the new logo in FvwmBanner.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+   * Fixed a memory leak in style merging, tweaked and simplified the code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+   * Two menu fixes by  ViktorGriph.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+   Added FvwmProxy option ProxyIconified
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+   Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,52 @@
+Revision: fvwm--debian--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:27:59 CDT 2005
+Standard-date: 2005-07-20 02:27:59 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog bin/fvwm-root.c
+    configure.in fvwm/add_window.c fvwm/colorset.c
+    fvwm/decorations.c fvwm/ewmh.c fvwm/ewmh_icons.c
+    fvwm/ewmh_names.c fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c
+    fvwm/icccm2.c fvwm/move_resize.c fvwm/session.c
+    libs/FTips.c libs/FTips.h libs/FlocaleCharset.c
+    libs/Target.c libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h po/FvwmTaskBar.ar.gmo
+    po/FvwmTaskBar.fr.gmo tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+   * Updated for 2.5.14.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+   * Fixed compile problem (don't use rintf() as it's C99).
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+   * 64-bit fixes by Dominik
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+   actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-58
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-58
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-58
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:48:04 CDT 2005
+Standard-date: 2005-07-20 02:48:04 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+   Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:26 CDT 2005
+Standard-date: 2005-07-08 01:17:26 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+   * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,27 @@
+Revision: fvwm--debian--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:47 CDT 2005
+Standard-date: 2005-07-08 05:35:47 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:22 CDT 2005
+Standard-date: 2005-07-08 05:25:22 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+   * Small session management fixes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:08 CDT 2005
+Standard-date: 2005-07-08 05:35:08 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+   * fvwm/fvwm.1.in (Focus): Typos in focus section.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,34 @@
+Revision: fvwm--debian--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:55:45 CDT 2005
+Standard-date: 2005-05-19 03:55:45 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,21 @@
+Revision: fvwm--debian--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:28 CDT 2005
+Standard-date: 2005-07-08 05:47:28 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+   apply 64-bit patch for perllib by Viktor Griph
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:07 CDT 2005
+Standard-date: 2005-07-08 05:24:07 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+   * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:46 CDT 2005
+Standard-date: 2005-07-08 05:31:46 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+   update news
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:57 CDT 2005
+Standard-date: 2005-07-08 01:20:57 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+   * Fixed ALT-Move to disable snapping.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:22:49 CDT 2005
+Standard-date: 2005-07-08 05:22:49 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+   * ButtonStyle Reset takes effect immediately.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:13 CDT 2005
+Standard-date: 2005-07-08 05:49:13 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+   * Dominik Vogt: fixed drawing of relief with very small rectangles
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:07:59 CDT 2005
+Standard-date: 2005-07-08 01:07:59 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+   * Fixed compiling FvwmCommand.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:16:43 CDT 2005
+Standard-date: 2005-07-08 05:16:43 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+   * Really commit EWMHUseStackingOrderHints documentation update
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:30:41 CDT 2005
+Standard-date: 2005-07-08 05:30:41 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+   * Fixed my previous commit
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:21:30 CDT 2005
+Standard-date: 2005-07-08 01:21:30 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+   * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:41 CDT 2005
+Standard-date: 2005-07-08 05:37:41 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+   * FAQ
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,20 @@
+Revision: fvwm--debian--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:17 CDT 2005
+Standard-date: 2005-07-08 01:20:17 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+   * Fixed crashes and bugs in handling of the root window / other unmanaged
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:46 CDT 2005
+Standard-date: 2005-07-08 01:18:46 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+   * Fixed aborting move/resize with the mouse.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,11 @@
+Revision: fvwm--debian--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:42:26 CDT 2005
+Standard-date: 2005-07-20 02:42:26 GMT
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:14 CDT 2005
+Standard-date: 2005-07-08 05:31:14 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+   * fvwm/bindings.c (ParseBinding)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:16:22 CDT 2005
+Standard-date: 2005-07-09 20:16:22 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+   fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:41 CDT 2005
+Standard-date: 2005-07-08 05:44:41 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+   * FvwmScript/FvwmScript.1.in (following)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,14 @@
+Revision: fvwm--debian--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 01:05:04 CDT 2005
+Standard-date: 2005-07-09 06:05:04 GMT
+Modified-files: libs/FBidi.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+Summary: The correct spelling is FRIBIDI_CHAR_SET_NOT_FOUND
+Keywords: 
+
+* libs/FBidi.c (FBidiIsApplicable): The correct spelling is
+  FRIBIDI_CHAR_SET_NOT_FOUND 
+  (FBidiConvert): Ditto.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:14 CDT 2005
+Standard-date: 2005-07-08 05:19:14 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+   /tmp/f
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:43 CDT 2005
+Standard-date: 2005-07-08 05:24:43 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+   * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:29:53 CDT 2005
+Standard-date: 2005-07-08 05:29:53 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+   * Fixed some FvwmIconMan flickering
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:02:45 CDT 2005
+Standard-date: 2005-07-08 01:02:45 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+   * Allow whitespace before commas in WindowList options.  May affect other
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:06 CDT 2005
+Standard-date: 2005-07-08 05:46:06 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:09 CDT 2005
+Standard-date: 2005-07-08 05:37:09 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+   * fvwm/fvwm.1.in (Example)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:30 CDT 2005
+Standard-date: 2005-07-08 05:34:30 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+   * FAQ (3.23): Typo.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:06:49 CDT 2005
+Standard-date: 2005-07-08 01:06:49 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+   * Fixed MoveToPage w/o argument.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,17 @@
+Revision: fvwm--debian--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 08:53:29 CDT 2005
+Standard-date: 2005-07-09 13:53:29 GMT
+Modified-files: fvwm/ConfigFvwmSetup
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+Summary: Add to default styles to make openoffice behave sensibly
+Keywords: 
+
+
+
+* fvwm/ConfigFvwmSetup:  Enable stacking order hints, so that
+  applications can make "full screen" windows appear without the Taskbar
+  getting in the way. Also, make openoffice behave sensibly in the
+  presence of MWMFunctions options.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,21 @@
+Revision: fvwm--debian--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:57:23 CDT 2005
+Standard-date: 2005-07-08 00:57:23 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+   * Fixed "random" wire frame position during move/resize.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:44 CDT 2005
+Standard-date: 2005-07-08 05:19:44 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+   * Try to clarify TipsJustification IconMan option
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,20 @@
+Revision: fvwm--debian--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:01:10 CDT 2005
+Standard-date: 2005-07-08 01:01:10 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+   * Fixed positioning of shaped windows on pages other than 0 0.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:41:17 CDT 2005
+Standard-date: 2005-07-08 05:41:17 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:13 CDT 2005
+Standard-date: 2005-07-08 05:20:13 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+   * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:38 CDT 2005
+Standard-date: 2005-07-08 05:48:38 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-60
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-60
@@ -0,0 +1,175 @@
+Revision: fvwm--debian--2.5--patch-60
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:51:50 CDT 2005
+Standard-date: 2005-08-25 20:51:50 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in depcomp docs/ANNOUNCE
+    docs/ChangeLog docs/Makefile.in fvwm/Makefile.in
+    fvwm/conditional.c fvwm/ewmh_events.c fvwm/fvwm.1.in
+    fvwm/session.c fvwm/virtual.c install-sh libs/Makefile.in
+    missing modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+   Imported fvwm-2.5.14
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:06 CDT 2005
+Standard-date: 2005-07-08 01:18:06 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+   * Do not lock a submenu menu item if it's clicked on but the submenu does not
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,29 @@
+Revision: fvwm--debian--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:22:47 CDT 2005
+Standard-date: 2005-07-08 01:22:47 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+   * Added a set of functions for implementing tool tips
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,169 @@
+Revision: fvwm--debian--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:53:09 CDT 2005
+Standard-date: 2005-07-18 17:53:09 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in depcomp docs/ANNOUNCE
+    docs/ChangeLog docs/DEVELOPERS docs/Makefile.in
+    fvwm/Makefile.in install-sh libs/Makefile.in missing
+    mkinstalldirs modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Synchronize with release 2.5.13
+Keywords: 
+
+Synchronize with release 2.5.13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+   Imported fvwm-2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,90 @@
+Revision: fvwm--debian--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:05:44 CDT 2005
+Standard-date: 2005-07-08 07:05:44 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+   Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:25 CDT 2005
+Standard-date: 2005-07-08 05:45:25 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,23 @@
+Revision: fvwm--debian--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:36 CDT 2005
+Standard-date: 2005-07-08 05:23:36 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+   * FAQ (1.7)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:09:01 CDT 2005
+Standard-date: 2005-07-08 01:09:01 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+   * Fixed CopyToken delimiter parsing.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:25 CDT 2005
+Standard-date: 2005-07-08 01:19:25 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+   * Fixed endless loop in DeIconify().
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,19 @@
+Revision: fvwm--debian--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:42:53 CDT 2005
+Standard-date: 2005-07-08 05:42:53 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+   * FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,22 @@
+Revision: fvwm--debian--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:32 CDT 2005
+Standard-date: 2005-07-08 05:43:32 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+   * A little clean-up.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--debian--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:47:51 CDT 2005
+Standard-date: 2005-07-08 00:47:51 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+Summary: Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Keywords: 
+
+Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+   fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,18 @@
+Revision: fvwm--debian--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:32:48 CDT 2005
+Standard-date: 2005-07-08 05:32:48 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,22 @@
+Revision: fvwm--debian--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:13 CDT 2005
+Standard-date: 2005-07-08 01:05:13 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+   * Updated FAQ.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,174 @@
+Revision: fvwm--debian--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:58:57 CST 2006
+Standard-date: 2006-01-22 05:58:57 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Continuation-of: srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+Summary: tag of srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,10 @@
+Revision: fvwm--debian--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 01:27:22 CST 2006
+Standard-date: 2006-01-22 07:27:22 GMT
+Modified-files: acinclude.m4 configure
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+Summary: Fix the imlib detection again
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,27 @@
+Revision: fvwm--debian--2.5.16--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:14:10 CST 2006
+Standard-date: 2006-02-08 00:14:10 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+   Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,165 @@
+Revision: fvwm--debian--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:29:01 CST 2006
+Standard-date: 2006-01-22 06:29:01 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/Makefile.in
+    fvwm/Makefile.am fvwm/Makefile.in fvwm/add_window.c
+    fvwm/bindings.c fvwm/borders.c fvwm/conditional.c
+    fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+   Imported fvwm-2.5.16
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,181 @@
+Revision: fvwm--debian--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:29 CDT 2006
+Standard-date: 2006-08-06 20:33:29 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Continuation-of: srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+Summary: tag of srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,12 @@
+Revision: fvwm--debian--2.5.17--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Aug  8 20:09:21 CDT 2006
+Standard-date: 2006-08-09 01:09:21 GMT
+Modified-files: libs/FlocaleCharset.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-2
+Summary: Support local character sets
+Keywords: 
+
+* libs/FlocaleCharset.c (FlocaleInit_X_Charset): Support local character sets
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,11 @@
+Revision: fvwm--debian--2.5.17--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Aug  8 20:10:10 CDT 2006
+Standard-date: 2006-08-09 01:10:10 GMT
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+Summary: Support local character sets
+Keywords: 
+
+* libs/FlocaleCharset.c (FlocaleInit_X_Charset): Support local character sets
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--debian/fvwm--debian--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,145 @@
+Revision: fvwm--debian--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:14:09 CDT 2006
+Standard-date: 2006-08-06 21:14:09 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS README
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1 bin/fvwm-bug.in
+    bin/fvwm-config.1 bin/fvwm-config.1.in
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.1.in
+    config.h.in configure configure.ac docs/ANNOUNCE
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ fvwm/ConfigFvwmSetup
+    fvwm/add_window.c fvwm/builtins.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh_events.c
+    fvwm/expand.c fvwm/focus.c fvwm/focus.h fvwm/frame.c
+    fvwm/functable.c fvwm/functions.c fvwm/fvwm.1.in
+    fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c fvwm/menuitem.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+   Imported fvwm-2.5.17
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,12 @@
+Revision: fvwm--mips-fix--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:21:55 CDT 2004
+Standard-date: 2004-04-19 08:21:55 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--mips-fix--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:56:32 CDT 2005
+Standard-date: 2005-05-19 03:56:32 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+Summary: fvwm--mips-fix is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--mips-fix
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
@@ -0,0 +1,12 @@
+Revision: fvwm--mips-fix--2.5--patch-4
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 03:02:38 CDT 2004
+Standard-date: 2004-10-01 08:02:38 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,198 @@
+Revision: fvwm--mips-fix--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:22:48 CDT 2004
+Standard-date: 2004-10-01 06:22:48 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS acconfig.h
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-root.1
+    bin/fvwm-root.c config.h.in configure.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/fvwm.lsm fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/builtins.c fvwm/colorset.c
+    fvwm/colorset.h fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menus.c fvwm/menus.h fvwm/modconf.c
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/read.c fvwm/screen.h fvwm/session.c
+    fvwm/stack.c fvwm/style.c fvwm/style.h fvwm/virtual.c
+    fvwm/window_flags.h libs/Bindings.c libs/Bindings.h
+    libs/CombineChars.c libs/FEvent.c libs/FEvent.h
+    libs/FImage.c libs/FScreen.c libs/Fft.c libs/Ficonv.c
+    libs/Flocale.c libs/PictureUtils.c libs/System.c
+    libs/defaults.h libs/envvar.c libs/envvar.h
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    libs/gravity.h libs/vpacket.h libs/wcontext.h libs/wild.c
+    libs/wild.h modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm po/ChangeLog
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc-sample-1
+    tests/ChangeLog tests/hints/hints_test.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: New upstream release. See NEWS file for details
+Keywords: 
+
+New upstream release. See NEWS file for details
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+   Imported fvwm-2.5.11
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,12 @@
+Revision: fvwm--mips-fix--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:48:56 CDT 2004
+Standard-date: 2004-10-01 07:48:56 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,12 @@
+Revision: fvwm--mips-fix--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:41:45 CDT 2004
+Standard-date: 2004-04-19 08:41:45 GMT
+Modified-files: fvwm/menuitem.h fvwm/menus.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+Summary: Do not use a variable called mips, it causes problems on mips boxes
+Keywords: 
+
+Do not use a variable called mips, it causes problems on mips boxes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
@@ -0,0 +1,59 @@
+Revision: fvwm--mips-fix--2.5--patch-5
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 11:02:26 CDT 2004
+Standard-date: 2004-10-06 16:02:26 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/fvwm.lsm fvwm/add_window.c
+    fvwm/builtins.c fvwm/commands.h fvwm/events.c
+    fvwm/frame.c fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/screen.h fvwm/update.c fvwm/virtual.c
+    fvwm/window_flags.h libs/envvar.c libs/envvar.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: New upstream version
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+   Imported fvwm-2.5.12
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,17 @@
+Revision: fvwm--mips-fix--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:16:40 CDT 2005
+Standard-date: 2005-07-08 01:16:40 GMT
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:56 CDT 2005
+Standard-date: 2005-07-08 05:33:56 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+   * Fixed circulate crash.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:48 CDT 2005
+Standard-date: 2005-07-08 05:46:48 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+   * Fixed interective resize (reduction) via the bottom border
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:08 CDT 2005
+Standard-date: 2005-07-08 05:44:08 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+   * NEWS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,20 @@
+Revision: fvwm--mips-fix--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:24 CDT 2005
+Standard-date: 2005-07-08 05:33:24 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+   2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:03 CDT 2005
+Standard-date: 2005-07-08 05:48:03 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+   * Dominik Vogt
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:48:40 CDT 2005
+Standard-date: 2005-07-20 02:48:40 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+   Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-58
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-58
@@ -0,0 +1,175 @@
+Revision: fvwm--mips-fix--2.5--patch-58
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:53:33 CDT 2005
+Standard-date: 2005-08-25 20:53:33 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/conditional.c
+    fvwm/ewmh_events.c fvwm/fvwm.1.in fvwm/session.c
+    fvwm/virtual.c install-sh libs/Makefile.in missing
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+   Imported fvwm-2.5.14
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:24 CDT 2005
+Standard-date: 2005-07-08 01:17:24 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+   * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,27 @@
+Revision: fvwm--mips-fix--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:46 CDT 2005
+Standard-date: 2005-07-08 05:35:46 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:19 CDT 2005
+Standard-date: 2005-07-08 05:25:19 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+   * Small session management fixes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:09 CDT 2005
+Standard-date: 2005-07-08 05:35:09 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+   * fvwm/fvwm.1.in (Focus): Typos in focus section.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,21 @@
+Revision: fvwm--mips-fix--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:56:54 CDT 2005
+Standard-date: 2005-05-19 03:56:54 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,21 @@
+Revision: fvwm--mips-fix--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:27 CDT 2005
+Standard-date: 2005-07-08 05:47:27 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+   apply 64-bit patch for perllib by Viktor Griph
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:05 CDT 2005
+Standard-date: 2005-07-08 05:24:05 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+   * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:45 CDT 2005
+Standard-date: 2005-07-08 05:31:45 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+   update news
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:57 CDT 2005
+Standard-date: 2005-07-08 01:20:57 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+   * Fixed ALT-Move to disable snapping.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:22:46 CDT 2005
+Standard-date: 2005-07-08 05:22:46 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+   * ButtonStyle Reset takes effect immediately.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:11 CDT 2005
+Standard-date: 2005-07-08 05:49:11 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+   * Dominik Vogt: fixed drawing of relief with very small rectangles
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:07:58 CDT 2005
+Standard-date: 2005-07-08 01:07:58 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+   * Fixed compiling FvwmCommand.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:16:41 CDT 2005
+Standard-date: 2005-07-08 05:16:41 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+   * Really commit EWMHUseStackingOrderHints documentation update
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:30:39 CDT 2005
+Standard-date: 2005-07-08 05:30:39 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+   * Fixed my previous commit
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:21:30 CDT 2005
+Standard-date: 2005-07-08 01:21:30 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+   * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:36 CDT 2005
+Standard-date: 2005-07-08 05:37:36 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+   * FAQ
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,20 @@
+Revision: fvwm--mips-fix--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:17 CDT 2005
+Standard-date: 2005-07-08 01:20:17 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+   * Fixed crashes and bugs in handling of the root window / other unmanaged
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:43 CDT 2005
+Standard-date: 2005-07-08 01:18:43 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+   * Fixed aborting move/resize with the mouse.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,180 @@
+Revision: fvwm--mips-fix--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:48:50 CDT 2005
+Standard-date: 2005-08-09 00:48:50 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog NEWS configure.in docs/ANNOUNCE
+    docs/FAQ fvwm/add_window.c fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/focus.c
+    fvwm/fvwm.c fvwm/geometry.c fvwm/gnome.c fvwm/icons.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/module_interface.c fvwm/stack.c
+    fvwm/style.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/Colorset.c libs/Strings.c
+    libs/vpacket.h modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Synch with upstream branch
+Keywords: 
+
+Synch with upstream branch
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+   * FvwmPerl: support window context in "preprocess" action
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+   * Fixed hang when a gnome application requests a layer < 0.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+   * NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+   * Fixed aspect pixmap size calculations.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+   * Fixed bogus "ewmh_WMIconGeometry" warning message.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+   * Dominik: fixed select/focus button state lost when deiconifying a window
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+   * Minor cleanup.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+   * Fixed hang in button grabbing code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+   * Updated NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+   * Minor update.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+   * Added check for supported system architectures.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+   * Use the new logo in FvwmBanner.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+   * Fixed a memory leak in style merging, tweaked and simplified the code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+   * Two menu fixes by  ViktorGriph.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+   Added FvwmProxy option ProxyIconified
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+   Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:12 CDT 2005
+Standard-date: 2005-07-08 05:31:12 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+   * fvwm/bindings.c (ParseBinding)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,52 @@
+Revision: fvwm--mips-fix--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:28:36 CDT 2005
+Standard-date: 2005-07-20 02:28:36 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog bin/fvwm-root.c
+    configure.in fvwm/add_window.c fvwm/colorset.c
+    fvwm/decorations.c fvwm/ewmh.c fvwm/ewmh_icons.c
+    fvwm/ewmh_names.c fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c
+    fvwm/icccm2.c fvwm/move_resize.c fvwm/session.c
+    libs/FTips.c libs/FTips.h libs/FlocaleCharset.c
+    libs/Target.c libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h po/FvwmTaskBar.ar.gmo
+    po/FvwmTaskBar.fr.gmo tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+   * Updated for 2.5.14.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+   * Fixed compile problem (don't use rintf() as it's C99).
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+   * 64-bit fixes by Dominik
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+   actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:41 CDT 2005
+Standard-date: 2005-07-08 05:44:41 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+   * FvwmScript/FvwmScript.1.in (following)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:16:31 CDT 2005
+Standard-date: 2005-07-09 20:16:31 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+   fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:14 CDT 2005
+Standard-date: 2005-07-08 05:19:14 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+   /tmp/f
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:42 CDT 2005
+Standard-date: 2005-07-08 05:24:42 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+   * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:29:52 CDT 2005
+Standard-date: 2005-07-08 05:29:52 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+   * Fixed some FvwmIconMan flickering
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:02:42 CDT 2005
+Standard-date: 2005-07-08 01:02:42 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+   * Allow whitespace before commas in WindowList options.  May affect other
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:05 CDT 2005
+Standard-date: 2005-07-08 05:46:05 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:13 CDT 2005
+Standard-date: 2005-07-08 05:37:13 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+   * fvwm/fvwm.1.in (Example)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:30 CDT 2005
+Standard-date: 2005-07-08 05:34:30 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+   * FAQ (3.23): Typo.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:06:48 CDT 2005
+Standard-date: 2005-07-08 01:06:48 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+   * Fixed MoveToPage w/o argument.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,169 @@
+Revision: fvwm--mips-fix--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:08:26 CDT 2005
+Standard-date: 2005-07-18 17:08:26 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.in
+    install-sh libs/Makefile.in missing mkinstalldirs
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Synchronize with release 2.5.13
+Keywords: 
+
+Synchronize with release 2.5.13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+   Imported fvwm-2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,21 @@
+Revision: fvwm--mips-fix--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:54:07 CDT 2005
+Standard-date: 2005-07-08 00:54:07 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+   * Fixed "random" wire frame position during move/resize.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:41 CDT 2005
+Standard-date: 2005-07-08 05:19:41 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+   * Try to clarify TipsJustification IconMan option
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,20 @@
+Revision: fvwm--mips-fix--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:01:08 CDT 2005
+Standard-date: 2005-07-08 01:01:08 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+   * Fixed positioning of shaped windows on pages other than 0 0.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:38:17 CDT 2005
+Standard-date: 2005-07-08 05:38:17 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:12 CDT 2005
+Standard-date: 2005-07-08 05:20:12 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+   * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:36 CDT 2005
+Standard-date: 2005-07-08 05:48:36 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:05 CDT 2005
+Standard-date: 2005-07-08 01:18:05 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+   * Do not lock a submenu menu item if it's clicked on but the submenu does not
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,29 @@
+Revision: fvwm--mips-fix--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:22:43 CDT 2005
+Standard-date: 2005-07-08 01:22:43 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+   * Added a set of functions for implementing tool tips
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,11 @@
+Revision: fvwm--mips-fix--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:43:33 CDT 2005
+Standard-date: 2005-07-20 02:43:33 GMT
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,90 @@
+Revision: fvwm--mips-fix--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:06:00 CDT 2005
+Standard-date: 2005-07-08 07:06:00 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+   Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:26 CDT 2005
+Standard-date: 2005-07-08 05:45:26 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,23 @@
+Revision: fvwm--mips-fix--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:36 CDT 2005
+Standard-date: 2005-07-08 05:23:36 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+   * FAQ (1.7)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:09:00 CDT 2005
+Standard-date: 2005-07-08 01:09:00 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+   * Fixed CopyToken delimiter parsing.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:25 CDT 2005
+Standard-date: 2005-07-08 01:19:25 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+   * Fixed endless loop in DeIconify().
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,19 @@
+Revision: fvwm--mips-fix--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:42:50 CDT 2005
+Standard-date: 2005-07-08 05:42:50 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+   * FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,22 @@
+Revision: fvwm--mips-fix--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:30 CDT 2005
+Standard-date: 2005-07-08 05:43:30 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+   * A little clean-up.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--mips-fix--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:47:49 CDT 2005
+Standard-date: 2005-07-08 00:47:49 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+Summary: Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Keywords: 
+
+Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+   fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,18 @@
+Revision: fvwm--mips-fix--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:32:44 CDT 2005
+Standard-date: 2005-07-08 05:32:44 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,22 @@
+Revision: fvwm--mips-fix--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:11 CDT 2005
+Standard-date: 2005-07-08 01:05:11 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+   * Updated FAQ.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,159 @@
+Revision: fvwm--mips-fix--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:59:06 CST 2006
+Standard-date: 2006-01-22 05:59:06 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Continuation-of: srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+Summary: tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,27 @@
+Revision: fvwm--mips-fix--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:14:53 CST 2006
+Standard-date: 2006-02-08 00:14:53 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+   Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,166 @@
+Revision: fvwm--mips-fix--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:30:20 CST 2006
+Standard-date: 2006-01-22 06:30:20 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure debian/ChangeLog debian/Makefile.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.am
+    fvwm/Makefile.in fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+   Imported fvwm-2.5.16
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,169 @@
+Revision: fvwm--mips-fix--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:30 CDT 2006
+Standard-date: 2006-09-12 03:29:30 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Continuation-of: srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+Summary: tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,84 @@
+Revision: fvwm--mips-fix--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 00:10:22 CDT 2006
+Standard-date: 2006-09-12 05:10:22 GMT
+Modified-files: ChangeLog NEWS acinclude.m4 bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog docs/fvwm.lsm
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 rpm/fvwm.spec
+    utils/ChangeLog utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+   New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,165 @@
+Revision: fvwm--mips-fix--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:39 CDT 2006
+Standard-date: 2006-08-06 20:33:39 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Continuation-of: srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+Summary: tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--mips-fix/fvwm--mips-fix--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,146 @@
+Revision: fvwm--mips-fix--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:16:21 CDT 2006
+Standard-date: 2006-08-06 21:16:21 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS README
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1 bin/fvwm-bug.in
+    bin/fvwm-config.1 bin/fvwm-config.1.in
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.1.in
+    config.h.in configure configure.ac docs/ANNOUNCE
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/fvwm.lsm
+    fvwm/ConfigFvwmSetup fvwm/add_window.c fvwm/builtins.c
+    fvwm/commands.h fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/focus.c
+    fvwm/focus.h fvwm/frame.c fvwm/functable.c
+    fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/gnome.c fvwm/menuitem.c fvwm/menus.c
+    fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+   Imported fvwm-2.5.17
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,93 @@
+Revision: fvwm--upstream--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:59:13 CST 2006
+Standard-date: 2006-01-22 05:59:13 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+Continuation-of: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,21 @@
+Revision: fvwm--upstream--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:11:33 CST 2006
+Standard-date: 2006-02-08 00:11:33 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary:  Fixed detection of running non-ICCCM2 wm
+Keywords: 
+
+ Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,158 @@
+Revision: fvwm--upstream--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:00:21 CST 2006
+Standard-date: 2006-01-22 06:00:21 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure debian/ChangeLog debian/Makefile.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.am
+    fvwm/Makefile.in fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Imported fvwm-2.5.16
+Keywords: 
+
+Imported fvwm-2.5.16
+into srivasta@debian.org--etch/fvwm--upstream--2.5.16
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,444 @@
+Revision: fvwm--upstream--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 12:31:37 CST 2003
+Standard-date: 2003-11-25 18:31:37 GMT
+Summary: Initial import of upstrewam tree
+New-files: AUTHORS COPYING ChangeLog INSTALL INSTALL.fvwm
+    Makefile.am Makefile.in NEWS README acconfig.h acinclude.m4
+    aclocal.m4 bin/ChangeLog bin/Makefile.am bin/Makefile.in
+    bin/fvwm-bug.1 bin/fvwm-bug.in bin/fvwm-config.1
+    bin/fvwm-config.in bin/fvwm-convert-2.2
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.4.in bin/fvwm-convert-2.6.1
+    bin/fvwm-convert-2.6.in bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-desktop.in bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-menu-headlines.1
+    bin/fvwm-menu-headlines.in bin/fvwm-menu-xlock.1
+    bin/fvwm-menu-xlock.in bin/fvwm-perllib.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.guess config.h.in config.sub configure configure.in
+    debian/ChangeLog debian/Makefile.am debian/Makefile.in
+    debian/control.in debian/dirs debian/docs
+    debian/fvwm.menu debian/fvwm.menu-method debian/postinst
+    debian/postrm depcomp docs/ANNOUNCE docs/BUGS
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/Makefile.am
+    docs/Makefile.in docs/TODO docs/error_codes docs/fvwm.lsm
+    docs/fvwm.lsm.in fvwm/ConfigFvwmDefaults
+    fvwm/ConfigFvwmSetup fvwm/Makefile.am fvwm/Makefile.in
+    fvwm/add_window.c fvwm/add_window.h fvwm/bindings.c
+    fvwm/bindings.h fvwm/borders.c fvwm/borders.h
+    fvwm/builtins.c fvwm/builtins.h fvwm/colormaps.c
+    fvwm/colormaps.h fvwm/colors.c fvwm/colors.h
+    fvwm/colorset.c fvwm/colorset.h fvwm/commands.h
+    fvwm/conditional.c fvwm/conditional.h fvwm/condrc.c
+    fvwm/condrc.h fvwm/cursor.c fvwm/cursor.h
+    fvwm/decorations.c fvwm/decorations.h
+    fvwm/eventhandler.h fvwm/eventmask.h fvwm/events.c
+    fvwm/events.h fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_icons.c fvwm/ewmh_intern.h
+    fvwm/ewmh_names.c fvwm/execcontext.c fvwm/execcontext.h
+    fvwm/expand.c fvwm/expand.h fvwm/externs.h fvwm/focus.c
+    fvwm/focus.h fvwm/focus_policy.c fvwm/focus_policy.h
+    fvwm/frame.c fvwm/frame.h fvwm/functable.c
+    fvwm/functable.h fvwm/functions.c fvwm/functions.h
+    fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h fvwm/geometry.c
+    fvwm/geometry.h fvwm/gnome.c fvwm/gnome.h fvwm/icccm2.c
+    fvwm/icccm2.h fvwm/icons.c fvwm/icons.h fvwm/menucmd.c
+    fvwm/menudim.c fvwm/menudim.h fvwm/menuitem.c
+    fvwm/menuitem.h fvwm/menus.c fvwm/menus.h
+    fvwm/menustyle.c fvwm/menustyle.h fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/modconf.h fvwm/module_interface.c
+    fvwm/module_interface.h fvwm/move_resize.c
+    fvwm/move_resize.h fvwm/placement.c fvwm/placement.h
+    fvwm/read.c fvwm/read.h fvwm/repeat.c fvwm/repeat.h
+    fvwm/schedule.c fvwm/schedule.h fvwm/screen.h
+    fvwm/session.c fvwm/session.h fvwm/stack.c fvwm/stack.h
+    fvwm/style.c fvwm/style.h fvwm/update.c fvwm/update.h
+    fvwm/virtual.c fvwm/virtual.h fvwm/window_flags.h
+    fvwm/windowlist.c fvwm/windowlist.h fvwm/windowshade.c
+    install-sh libs/BidiJoin.c libs/BidiJoin.h
+    libs/Bindings.c libs/Bindings.h libs/ClientMsg.c
+    libs/ClientMsg.h libs/ColorUtils.c libs/Colorset.c
+    libs/Colorset.h libs/CombineChars.c libs/CombineChars.h
+    libs/Cursor.c libs/Event.c libs/FBidi.c libs/FBidi.h
+    libs/FEvent.c libs/FEvent.h libs/FGettext.c
+    libs/FGettext.h libs/FImage.c libs/FImage.h
+    libs/FRender.c libs/FRender.h libs/FRenderInit.c
+    libs/FRenderInit.h libs/FRenderInterface.h libs/FSMlib.h
+    libs/FScreen.c libs/FScreen.h libs/FShape.c libs/FShape.h
+    libs/FShm.h libs/Fft.c libs/Fft.h libs/FftInterface.h
+    libs/Ficonv.c libs/Ficonv.h libs/Flocale.c libs/Flocale.h
+    libs/FlocaleCharset.c libs/FlocaleCharset.h libs/Fpng.h
+    libs/Fxpm.h libs/Grab.c libs/Grab.h libs/Graphics.c
+    libs/Makefile.am libs/Makefile.in libs/Module.c
+    libs/Module.h libs/Parse.c libs/Parse.h libs/Picture.c
+    libs/Picture.h libs/PictureBase.c libs/PictureBase.h
+    libs/PictureDitherMatrice.h libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureImageLoader.c
+    libs/PictureImageLoader.h libs/PictureUtils.c
+    libs/PictureUtils.h libs/Rectangles.c libs/Rectangles.h
+    libs/Strings.c libs/Strings.h libs/System.c libs/Target.c
+    libs/WinMagic.c libs/XError.c libs/XResource.c
+    libs/alloca.c libs/atexit.c libs/charmap.c libs/charmap.h
+    libs/debug.c libs/defaults.h libs/envvar.c libs/envvar.h
+    libs/flist.c libs/flist.h libs/fsm.c libs/fsm.h
+    libs/ftime.h libs/fvwmlib.h libs/fvwmrect.c
+    libs/fvwmrect.h libs/fvwmsignal.c libs/fvwmsignal.h
+    libs/gethostname.c libs/gravity.c libs/gravity.h
+    libs/lang-strings.h libs/modifiers.c libs/modifiers.h
+    libs/queue.c libs/queue.h libs/safemalloc.c
+    libs/safemalloc.h libs/setpgrp.c libs/setpgrp.h
+    libs/strcasecmp.c libs/strdup.c libs/strerror.c
+    libs/strncasecmp.c libs/timeout.c libs/timeout.h
+    libs/usleep.c libs/vpacket.h libs/wcontext.c
+    libs/wcontext.h libs/wild.c libs/wild.h missing
+    mkinstalldirs modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/FvwmAnimate.h
+    modules/FvwmAnimate/Makefile.am
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.am
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/ConfigFvwmBacker
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBacker/Makefile.am
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBacker/root_bits.c
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmBanner/Makefile.am
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmButtons/BUGS modules/FvwmButtons/CHANGES
+    modules/FvwmButtons/ConfigFvwmButtons
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/Makefile.am
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/TODO modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/dynamic.h
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c modules/FvwmButtons/parse.h
+    modules/FvwmButtons/samplebuttonrc
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/README
+    modules/FvwmCommand/findcmd.pl
+    modules/FvwmCommand/scripts/Makefile.am
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmCommand/scripts/ex-auto.pl
+    modules/FvwmCommand/scripts/ex-cascade.pl
+    modules/FvwmCommand/scripts/ex-grpmv.pl
+    modules/FvwmCommand/scripts/focus-Netscape.pl
+    modules/FvwmCommand/scripts/focus-link.1
+    modules/FvwmCommand/scripts/focus-link.pl
+    modules/FvwmCommand/scripts/push-away.pl
+    modules/FvwmCommand/scripts/test1.pl
+    modules/FvwmCommand/scripts/test2.sh
+    modules/FvwmConsole/.fvwm2rc.sample
+    modules/FvwmConsole/Changes
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.in
+    modules/FvwmConsole/Makefile.am
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmCpp/FvwmCpp.c modules/FvwmCpp/FvwmCpp.h
+    modules/FvwmCpp/Makefile.am modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmDebug.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/FvwmOldDebug.h
+    modules/FvwmDebug/Makefile.am
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.am
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/commonStuff.h
+    modules/FvwmDragWell/cursorStuff.c
+    modules/FvwmDragWell/cursorStuff.h
+    modules/FvwmDragWell/dragSource.h
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/fvwmDragWell.h
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.c
+    modules/FvwmEvent/Makefile.am
+    modules/FvwmEvent/Makefile.in modules/FvwmForm/Changes
+    modules/FvwmForm/FvwmForm-Capture
+    modules/FvwmForm/FvwmForm-Form
+    modules/FvwmForm/FvwmForm-QuitVerify
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm-RootCursor
+    modules/FvwmForm/FvwmForm-Setup.in
+    modules/FvwmForm/FvwmForm-Talk
+    modules/FvwmForm/FvwmForm-TalkHelp
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/Makefile.am
+    modules/FvwmForm/Makefile.in
+    modules/FvwmForm/ParseCommand.c
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1 modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmGtk/Makefile.am modules/FvwmGtk/Makefile.in
+    modules/FvwmGtk/TODO modules/FvwmGtk/dialog.c
+    modules/FvwmGtk/dialog.h modules/FvwmGtk/expand.c
+    modules/FvwmGtk/expand.h
+    modules/FvwmGtk/gtkpixmapmenuitem.c
+    modules/FvwmGtk/gtkpixmapmenuitem.h
+    modules/FvwmGtk/menu.c modules/FvwmGtk/menu.h
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmGtk/windowlist.h
+    modules/FvwmIconBox/CHANGES
+    modules/FvwmIconBox/COPYRIGHT
+    modules/FvwmIconBox/ConfigFvwmIconBox
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconBox/Makefile.am
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/TO-DO modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/ConfigFvwmIconMan
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.am
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/winlist.c modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/x.h modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+    modules/FvwmIdent/ConfigFvwmIdent
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/FvwmIdent.h
+    modules/FvwmIdent/Makefile.am
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/FvwmM4.h
+    modules/FvwmM4/Makefile.am modules/FvwmM4/Makefile.in
+    modules/FvwmPager/ConfigFvwmPager
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/Makefile.am
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.am
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/ConfigFvwmProxyDefaults
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmProxy/Makefile.am
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.am
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/FvwmSave.h
+    modules/FvwmSave/Makefile.am
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.h
+    modules/FvwmSaveDesk/Makefile.am
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmSaveDesk/example/fvwm2rc
+    modules/FvwmSaveDesk/example/xinitrc
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Makefile.am
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-BaseConfig
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScript/Scripts/FvwmScript-Buttons
+    modules/FvwmScript/Scripts/FvwmScript-Colorset
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Scripts/FvwmScript-Date
+    modules/FvwmScript/Scripts/FvwmScript-FileBrowser
+    modules/FvwmScript/Scripts/FvwmScript-Find
+    modules/FvwmScript/Scripts/FvwmScript-KeyboardSetup
+    modules/FvwmScript/Scripts/FvwmScript-PointerSetup
+    modules/FvwmScript/Scripts/FvwmScript-Quit
+    modules/FvwmScript/Scripts/FvwmScript-ScreenDump
+    modules/FvwmScript/Scripts/FvwmScript-ScreenSetup
+    modules/FvwmScript/Scripts/FvwmScript-Setup95.in
+    modules/FvwmScript/Scripts/FvwmScript-WidgetDemo
+    modules/FvwmScript/Scripts/Makefile.am
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Scripts/README
+    modules/FvwmScript/Scripts/TerminalSettings.fss
+    modules/FvwmScript/Scripts/UpdateFvwm2TermMenu
+    modules/FvwmScript/Scripts/fvwm-script-ComExample.pl
+    modules/FvwmScript/Scripts/fvwm-script-setup95.pl
+    modules/FvwmScript/Scripts/system.fvwmrc
+    modules/FvwmScript/TODO
+    modules/FvwmScript/Widgets/CheckBox.c
+    modules/FvwmScript/Widgets/HDipstick.c
+    modules/FvwmScript/Widgets/HScrollBar.c
+    modules/FvwmScript/Widgets/ItemDraw.c
+    modules/FvwmScript/Widgets/List.c
+    modules/FvwmScript/Widgets/Makefile.am
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/Widgets/MiniScroll.c
+    modules/FvwmScript/Widgets/PopupMenu.c
+    modules/FvwmScript/Widgets/PushButton.c
+    modules/FvwmScript/Widgets/RadioButton.c
+    modules/FvwmScript/Widgets/Rectangle.c
+    modules/FvwmScript/Widgets/Swallow.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScript/Widgets/Tools.c
+    modules/FvwmScript/Widgets/Tools.h
+    modules/FvwmScript/Widgets/VDipstick.c
+    modules/FvwmScript/Widgets/VScrollBar.c
+    modules/FvwmScript/Widgets/Widget.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScript/scanner.l
+    modules/FvwmScript/script.c modules/FvwmScript/script.h
+    modules/FvwmScript/script.y modules/FvwmScript/types.h
+    modules/FvwmScroll/ConfigFvwmScroll
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmScroll/Makefile.am
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/ButtonArray.h
+    modules/FvwmTaskBar/Colors.c
+    modules/FvwmTaskBar/Colors.h
+    modules/FvwmTaskBar/ConfigFvwmTaskBar
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/List.h
+    modules/FvwmTaskBar/Makefile.am
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Mallocs.c
+    modules/FvwmTaskBar/Mallocs.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTaskBar/minimail.xbm
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmTheme/Makefile.am
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.am
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWharf/OffiX/DragAndDrop.h
+    modules/FvwmWharf/OffiX/DragAndDropTypes.h
+    modules/FvwmWharf/Wharf.h modules/FvwmWharf/icons.c
+    modules/FvwmWharf/sample.style
+    modules/FvwmWharf/stepgfx.c modules/FvwmWharf/stepgfx.h
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/ButtonArray.h
+    modules/FvwmWinList/ConfigFvwmWinList
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h
+    modules/FvwmWinList/List.c modules/FvwmWinList/List.h
+    modules/FvwmWinList/Makefile.am
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWinList/Mallocs.c
+    modules/FvwmWinList/Mallocs.h
+    modules/FvwmWinList/config.sample
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.am
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Constants.pm
+    perllib/FVWM/Event.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Makefile.am perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in perllib/FVWM/Module/Gtk.pm
+    perllib/FVWM/Module/Gtk2.pm
+    perllib/FVWM/Module/Makefile.am
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm
+    perllib/FVWM/Module/Toolkit.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/Colorsets.pm
+    perllib/FVWM/Tracker/GlobalConfig.pm
+    perllib/FVWM/Tracker/Makefile.am
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/ModuleConfig.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/Scheduler.pm
+    perllib/FVWM/Tracker/WindowList.pm
+    perllib/FVWM/create-commands
+    perllib/FVWM/create-constants
+    perllib/General/FileSystem.pm
+    perllib/General/Makefile.am perllib/General/Makefile.in
+    perllib/General/Parse.pm perllib/Makefile.am
+    perllib/Makefile.in po/ChangeLog po/FvwmScript.ar.gmo
+    po/FvwmScript.ar.po po/FvwmScript.de.gmo
+    po/FvwmScript.de.po po/FvwmScript.fr.gmo
+    po/FvwmScript.fr.po po/FvwmScript.pot
+    po/FvwmScript.sv_SE.gmo po/FvwmScript.sv_SE.po
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.de.gmo po/FvwmTaskBar.de.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/FvwmTaskBar.pot po/FvwmTaskBar.sv_SE.gmo
+    po/FvwmTaskBar.sv_SE.po po/Makefile.am po/Makefile.in
+    po/README po/fvwm.ar.gmo po/fvwm.ar.po po/fvwm.de.gmo
+    po/fvwm.de.po po/fvwm.fr.gmo po/fvwm.fr.po po/fvwm.pot
+    po/fvwm.sv_SE.gmo po/fvwm.sv_SE.po
+    po/remove-potcdate.sed po/remove-potcdate.sin
+    rpm/ChangeLog rpm/Makefile.am rpm/Makefile.in
+    rpm/fvwm.spec rpm/fvwm.spec.in sample.fvwmrc/DecorMwm
+    sample.fvwmrc/DecorWin95 sample.fvwmrc/Makefile.am
+    sample.fvwmrc/Makefile.in sample.fvwmrc/decor_examples
+    sample.fvwmrc/new-features sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1
+    sample.fvwmrc/system.fvwm2rc-sample-2
+    sample.fvwmrc/system.fvwm2rc-sample-95 tests/ChangeLog
+    tests/Makefile.am tests/Makefile.in
+    tests/README.test_options tests/hints/Makefile.am
+    tests/hints/Makefile.in tests/hints/README
+    tests/hints/hints_test.c tests/test_options
+    utils/ChangeLog utils/Makefile.am utils/Makefile.in
+    utils/build_dev.sh utils/configure_dev.sh
+    utils/fvwm_make_browse_menu.sh
+    utils/fvwm_make_directory_menu.sh
+    utils/quantize_pixmaps utils/rebuild_dev.sh
+    utils/xselection.c vms/README vms/config.h vms/fvwmrc.dat
+    vms/make_fvwm.mms vms/vms.c vms/vms.h
+    vms/vms_shareables.opt
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--upstream--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:57:34 CDT 2005
+Standard-date: 2005-05-19 03:57:34 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Summary: fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,235 @@
+Revision: fvwm--upstream--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Sep 30 17:08:06 CDT 2004
+Standard-date: 2004-09-30 22:08:06 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm Makefile.in
+    NEWS acconfig.h acinclude.m4 aclocal.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-directory.1 bin/fvwm-menu-directory.in
+    bin/fvwm-root.1 bin/fvwm-root.c config.guess config.h.in
+    config.sub configure configure.in debian/ChangeLog
+    debian/Makefile.am debian/Makefile.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.in
+    fvwm/add_window.c fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/colorset.h
+    fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menuitem.h fvwm/menus.c fvwm/menus.h
+    fvwm/modconf.c fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/read.c
+    fvwm/screen.h fvwm/session.c fvwm/stack.c fvwm/style.c
+    fvwm/style.h fvwm/virtual.c fvwm/window_flags.h
+    libs/Bindings.c libs/Bindings.h libs/CombineChars.c
+    libs/FEvent.c libs/FEvent.h libs/FImage.c libs/FScreen.c
+    libs/Fft.c libs/Ficonv.c libs/Flocale.c libs/Makefile.in
+    libs/PictureUtils.c libs/System.c libs/defaults.h
+    libs/envvar.c libs/envvar.h libs/fvwmlib.h
+    libs/fvwmsignal.c libs/fvwmsignal.h libs/gravity.h
+    libs/vpacket.h libs/wcontext.h libs/wild.c libs/wild.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in
+    sample.fvwmrc/system.fvwm2rc-sample-1 tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/Makefile.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: Imported fvwm-2.5.11
+Keywords: 
+
+Imported fvwm-2.5.11
+into srivasta@debian.org--2003-primary/fvwm--upstream--2.5
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,57 @@
+Revision: fvwm--upstream--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 10:40:32 CDT 2004
+Standard-date: 2004-10-06 15:40:32 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/fvwm.lsm fvwm/add_window.c
+    fvwm/builtins.c fvwm/commands.h fvwm/events.c
+    fvwm/frame.c fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/screen.h fvwm/update.c fvwm/virtual.c
+    fvwm/window_flags.h libs/envvar.c libs/envvar.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: Imported fvwm-2.5.12
+Keywords: 
+
+Imported fvwm-2.5.12
+into srivasta@debian.org--2003-primary/fvwm--upstream--2.5
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,125 @@
+Revision: fvwm--upstream--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 13:37:31 CDT 2004
+Standard-date: 2004-04-06 18:37:31 GMT
+New-files: debian/.arch-ids/conffiles.id
+    debian/.arch-ids/copyright.id debian/.arch-ids/prerm.id
+    debian/conffiles debian/copyright debian/prerm
+    perllib/FVWM/Module/.arch-ids/Terminal.pm.id
+    perllib/FVWM/Module/Terminal.pm
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    acinclude.m4 aclocal.m4 bin/ChangeLog bin/Makefile.in
+    bin/fvwm-bug.in bin/fvwm-config.in bin/fvwm-convert-2.2
+    bin/fvwm-menu-desktop.in bin/fvwm-menu-directory.in
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    config.guess config.h.in config.sub configure configure.in
+    debian/ChangeLog debian/Makefile.am debian/Makefile.in
+    debian/control.in debian/docs debian/fvwm.menu
+    debian/postinst debian/postrm docs/ANNOUNCE
+    docs/ChangeLog docs/DEVELOPERS docs/FAQ docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/add_window.c
+    fvwm/add_window.h fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h
+    fvwm/ewmh_conf.c fvwm/ewmh_events.c fvwm/expand.c
+    fvwm/focus.c fvwm/functable.c fvwm/functions.c
+    fvwm/functions.h fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/icons.c fvwm/menus.c fvwm/menus.h fvwm/menustyle.c
+    fvwm/menustyle.h fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/placement.h
+    fvwm/schedule.c fvwm/screen.h fvwm/session.c fvwm/stack.c
+    fvwm/style.c fvwm/style.h fvwm/virtual.c libs/Bindings.c
+    libs/FImage.c libs/FScreen.c libs/FScreen.h
+    libs/Flocale.c libs/Flocale.h libs/Graphics.c
+    libs/Makefile.in libs/charmap.c libs/defaults.h
+    libs/gravity.c libs/gravity.h libs/wcontext.c
+    libs/wcontext.h modules/ChangeLog
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/findcmd.pl
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmCommand/scripts/ex-auto.pl
+    modules/FvwmCommand/scripts/ex-cascade.pl
+    modules/FvwmCommand/scripts/ex-grpmv.pl
+    modules/FvwmCommand/scripts/focus-Netscape.pl
+    modules/FvwmCommand/scripts/focus-link.pl
+    modules/FvwmCommand/scripts/push-away.pl
+    modules/FvwmCommand/scripts/test1.pl
+    modules/FvwmCommand/scripts/test2.sh
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-Quit
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Scripts/fvwm-script-setup95.pl
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScript/Widgets/Tools.c
+    modules/FvwmScript/Widgets/Tools.h
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/EventNames.pm
+    perllib/FVWM/Makefile.in perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Gtk.pm perllib/FVWM/Module/Gtk2.pm
+    perllib/FVWM/Module/Makefile.am
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/create-commands
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec rpm/fvwm.spec.in sample.fvwmrc/Makefile.in
+    sample.fvwmrc/system.fvwm2rc-sample-95 tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/test_options utils/ChangeLog utils/Makefile.in
+    utils/build_dev.sh utils/configure_dev.sh
+    utils/fvwm_make_browse_menu.sh
+    utils/fvwm_make_directory_menu.sh
+    utils/quantize_pixmaps utils/rebuild_dev.sh
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: Imported fvwm-2.5.10.orig
+Keywords: 
+
+Imported fvwm-2.5.10.orig
+into srivasta@debian.org--2003-primary/fvwm--upstream--2.5
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:45:04 CDT 2005
+Standard-date: 2005-06-29 19:45:04 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: * Do not lock a submenu menu item if it's clicked on but the submenu does not
+CSCVSID: MAIN.4275
+Keywords: cscvs:MAIN-4275
+
+Author: domivogt
+Date: 2004/10/13 01:06:27
+* Do not lock a submenu menu item if it's clicked on but the submenu does not
+exist.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:50:16 CDT 2005
+Standard-date: 2005-06-29 19:50:16 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: 	* fvwm/fvwm.1.in (Focus): Typos in focus section.
+CSCVSID: MAIN.4299
+Keywords: cscvs:MAIN-4299
+
+Author: dane
+Date: 2005/02/26 04:30:04
+	* fvwm/fvwm.1.in (Focus): Typos in focus section.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:30:15 CDT 2005
+Standard-date: 2005-07-08 00:30:15 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: * Dominik Vogt
+CSCVSID: MAIN.4312
+Keywords: cscvs:MAIN-4312
+
+Author: migo
+Date: 2005/07/05 08:12:22
+* Dominik Vogt: fixed collision detection of windows on pages
+_ other than the current one during placement
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:52:29 CDT 2005
+Standard-date: 2005-06-29 19:52:29 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: 	* FvwmScript/FvwmScript.1.in
+CSCVSID: MAIN.4308
+Keywords: cscvs:MAIN-4308
+
+Author: dane
+Date: 2005/06/07 23:51:08
+	* FvwmScript/FvwmScript.1.in: Fix typos in new description of
+Do block.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:50:03 CDT 2005
+Standard-date: 2005-06-29 19:50:03 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: * FAQ (3.23): Typo.
+CSCVSID: MAIN.4298
+Keywords: cscvs:MAIN-4298
+
+Author: dane
+Date: 2005/02/26 04:15:09
+* FAQ (3.23): Typo.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:30:43 CDT 2005
+Standard-date: 2005-07-08 00:30:43 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: * Dominik Vogt: fixed drawing of relief with very small rectangles
+CSCVSID: MAIN.4314
+Keywords: cscvs:MAIN-4314
+
+Author: migo
+Date: 2005/07/06 15:15:16
+* Dominik Vogt: fixed drawing of relief with very small rectangles
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-59
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-59
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-59
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:09:02 CDT 2005
+Standard-date: 2005-08-09 00:09:02 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+Summary: * FvwmPerl: support window context in "preprocess" action
+CSCVSID: MAIN.4324
+Keywords: cscvs:MAIN-4324
+
+Author: migo
+Date: 2005/07/20 17:55:33
+* FvwmPerl: support window context in "preprocess" action
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,26 @@
+Revision: fvwm--upstream--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:17:28 CDT 2005
+Standard-date: 2005-07-20 02:17:28 GMT
+Modified-files: ChangeLog bin/ChangeLog bin/fvwm-root.c
+    fvwm/add_window.c fvwm/colorset.c fvwm/decorations.c
+    fvwm/ewmh.c fvwm/ewmh_icons.c fvwm/ewmh_names.c
+    fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/session.c libs/FTips.c libs/FTips.h libs/Target.c
+    libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+Summary: * 64-bit fixes by Dominik
+CSCVSID: MAIN.4322
+Keywords: cscvs:MAIN-4322
+
+Author: migo
+Date: 2005/07/19 12:08:03
+* 64-bit fixes by Dominik
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-62
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-62
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-62
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:11:30 CDT 2005
+Standard-date: 2005-08-09 00:11:30 GMT
+Modified-files: NEWS docs/ANNOUNCE
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+Summary: * NEWS.
+CSCVSID: MAIN.4327
+Keywords: cscvs:MAIN-4327
+
+Author: domivogt
+Date: 2005/07/30 10:11:24
+* NEWS.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-58
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-58
@@ -0,0 +1,12 @@
+Revision: fvwm--upstream--2.5--patch-58
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:39:18 CDT 2005
+Standard-date: 2005-07-20 02:39:18 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Fix differences from upstream in non-text files
+Keywords: 
+
+Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:45:16 CDT 2005
+Standard-date: 2005-06-29 19:45:16 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: * Fixed aborting move/resize with the mouse.
+CSCVSID: MAIN.4276
+Keywords: cscvs:MAIN-4276
+
+Author: domivogt
+Date: 2004/10/13 18:26:16
+* Fixed aborting move/resize with the mouse.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:51:02 CDT 2005
+Standard-date: 2005-06-29 19:51:02 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: 	* FAQ
+CSCVSID: MAIN.4302
+Keywords: cscvs:MAIN-4302
+
+Author: dane
+Date: 2005/03/10 04:37:36
+	* FAQ: Spelling correction from Thomas Adam.  A spell check
+yielded a few more spelling problems.
+Updated unclutter FAQ entry to mention the -noevents
+fix for pointer movement.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:56 CDT 2005
+Standard-date: 2005-06-29 19:48:56 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: * Fixed my previous commit
+CSCVSID: MAIN.4292
+Keywords: cscvs:MAIN-4292
+
+Author: olicha
+Date: 2005/01/10 14:59:24
+* Fixed my previous commit
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-77
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-77
@@ -0,0 +1,171 @@
+Revision: fvwm--upstream--2.5--patch-77
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 14:19:05 CDT 2005
+Standard-date: 2005-08-25 19:19:05 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/conditional.c
+    fvwm/ewmh_events.c fvwm/fvwm.1.in fvwm/session.c
+    fvwm/virtual.c install-sh libs/Makefile.in missing
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Imported fvwm-2.5.14
+Keywords: 
+
+Imported fvwm-2.5.14
+into srivasta@debian.org--etch/fvwm--upstream--2.5
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-64
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-64
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-64
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:12:54 CDT 2005
+Standard-date: 2005-08-09 00:12:54 GMT
+Modified-files: ChangeLog fvwm/ewmh_events.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+Summary: * Fixed bogus "ewmh_WMIconGeometry" warning message.
+CSCVSID: MAIN.4329
+Keywords: cscvs:MAIN-4329
+
+Author: domivogt
+Date: 2005/07/31 21:19:14
+* Fixed bogus "ewmh_WMIconGeometry" warning message.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:50:50 CDT 2005
+Standard-date: 2005-06-29 19:50:50 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: * fvwm/fvwm.1.in (Example)
+CSCVSID: MAIN.4301
+Keywords: cscvs:MAIN-4301
+
+Author: dane
+Date: 2005/03/02 01:22:04
+* fvwm/fvwm.1.in (Example): Piperead in dynamic menu example,
+not exec.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-65
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-65
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-65
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:13:34 CDT 2005
+Standard-date: 2005-08-09 00:13:34 GMT
+Modified-files: ChangeLog modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+Summary: * Dominik: fixed select/focus button state lost when deiconifying a window
+CSCVSID: MAIN.4330
+Keywords: cscvs:MAIN-4330
+
+Author: migo
+Date: 2005/08/01 14:23:01
+* Dominik: fixed select/focus button state lost when deiconifying a window
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:57:54 CDT 2005
+Standard-date: 2005-05-19 03:57:54 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,20 @@
+Revision: fvwm--upstream--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:30:31 CDT 2005
+Standard-date: 2005-07-08 00:30:31 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: 	* fvwm-menu-desktop.1.in
+CSCVSID: MAIN.4313
+Keywords: cscvs:MAIN-4313
+
+Author: dane
+Date: 2005/07/05 15:03:53
+	* fvwm-menu-desktop.1.in: Add option gnome-mandriva.
+
+* fvwm-menu-desktop.in (check_app): When checking if executable exists,
+allow full path.  Add new option, gnome-mandriva.
+
+* NEWS: fvwm-menu-desktop changes.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:35 CDT 2005
+Standard-date: 2005-06-29 19:48:35 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: * Small session management fixes
+CSCVSID: MAIN.4290
+Keywords: cscvs:MAIN-4290
+
+Author: olicha
+Date: 2005/01/08 13:30:56
+* Small session management fixes
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-66
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-66
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-66
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:14:20 CDT 2005
+Standard-date: 2005-08-09 00:14:20 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+Summary: * Minor cleanup.
+CSCVSID: MAIN.4331
+Keywords: cscvs:MAIN-4331
+
+Author: domivogt
+Date: 2005/08/03 21:46:16
+* Minor cleanup.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-71
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-71
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-71
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:18:07 CDT 2005
+Standard-date: 2005-08-09 00:18:07 GMT
+Modified-files: ChangeLog configure.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+Summary: * Added check for supported system architectures.
+CSCVSID: MAIN.4336
+Keywords: cscvs:MAIN-4336
+
+Author: domivogt
+Date: 2005/08/04 20:21:00
+* Added check for supported system architectures.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,22 @@
+Revision: fvwm--upstream--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:49:43 CDT 2005
+Standard-date: 2005-06-29 19:49:43 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: 2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+CSCVSID: MAIN.4296
+Keywords: cscvs:MAIN-4296
+
+Author: dane
+Date: 2005/02/05 16:37:45
+2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
+* FvwmScript/FvwmScript.c (MainLoop):
+Fixed periodic tasks being executed too often when there are pending
+events.
+* FvwmScript/FvwmScript.1.in: Typo, PeriodicTasks is one word with
+* AUTHORS: New author, FvwmScript patch.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,29 @@
+Revision: fvwm--upstream--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:46:43 CDT 2005
+Standard-date: 2005-06-29 19:46:43 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: * Added a set of functions for implementing tool tips
+CSCVSID: MAIN.4281
+Keywords: cscvs:MAIN-4281
+
+Author: olicha
+Date: 2004/12/03 08:47:48
+* Added a set of functions for implementing tool tips
+* Implemented tips in IconMan
+* New options IconMan MaxButtonWidth and MaxButtonWidthByColumns
+* Fixed bug #1480 by updating EWMHUseStackingOrderHints documentation
+* One needs_lang_check in fvwm.1.in and one in FvwmIconMan.1.in
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-69
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-69
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-69
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:16:27 CDT 2005
+Standard-date: 2005-08-09 00:16:27 GMT
+Modified-files: fvwm/gnome.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+Summary: * Minor update.
+CSCVSID: MAIN.4334
+Keywords: cscvs:MAIN-4334
+
+Author: domivogt
+Date: 2005/08/04 09:29:49
+* Minor update.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:14 CDT 2005
+Standard-date: 2005-06-29 19:48:14 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+CSCVSID: MAIN.4288
+Keywords: cscvs:MAIN-4288
+
+Author: olicha
+Date: 2005/01/06 06:52:18
+* Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,13 @@
+Revision: fvwm--upstream--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:15:22 CDT 2005
+Standard-date: 2005-07-09 20:15:22 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: fvwm-menu-directory: correct a typo
+Keywords: 
+
+fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:44:41 CDT 2005
+Standard-date: 2005-06-29 19:44:41 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: * Fixed CopyToken delimiter parsing.
+CSCVSID: MAIN.4273
+Keywords: cscvs:MAIN-4273
+
+Author: domivogt
+Date: 2004/10/12 09:37:51
+* Fixed CopyToken delimiter parsing.
+* Fixed FvwmCommand.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:47:23 CDT 2005
+Standard-date: 2005-06-29 19:47:23 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: * Try to clarify TipsJustification IconMan option
+CSCVSID: MAIN.4284
+Keywords: cscvs:MAIN-4284
+
+Author: olicha
+Date: 2004/12/11 13:08:51
+* Try to clarify TipsJustification IconMan option
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-70
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-70
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-70
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:17:25 CDT 2005
+Standard-date: 2005-08-09 00:17:25 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/ewmh_events.c fvwm/geometry.c
+    fvwm/icons.c fvwm/modconf.c fvwm/module_interface.c
+    fvwm/stack.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/vpacket.h
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+Summary: * 64-bit fixes.
+CSCVSID: MAIN.4335
+Keywords: cscvs:MAIN-4335
+
+Author: domivogt
+Date: 2005/08/04 16:25:40
+* 64-bit fixes.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:49:14 CDT 2005
+Standard-date: 2005-06-29 19:49:14 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: update news
+CSCVSID: MAIN.4294
+Keywords: cscvs:MAIN-4294
+
+Author: dane
+Date: 2005/01/20 02:17:23
+update news
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-74
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-74
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-74
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:20:27 CDT 2005
+Standard-date: 2005-08-09 00:20:27 GMT
+Modified-files: ChangeLog fvwm/menus.c fvwm/menustyle.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+Summary: * Two menu fixes by  ViktorGriph.
+CSCVSID: MAIN.4339
+Keywords: cscvs:MAIN-4339
+
+Author: domivogt
+Date: 2005/08/07 09:48:29
+* Two menu fixes by  ViktorGriph.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:46:56 CDT 2005
+Standard-date: 2005-06-29 19:46:56 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: * Really commit EWMHUseStackingOrderHints documentation update
+CSCVSID: MAIN.4282
+Keywords: cscvs:MAIN-4282
+
+Author: olicha
+Date: 2004/12/06 11:15:40
+* Really commit EWMHUseStackingOrderHints documentation update
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:51:23 CDT 2005
+Standard-date: 2005-06-29 19:51:23 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: 	* FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+CSCVSID: MAIN.4304
+Keywords: cscvs:MAIN-4304
+
+Author: dane
+Date: 2005/03/23 02:47:37
+	* FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:46:17 CDT 2005
+Standard-date: 2005-06-29 19:46:17 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+CSCVSID: MAIN.4280
+Keywords: cscvs:MAIN-4280
+
+Author: dane
+Date: 2004/12/01 01:36:33
+* fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:45:48 CDT 2005
+Standard-date: 2005-06-29 19:45:48 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: * Fixed crashes and bugs in handling of the root window / other unmanaged
+CSCVSID: MAIN.4278
+Keywords: cscvs:MAIN-4278
+
+Author: domivogt
+Date: 2004/10/26 09:06:52
+* Fixed crashes and bugs in handling of the root window / other unmanaged
+windows in the window specific binding code.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:18:13 CDT 2005
+Standard-date: 2005-07-20 02:18:13 GMT
+Modified-files: ChangeLog libs/FlocaleCharset.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+CSCVSID: MAIN.4323
+Keywords: cscvs:MAIN-4323
+
+Author: migo
+Date: 2005/07/19 12:23:26
+actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:49:27 CDT 2005
+Standard-date: 2005-06-29 19:49:27 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: ...
+CSCVSID: MAIN.4295
+Keywords: cscvs:MAIN-4295
+
+Author: scott
+Date: 2005/01/28 00:45:28
+
+elaborate on how window-specific bindings work.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:15:30 CDT 2005
+Standard-date: 2005-07-20 02:15:30 GMT
+Modified-files: ChangeLog NEWS configure.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+Summary: * Updated for 2.5.14.
+CSCVSID: MAIN.4320
+Keywords: cscvs:MAIN-4320
+
+Author: domivogt
+Date: 2005/07/16 08:42:44
+* Updated for 2.5.14.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:52:36 CDT 2005
+Standard-date: 2005-06-29 19:52:36 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: 	* FvwmScript/FvwmScript.1.in
+CSCVSID: MAIN.4309
+Keywords: cscvs:MAIN-4309
+
+Author: dane
+Date: 2005/06/08 10:38:43
+	* FvwmScript/FvwmScript.1.in: Fix more typos in new description of
+Do block.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:09:20 CDT 2005
+Standard-date: 2005-07-20 02:09:20 GMT
+Modified-files: docs/DEVELOPERS
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+Summary: * Updated DEVELOPERS.
+CSCVSID: MAIN.4318
+Keywords: cscvs:MAIN-4318
+
+Author: domivogt
+Date: 2005/07/16 08:24:46
+* Updated DEVELOPERS.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-76
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-76
@@ -0,0 +1,85 @@
+Revision: fvwm--upstream--2.5--patch-76
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:39:14 CDT 2005
+Standard-date: 2005-08-09 00:39:14 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Finalize additions from CVS missed by cscvs
+Keywords: 
+
+Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:47:33 CDT 2005
+Standard-date: 2005-06-29 19:47:33 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+CSCVSID: MAIN.4285
+Keywords: cscvs:MAIN-4285
+
+Author: dane
+Date: 2004/12/11 14:43:33
+* FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-75
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-75
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-75
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:21:08 CDT 2005
+Standard-date: 2005-08-09 00:21:08 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+Summary: Added FvwmProxy option ProxyIconified
+CSCVSID: MAIN.4340
+Keywords: cscvs:MAIN-4340
+
+Author: jpweber
+Date: 2005/08/08 19:39:12
+Added FvwmProxy option ProxyIconified;
+Fixed some proxy collision issues;
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:47 CDT 2005
+Standard-date: 2005-06-29 19:48:47 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: * Fixed some FvwmIconMan flickering
+CSCVSID: MAIN.4291
+Keywords: cscvs:MAIN-4291
+
+Author: olicha
+Date: 2005/01/10 13:55:47
+* Fixed some FvwmIconMan flickering
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:49:07 CDT 2005
+Standard-date: 2005-06-29 19:49:07 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: 	* fvwm/bindings.c (ParseBinding)
+CSCVSID: MAIN.4293
+Keywords: cscvs:MAIN-4293
+
+Author: dane
+Date: 2005/01/20 02:15:08
+	* fvwm/bindings.c (ParseBinding): Patch from Frank Gruellich,
+avoid dump with empty key/mouse binding command.
+* fvwm/conditional.c (direction_cmd): Safety check after PeekToken
+Checked all other uses of PeekToken in fvwm dir.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:44:06 CDT 2005
+Standard-date: 2005-06-29 19:44:06 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: * Updated FAQ.
+CSCVSID: MAIN.4270
+Keywords: cscvs:MAIN-4270
+
+Author: domivogt
+Date: 2004/10/11 00:27:53
+* Updated FAQ.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:30:04 CDT 2005
+Standard-date: 2005-07-08 00:30:04 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: apply 64-bit patch for perllib by Viktor Griph
+CSCVSID: MAIN.4311
+Keywords: cscvs:MAIN-4311
+
+Author: migo
+Date: 2005/06/29 17:15:18
+apply 64-bit patch for perllib by Viktor Griph
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:51:13 CDT 2005
+Standard-date: 2005-06-29 19:51:13 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: 	* fvwm-menu-desktop.1.in
+CSCVSID: MAIN.4303
+Keywords: cscvs:MAIN-4303
+
+Author: dane
+Date: 2005/03/18 03:57:01
+	* fvwm-menu-desktop.1.in: Fix .IP.
+* FvwmProxy/FvwmProxy.1.in: Fix .IP syntax.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,27 @@
+Revision: fvwm--upstream--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:50:37 CDT 2005
+Standard-date: 2005-06-29 19:50:37 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: ...
+CSCVSID: MAIN.4300
+Keywords: cscvs:MAIN-4300
+
+Author: scott
+Date: 2005/02/27 07:47:25
+
+Changed 'flags' from 'unsigned int' to proper struct.
+Now more flags are available.
+Added ActiveColorset & PressColorset options for _individual_
+buttons. (Overrides global ActiveColorset & PressColorset options.)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-68
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-68
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-68
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:15:47 CDT 2005
+Standard-date: 2005-08-09 00:15:47 GMT
+Modified-files: NEWS docs/ANNOUNCE
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+Summary: * Updated NEWS.
+CSCVSID: MAIN.4333
+Keywords: cscvs:MAIN-4333
+
+Author: domivogt
+Date: 2005/08/04 09:29:32
+* Updated NEWS.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:44:24 CDT 2005
+Standard-date: 2005-06-29 19:44:24 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: * Fixed compiling FvwmCommand.
+CSCVSID: MAIN.4272
+Keywords: cscvs:MAIN-4272
+
+Author: domivogt
+Date: 2004/10/11 16:07:23
+* Fixed compiling FvwmCommand.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:13:29 CDT 2005
+Standard-date: 2005-07-20 02:13:29 GMT
+Modified-files: docs/DEVELOPERS
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+Summary: * Updated DEVELOPERS.
+CSCVSID: MAIN.4319
+Keywords: cscvs:MAIN-4319
+
+Author: domivogt
+Date: 2005/07/16 08:27:12
+* Updated DEVELOPERS.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,19 @@
+Revision: fvwm--upstream--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:43:31 CDT 2005
+Standard-date: 2005-06-29 19:43:31 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: * Fixed positioning of shaped windows on pages other than 0 0.
+CSCVSID: MAIN.4268
+Keywords: cscvs:MAIN-4268
+
+Author: domivogt
+Date: 2004/10/08 01:24:09
+* Fixed positioning of shaped windows on pages other than 0 0.
+* Re-shaping shaded windows no longer unshades them.
+* Fixed GC leak in FvwmButtons.
+* Fixed uninitialized shape mask in empty FvwmButtons buttons.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:47:46 CDT 2005
+Standard-date: 2005-06-29 19:47:46 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: * ButtonStyle Reset takes effect immediately.
+CSCVSID: MAIN.4286
+Keywords: cscvs:MAIN-4286
+
+Author: domivogt
+Date: 2004/12/12 13:06:05
+* ButtonStyle Reset takes effect immediately.
+* Added FAQ 5.16
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:43:41 CDT 2005
+Standard-date: 2005-06-29 19:43:41 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: * Allow whitespace before commas in WindowList options.  May affect other
+CSCVSID: MAIN.4269
+Keywords: cscvs:MAIN-4269
+
+Author: domivogt
+Date: 2004/10/09 12:17:26
+* Allow whitespace before commas in WindowList options.  May affect other
+commands and modules using GetNextSimpleOption().
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:51:45 CDT 2005
+Standard-date: 2005-06-29 19:51:45 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: * A little clean-up.
+CSCVSID: MAIN.4305
+Keywords: cscvs:MAIN-4305
+
+Author: domivogt
+Date: 2005/04/11 12:04:57
+* A little clean-up.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,21 @@
+Revision: fvwm--upstream--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:02 CDT 2005
+Standard-date: 2005-06-29 19:48:02 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: * FAQ (1.7)
+CSCVSID: MAIN.4287
+Keywords: cscvs:MAIN-4287
+
+Author: migo
+Date: 2004/12/21 11:34:24
+* FAQ (1.7): improve wording
+* FvwmDebug: s/--semd-windowlist/--send-windowlist/
+* small fix in test module
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-67
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-67
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-67
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:15:07 CDT 2005
+Standard-date: 2005-08-09 00:15:07 GMT
+Modified-files: ChangeLog fvwm/ewmh.c fvwm/focus.c
+    fvwm/gnome.c fvwm/stack.c modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+Summary: * Fixed hang in button grabbing code.
+CSCVSID: MAIN.4332
+Keywords: cscvs:MAIN-4332
+
+Author: domivogt
+Date: 2005/08/04 09:13:04
+* Fixed hang in button grabbing code.
+* Corrected typo in FvwmScript man page.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,84 @@
+Revision: fvwm--upstream--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:04:14 CDT 2005
+Standard-date: 2005-07-08 07:04:14 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Manually finish sync with CVS version
+Keywords: 
+
+Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-60
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-60
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-60
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:09:58 CDT 2005
+Standard-date: 2005-08-09 00:09:58 GMT
+Modified-files: ChangeLog docs/FAQ fvwm/events.c
+    fvwm/module_interface.c fvwm/stack.c fvwm/style.c
+    modules/ChangeLog modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmProxy/FvwmProxy.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+Summary: * 64-bit fixes.
+CSCVSID: MAIN.4325
+Keywords: cscvs:MAIN-4325
+
+Author: domivogt
+Date: 2005/07/29 07:21:32
+* 64-bit fixes.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-73
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-73
@@ -0,0 +1,18 @@
+Revision: fvwm--upstream--2.5--patch-73
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:19:44 CDT 2005
+Standard-date: 2005-08-09 00:19:44 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/fvwm.c
+    fvwm/style.c libs/Strings.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+Summary: * Fixed a memory leak in style merging, tweaked and simplified the code.
+CSCVSID: MAIN.4338
+Keywords: cscvs:MAIN-4338
+
+Author: domivogt
+Date: 2005/08/07 09:39:56
+* Fixed a memory leak in style merging, tweaked and simplified the code.
+* Only one pass through the style list is done before allowing the event
+code to do something else.
+* A little cleanup.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:45:31 CDT 2005
+Standard-date: 2005-06-29 19:45:31 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: * Fixed endless loop in DeIconify().
+CSCVSID: MAIN.4277
+Keywords: cscvs:MAIN-4277
+
+Author: domivogt
+Date: 2004/10/17 10:38:30
+* Fixed endless loop in DeIconify().
+* Some clean-up and reformatting.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-61
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-61
@@ -0,0 +1,19 @@
+Revision: fvwm--upstream--2.5--patch-61
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:10:51 CDT 2005
+Standard-date: 2005-08-09 00:10:51 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/gnome.c
+    fvwm/misc.c fvwm/misc.h fvwm/stack.c fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+Summary: * Fixed hang when a gnome application requests a layer < 0.
+CSCVSID: MAIN.4326
+Keywords: cscvs:MAIN-4326
+
+Author: domivogt
+Date: 2005/07/30 10:08:01
+* Fixed hang when a gnome application requests a layer < 0.
+* Added many error messages for borken GNOME and EWMH hints/client messages.
+* Fixed a core dump in EQMH icon geometry handling.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:47:14 CDT 2005
+Standard-date: 2005-06-29 19:47:14 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: /tmp/f
+CSCVSID: MAIN.4283
+Keywords: cscvs:MAIN-4283
+
+Author: dane
+Date: 2004/12/09 03:09:29
+/tmp/f
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:16:16 CDT 2005
+Standard-date: 2005-07-20 02:16:16 GMT
+Modified-files: ChangeLog NEWS fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+Summary: * Fixed compile problem (don't use rintf() as it's C99).
+CSCVSID: MAIN.4321
+Keywords: cscvs:MAIN-4321
+
+Author: domivogt
+Date: 2005/07/17 14:16:31
+* Fixed compile problem (don't use rintf() as it's C99).
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,165 @@
+Revision: fvwm--upstream--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 11:46:31 CDT 2005
+Standard-date: 2005-07-18 16:46:31 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.in
+    install-sh libs/Makefile.in missing mkinstalldirs
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Imported fvwm-2.5.13
+Keywords: 
+
+Imported fvwm-2.5.13
+into srivasta@debian.org--etch/fvwm--upstream--2.5
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:52:49 CDT 2005
+Standard-date: 2005-06-29 19:52:49 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: * Fixed interective resize (reduction) via the bottom border
+CSCVSID: MAIN.4310
+Keywords: cscvs:MAIN-4310
+
+Author: olicha
+Date: 2005/06/17 12:44:35
+* Fixed interective resize (reduction) via the bottom border
+* typo
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:48:25 CDT 2005
+Standard-date: 2005-06-29 19:48:25 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+CSCVSID: MAIN.4289
+Keywords: cscvs:MAIN-4289
+
+Author: olicha
+Date: 2005/01/08 11:23:54
+* Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+float values to neast int
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:44:53 CDT 2005
+Standard-date: 2005-06-29 19:44:53 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+CSCVSID: MAIN.4274
+Keywords: cscvs:MAIN-4274
+
+Author: domivogt
+Date: 2004/10/12 10:20:18
+* Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+!FPAllowRaiseClickFunction styles.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,15 @@
+Revision: fvwm--upstream--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:46:04 CDT 2005
+Standard-date: 2005-06-29 19:46:04 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: * Fixed ALT-Move to disable snapping.
+CSCVSID: MAIN.4279
+Keywords: cscvs:MAIN-4279
+
+Author: domivogt
+Date: 2004/11/01 12:31:09
+* Fixed ALT-Move to disable snapping.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,20 @@
+Revision: fvwm--upstream--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:52:04 CDT 2005
+Standard-date: 2005-06-29 19:52:04 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: 	* NEWS
+CSCVSID: MAIN.4306
+Keywords: cscvs:MAIN-4306
+
+Author: dane
+Date: 2005/06/02 20:54:53
+	* NEWS:
+* fvwm/fvwm.1.in:
+Spelling fix contition -> condition
+
+* FvwmAuto/FvwmAuto.c (main): Spelling fix in comment
+contition -> condition.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,16 @@
+Revision: fvwm--upstream--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:52:15 CDT 2005
+Standard-date: 2005-06-29 19:52:15 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: 	* FvwmScript/FvwmScript.1.in (following)
+CSCVSID: MAIN.4307
+Keywords: cscvs:MAIN-4307
+
+Author: dane
+Date: 2005/06/07 23:45:42
+	* FvwmScript/FvwmScript.1.in (following): Clarify description of
+Do block.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,20 @@
+Revision: fvwm--upstream--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:43:13 CDT 2005
+Standard-date: 2005-06-29 19:43:13 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: * Fixed "random" wire frame position during move/resize.
+CSCVSID: MAIN.4267
+Keywords: cscvs:MAIN-4267
+
+Author: domivogt
+Date: 2004/10/06 18:10:31
+* Fixed "random" wire frame position during move/resize.
+* Disabled the ConfigureRequest debugging code by default.  Use
+"Bugopts DebugCRMotionMethod on" to enable it.
+* Removed some !!! markers from files where they do not belong.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-72
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-72
@@ -0,0 +1,17 @@
+Revision: fvwm--upstream--2.5--patch-72
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:18:48 CDT 2005
+Standard-date: 2005-08-09 00:18:48 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+Summary: * Use the new logo in FvwmBanner.
+CSCVSID: MAIN.4337
+Keywords: cscvs:MAIN-4337
+
+Author: domivogt
+Date: 2005/08/05 09:26:57
+* Use the new logo in FvwmBanner.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:49:54 CDT 2005
+Standard-date: 2005-06-29 19:49:54 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: * Fixed circulate crash.
+CSCVSID: MAIN.4297
+Keywords: cscvs:MAIN-4297
+
+Author: domivogt
+Date: 2005/02/12 09:28:26
+* Fixed circulate crash.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-63
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-63
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-63
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:12:15 CDT 2005
+Standard-date: 2005-08-09 00:12:15 GMT
+Modified-files: ChangeLog libs/Colorset.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+Summary: * Fixed aspect pixmap size calculations.
+CSCVSID: MAIN.4328
+Keywords: cscvs:MAIN-4328
+
+Author: domivogt
+Date: 2005/07/31 14:04:42
+* Fixed aspect pixmap size calculations.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,14 @@
+Revision: fvwm--upstream--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Jun 29 14:44:17 CDT 2005
+Standard-date: 2005-06-29 19:44:17 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: * Fixed MoveToPage w/o argument.
+CSCVSID: MAIN.4271
+Keywords: cscvs:MAIN-4271
+
+Author: domivogt
+Date: 2004/10/11 13:49:36
+* Fixed MoveToPage w/o argument.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,98 @@
+Revision: fvwm--upstream--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:37 CDT 2006
+Standard-date: 2006-09-12 03:29:37 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+Continuation-of: srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,74 @@
+Revision: fvwm--upstream--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 23:17:18 CDT 2006
+Standard-date: 2006-09-12 04:17:18 GMT
+Modified-files: ChangeLog NEWS acinclude.m4 bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog docs/fvwm.lsm
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 rpm/fvwm.spec
+    utils/ChangeLog utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: New upstream-revision.
+Keywords: 
+
+New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,96 @@
+Revision: fvwm--upstream--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:49 CDT 2006
+Standard-date: 2006-08-06 20:33:49 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+Continuation-of: srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--upstream/fvwm--upstream--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,138 @@
+Revision: fvwm--upstream--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:35:38 CDT 2006
+Standard-date: 2006-08-06 20:35:38 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS README
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1 bin/fvwm-bug.in
+    bin/fvwm-config.1 bin/fvwm-config.1.in
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.1.in
+    config.h.in configure configure.ac docs/ANNOUNCE
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/fvwm.lsm
+    fvwm/ConfigFvwmSetup fvwm/add_window.c fvwm/builtins.c
+    fvwm/commands.h fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/focus.c
+    fvwm/focus.h fvwm/frame.c fvwm/functable.c
+    fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/gnome.c fvwm/menuitem.c fvwm/menus.c
+    fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Imported fvwm-2.5.17
+Keywords: 
+
+Imported fvwm-2.5.17
+into srivasta@debian.org--etch/fvwm--upstream--2.5.17
+
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-9
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-9
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:43:03 CDT 2004
+Standard-date: 2004-04-19 08:43:03 GMT
+Modified-files: fvwm/menuitem.h fvwm/menus.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+Summary: Do not use a variable called mips, it causes problems on mips boxes
+Keywords: 
+
+Do not use a variable called mips, it causes problems on mips boxes
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+   Do not use a variable called mips, it causes problems on mips boxes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-10
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-10
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Aug 11 14:33:15 CDT 2004
+Standard-date: 2004-08-11 19:33:15 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-10
+Summary: Upadated fvwm-root changes from the Debain branch/; already incorporated upstream
+Keywords: 
+
+Upadated fvwm-root changes from the Debain branch/; already incorporated upstream
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+   Refreshed fvwm-root.c file from upstream CVS, since it fixes a problem with blanking the screen if the root image specified does not exist.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,14 @@
+Revision: fvwm--devo--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 13:47:11 CST 2003
+Standard-date: 2003-11-25 19:47:11 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-15
@@ -0,0 +1,59 @@
+Revision: fvwm--devo--2.5--patch-15
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:50:32 CDT 2004
+Standard-date: 2004-10-01 06:50:32 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    config.h.in configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-15
+Summary: Refreshed with autoreconf
+Keywords: 
+
+Refreshed with autoreconf
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+   Refreshed with autoreconf
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-22
@@ -0,0 +1,10 @@
+Revision: fvwm--devo--2.5--patch-22
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 17:25:59 CST 2005
+Standard-date: 2005-03-17 23:25:59 GMT
+Modified-files: bin/fvwm-root.c libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-22
+Summary: Reverted some spurious changes in the autotools branch.
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-7
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Apr  7 10:37:41 CDT 2004
+Standard-date: 2004-04-07 15:37:41 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-7
+Summary: revert menu location to debian defaults
+Keywords: 
+
+revert menu location to debian defaults
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+   revert menu location to debian defaults
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-18
@@ -0,0 +1,59 @@
+Revision: fvwm--devo--2.5--patch-18
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 11:53:34 CDT 2004
+Standard-date: 2004-10-06 16:53:34 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS fvwm/add_window.c fvwm/builtins.c
+    fvwm/commands.h fvwm/events.c fvwm/frame.c
+    fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c fvwm/screen.h
+    fvwm/update.c fvwm/virtual.c fvwm/window_flags.h
+    libs/envvar.c libs/envvar.h modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: New upstream version
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+   Imported fvwm-2.5.12
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-16
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-16
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:51:43 CDT 2004
+Standard-date: 2004-10-01 07:51:43 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-16
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+   Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-14
@@ -0,0 +1,202 @@
+Revision: fvwm--devo--2.5--patch-14
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:28:06 CDT 2004
+Standard-date: 2004-10-01 06:28:06 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS acconfig.h
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-root.1
+    bin/fvwm-root.c config.h.in configure.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    fvwm/add_window.c fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/colorset.h
+    fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menus.c fvwm/menus.h fvwm/modconf.c
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/read.c fvwm/screen.h fvwm/session.c
+    fvwm/stack.c fvwm/style.c fvwm/style.h fvwm/virtual.c
+    fvwm/window_flags.h libs/Bindings.c libs/Bindings.h
+    libs/CombineChars.c libs/FEvent.c libs/FEvent.h
+    libs/FImage.c libs/FScreen.c libs/Fft.c libs/Ficonv.c
+    libs/Flocale.c libs/PictureUtils.c libs/System.c
+    libs/defaults.h libs/envvar.c libs/envvar.h
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    libs/gravity.h libs/vpacket.h libs/wcontext.h libs/wild.c
+    libs/wild.h modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm po/ChangeLog
+    sample.fvwmrc/system.fvwm2rc-sample-1 tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: New upstream release. See NEWS file for details
+Keywords: 
+
+New upstream release. See NEWS file for details
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+   New upstream release. See NEWS file for details
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+   Imported fvwm-2.5.11
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-12
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-12
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Sep 22 19:08:53 CDT 2004
+Standard-date: 2004-09-23 00:08:53 GMT
+Modified-files: fvwm/placement.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-12
+Summary: Added a fix to the placement problem thanks to Paul Vojta. This fix has also been accepted in upstream CVS.
+Keywords: 
+
+Added a fix to the placement problem thanks to Paul Vojta. This fix has also been accepted in upstream CVS.
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+   Added a fix to the placement problem thanks to Paul Vojta. This fix has also been accepted in upstream CVS.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--devo--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:55:58 CDT 2005
+Standard-date: 2005-05-19 03:55:58 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+Summary: fvwm--devo is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--devo
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-19
@@ -0,0 +1,16 @@
+Revision: fvwm--devo--2.5--patch-19
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Oct 26 17:27:52 CDT 2004
+Standard-date: 2004-10-26 22:27:52 GMT
+Modified-files: modules/FvwmScript/Scripts/FvwmScript-Setup95.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-19
+Summary: Fix kde detection (at least for recent kde)
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+   Fix kde detection (at least for recent kde)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-4
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 16:41:15 CDT 2004
+Standard-date: 2004-04-06 21:41:15 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-4
+Summary: Added support for Debian menus to the initial menu
+Keywords: 
+
+Added support for Debian menus to the initial menu
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+   Added support for Debian menus to the initial menu
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-6
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 17:48:18 CDT 2004
+Standard-date: 2004-04-06 22:48:18 GMT
+Modified-files: fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-6
+Summary: Hardcode /etc since the prefix is wrong for an installed version
+Keywords: 
+
+Hardcode /etc since the prefix is wrong for an installed version
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+   Hardcode /etc since the prefix is wrong for an installed version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,16 @@
+Revision: fvwm--devo--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 17:02:17 CST 2003
+Standard-date: 2003-11-25 23:02:17 GMT
+Removed-files: docs/.arch-ids/fvwm.lsm.id docs/fvwm.lsm
+    rpm/.arch-ids/fvwm.spec.id rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-2
+Summary: merge in changes in the debian branch
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+   Remoce autogenerated files that are removed on cleaning anyway
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-20
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-20
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 13:04:16 CST 2005
+Standard-date: 2005-03-17 19:04:16 GMT
+Modified-files: bin/fvwm-menu-desktop.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-20
+Summary: Fixed problems in manual pages.
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+   Fix incorrect manual page
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,123 @@
+Revision: fvwm--devo--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 14:08:31 CDT 2004
+Standard-date: 2004-04-06 19:08:31 GMT
+New-files: perllib/FVWM/Module/.arch-ids/Terminal.pm.id
+    perllib/FVWM/Module/Terminal.pm
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    acinclude.m4 aclocal.m4 bin/ChangeLog bin/Makefile.in
+    bin/fvwm-bug.in bin/fvwm-config.in bin/fvwm-convert-2.2
+    bin/fvwm-menu-desktop.in bin/fvwm-menu-directory.in
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    config.guess config.h.in config.sub configure configure.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in fvwm/Makefile.in fvwm/add_window.c
+    fvwm/add_window.h fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h
+    fvwm/ewmh_conf.c fvwm/ewmh_events.c fvwm/expand.c
+    fvwm/focus.c fvwm/functable.c fvwm/functions.c
+    fvwm/functions.h fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/icons.c fvwm/menus.c fvwm/menus.h fvwm/menustyle.c
+    fvwm/menustyle.h fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/placement.h
+    fvwm/schedule.c fvwm/screen.h fvwm/session.c fvwm/stack.c
+    fvwm/style.c fvwm/style.h fvwm/virtual.c libs/Bindings.c
+    libs/FImage.c libs/FScreen.c libs/FScreen.h
+    libs/Flocale.c libs/Flocale.h libs/Graphics.c
+    libs/Makefile.in libs/charmap.c libs/defaults.h
+    libs/gravity.c libs/gravity.h libs/wcontext.c
+    libs/wcontext.h modules/ChangeLog
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/findcmd.pl
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmCommand/scripts/ex-auto.pl
+    modules/FvwmCommand/scripts/ex-cascade.pl
+    modules/FvwmCommand/scripts/ex-grpmv.pl
+    modules/FvwmCommand/scripts/focus-Netscape.pl
+    modules/FvwmCommand/scripts/focus-link.pl
+    modules/FvwmCommand/scripts/push-away.pl
+    modules/FvwmCommand/scripts/test1.pl
+    modules/FvwmCommand/scripts/test2.sh
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-Quit
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Scripts/fvwm-script-setup95.pl
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScript/Widgets/Tools.c
+    modules/FvwmScript/Widgets/Tools.h
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/EventNames.pm
+    perllib/FVWM/Makefile.in perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Gtk.pm perllib/FVWM/Module/Gtk2.pm
+    perllib/FVWM/Module/Makefile.am
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/create-commands
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec.in sample.fvwmrc/Makefile.in
+    sample.fvwmrc/system.fvwm2rc-sample-95 tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/test_options utils/ChangeLog utils/Makefile.in
+    utils/build_dev.sh utils/configure_dev.sh
+    utils/fvwm_make_browse_menu.sh
+    utils/fvwm_make_directory_menu.sh
+    utils/quantize_pixmaps utils/rebuild_dev.sh
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: Synched with upstream version
+Keywords: 
+
+Synched with upstream version
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+   Imported fvwm-2.5.10.orig
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-21
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-21
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 17:23:52 CST 2005
+Standard-date: 2005-03-17 23:23:52 GMT
+Modified-files: acinclude.m4 bin/fvwm-root.c configure
+    libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-21
+Summary: Refreshed changes from the autotools branch.
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+   Typo fix
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+   Typo fix
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+   Try to make configure detect gdk-imlib 1.9.14.
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+   Refresh configure after the nre acinclude.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-11
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Aug 13 22:40:26 CDT 2004
+Standard-date: 2004-08-14 03:40:26 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-11
+Summary: Refreshed libs/FImage.c from CVS to fix taskbar and buttons crash when handling remote displays
+Keywords: 
+
+Refreshed libs/FImage.c from CVS to fix taskbar and buttons crash when handling remote displays
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+   Refreshed libs/FImage.c from CVS to fix taskbar and buttons crash when handling remote displays
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-17
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-17
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 03:04:03 CDT 2004
+Standard-date: 2004-10-01 08:04:03 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-17
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+   Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
@@ -0,0 +1,60 @@
+Revision: fvwm--devo--2.5--patch-8
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:38:32 CDT 2004
+Standard-date: 2004-04-19 08:38:32 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    config.guess config.h.in config.sub configure
+    docs/Makefile.in fvwm/Makefile.in libs/Makefile.in
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-8
+Summary: Refreshed autotools
+Keywords: 
+
+Refreshed autotools
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+   Refreshed autotools
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-13
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-13
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Sep 22 19:40:38 CDT 2004
+Standard-date: 2004-09-23 00:40:38 GMT
+Modified-files: fvwm/events.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-13
+Summary: eactivate excessive DEBUG logging of placement.
+Keywords: 
+
+eactivate excessive DEBUG logging of placement.
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+   eactivate excessive DEBUG logging of placement.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--devo--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 13:50:20 CST 2003
+Standard-date: 2003-11-25 19:50:20 GMT
+Modified-files: modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+New-patches: srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+Summary: Merged in the terminal emulator changes required by policy
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+   Changed the hard-coded xterm into x-terminal-emulator as per Debian policy
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-5
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Apr  6 17:13:58 CDT 2004
+Standard-date: 2004-04-06 22:13:58 GMT
+Modified-files: fvwm/ConfigFvwmSetup fvwm/fvwm.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-5
+Summary: Add support for per user update-menu entry.
+Keywords: 
+
+Add support for per user update-menu entry.
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+   Add support for per user update-menu entry.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,22 @@
+Revision: fvwm--devo--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:19 CDT 2005
+Standard-date: 2005-07-08 01:05:19 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+   * Updated FAQ.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:47 CDT 2005
+Standard-date: 2005-07-08 05:25:47 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+   * Fixed some FvwmIconMan flickering
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,51 @@
+Revision: fvwm--devo--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:18 CDT 2005
+Standard-date: 2005-07-08 05:43:18 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+   * FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,43 @@
+Revision: fvwm--devo--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:38 CDT 2005
+Standard-date: 2005-07-08 05:35:38 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:10 CDT 2005
+Standard-date: 2005-07-08 05:25:10 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+   * Small session management fixes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:32 CDT 2005
+Standard-date: 2005-07-08 05:44:32 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+   * NEWS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-59
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-59
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-59
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 01:06:33 CDT 2005
+Standard-date: 2005-07-09 06:06:33 GMT
+Modified-files: libs/FBidi.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-59
+Summary: The correct spelling of the CPP var is FRIBIDI_CHAR_SET_NOT_FOUND
+Keywords: 
+
+The correct spelling of the CPP var is FRIBIDI_CHAR_SET_NOT_FOUND
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+   The correct spelling is FRIBIDI_CHAR_SET_NOT_FOUND
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:41 CDT 2005
+Standard-date: 2005-07-08 05:49:41 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+   * Dominik Vogt: fixed drawing of relief with very small rectangles
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-62
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-62
@@ -0,0 +1,180 @@
+Revision: fvwm--devo--2.5--patch-62
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:27:04 CDT 2005
+Standard-date: 2005-07-18 17:27:04 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.sub configure
+    configure.in depcomp docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/Makefile.in fvwm/Makefile.in
+    install-sh libs/Makefile.in missing mkinstalldirs
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Synchronize with 2.5.13 release
+Keywords: 
+
+Synchronize with 2.5.13 release
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+   Synchronize with release 2.5.13
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+   Synchronize with release 2.5.13
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+   Synchronize with release 2.5.13
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+   Imported fvwm-2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-58
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-58
@@ -0,0 +1,59 @@
+Revision: fvwm--devo--2.5--patch-58
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:14:29 CDT 2005
+Standard-date: 2005-07-08 07:14:29 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-58
+Summary: regenerate autoconf files by running autorecong
+Keywords: 
+
+regenerate autoconf files by running autorecong
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+   regenerate autoconf files by running autorecong
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:52 CDT 2005
+Standard-date: 2005-07-08 01:05:52 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+Summary: Synch with all branches
+Keywords: 
+
+Synch with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:37 CDT 2005
+Standard-date: 2005-07-08 05:31:37 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+   update news
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:35 CDT 2005
+Standard-date: 2005-07-08 05:19:35 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+   * Try to clarify TipsJustification IconMan option
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-64
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-64
@@ -0,0 +1,17 @@
+Revision: fvwm--devo--2.5--patch-64
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 15:56:02 CDT 2005
+Standard-date: 2005-07-19 20:56:02 GMT
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-64
+Summary: Upgrade to released version.
+Keywords: 
+
+Upgrade to released version.
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+   Synchronize with release 2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:03 CDT 2005
+Standard-date: 2005-07-08 05:31:03 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+   * fvwm/bindings.c (ParseBinding)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-65
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-65
@@ -0,0 +1,68 @@
+Revision: fvwm--devo--2.5--patch-65
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:33:00 CDT 2005
+Standard-date: 2005-07-20 02:33:00 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog bin/fvwm-root.c
+    configure.in fvwm/add_window.c fvwm/colorset.c
+    fvwm/decorations.c fvwm/ewmh.c fvwm/ewmh_icons.c
+    fvwm/ewmh_names.c fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c
+    fvwm/icccm2.c fvwm/move_resize.c fvwm/session.c
+    libs/FTips.c libs/FTips.h libs/FlocaleCharset.c
+    libs/Target.c libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h po/FvwmTaskBar.ar.gmo
+    po/FvwmTaskBar.fr.gmo tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+   * Updated for 2.5.14.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+   * Fixed compile problem (don't use rintf() as it's C99).
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+   * 64-bit fixes by Dominik
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+   actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,63 @@
+Revision: fvwm--devo--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:56:18 CDT 2005
+Standard-date: 2005-05-19 03:56:18 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,38 @@
+Revision: fvwm--devo--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:57 CDT 2005
+Standard-date: 2005-07-08 05:43:57 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+   * A little clean-up.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:23:10 CDT 2005
+Standard-date: 2005-07-08 01:23:10 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+   * Really commit EWMHUseStackingOrderHints documentation update
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-66
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-66
@@ -0,0 +1,42 @@
+Revision: fvwm--devo--2.5--patch-66
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:54:25 CDT 2005
+Standard-date: 2005-07-20 02:54:25 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+   Synch with upstream CVS
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+   Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:57 CDT 2005
+Standard-date: 2005-07-08 05:23:57 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+   * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:09:41 CDT 2005
+Standard-date: 2005-07-08 01:09:41 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: Synch with all branches fvwm--upstream--2.5--patch-7
+Keywords: 
+
+Synch with all branches fvwm--upstream--2.5--patch-7
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+   * Fixed CopyToken delimiter parsing.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-69
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-69
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-69
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:56:32 CDT 2005
+Standard-date: 2005-08-25 20:56:32 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+   Synch with upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:21:20 CDT 2005
+Standard-date: 2005-07-08 01:21:20 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+   * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:53 CDT 2005
+Standard-date: 2005-07-08 05:45:53 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:02:50 CDT 2005
+Standard-date: 2005-07-08 01:02:50 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+   * Allow whitespace before commas in WindowList options.  May affect other
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:35 CDT 2005
+Standard-date: 2005-07-08 01:18:35 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+   * Fixed aborting move/resize with the mouse.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:41 CDT 2005
+Standard-date: 2005-07-08 05:20:41 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+   * ButtonStyle Reset takes effect immediately.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:08 CDT 2005
+Standard-date: 2005-07-08 01:17:08 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+   * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,36 @@
+Revision: fvwm--devo--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:14 CDT 2005
+Standard-date: 2005-07-08 05:33:14 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+   2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:08:34 CDT 2005
+Standard-date: 2005-07-08 01:08:34 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+Summary: Synch with all branches
+Keywords: 
+
+Synch with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:07:17 CDT 2005
+Standard-date: 2005-07-08 01:07:17 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+Summary: Synch with all branches
+Keywords: 
+
+Synch with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,106 @@
+Revision: fvwm--devo--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:06:48 CDT 2005
+Standard-date: 2005-07-08 07:06:48 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+   Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,39 @@
+Revision: fvwm--devo--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:10 CDT 2005
+Standard-date: 2005-07-08 05:23:10 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+   * FAQ (1.7)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:28 CDT 2005
+Standard-date: 2005-07-08 05:48:28 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+   * Dominik Vogt
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:36:52 CDT 2005
+Standard-date: 2005-07-08 05:36:52 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+   * fvwm/fvwm.1.in (Example)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:14 CDT 2005
+Standard-date: 2005-07-08 05:47:14 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+   * Fixed interective resize (reduction) via the bottom border
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:11 CDT 2005
+Standard-date: 2005-07-08 01:19:11 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+   * Fixed endless loop in DeIconify().
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:17:06 CDT 2005
+Standard-date: 2005-07-08 05:17:06 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+   /tmp/f
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:04 CDT 2005
+Standard-date: 2005-07-08 05:20:04 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+   * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,101 @@
+Revision: fvwm--devo--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:00:07 CDT 2005
+Standard-date: 2005-07-08 01:00:07 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+Summary: Sych with all branches
+Keywords: 
+
+Sych with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+   New upstream release. See NEWS file for details
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+   New upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+   fvwm--autotools is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--autotools
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+   Synched with upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+   New upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+   fvwm--debian is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--debian
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+   New upstream release. See NEWS file for details
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+   Typo fix
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+   Typo fix
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+   New upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+   fvwm--mips-fix is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--mips-fix
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+   upgrade to version 2.5.10
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+   New upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+   New upstream version
+
+ * srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+   fvwm--terminal-emulator is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--terminal-emulator
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,19 @@
+Revision: fvwm--devo--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:42:18 CDT 2005
+Standard-date: 2005-07-08 05:42:18 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:32:16 CDT 2005
+Standard-date: 2005-07-08 05:32:16 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:30:23 CDT 2005
+Standard-date: 2005-07-08 05:30:23 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+   * Fixed my previous commit
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-68
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-68
@@ -0,0 +1,179 @@
+Revision: fvwm--devo--2.5--patch-68
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:20:46 CDT 2005
+Standard-date: 2005-08-25 20:20:46 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in depcomp docs/ANNOUNCE
+    docs/ChangeLog docs/Makefile.in fvwm/Makefile.in
+    fvwm/conditional.c fvwm/ewmh_events.c fvwm/fvwm.1.in
+    fvwm/session.c fvwm/virtual.c install-sh libs/Makefile.in
+    missing modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Synch with new autotools
+Keywords: 
+
+Synch with new autotools
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+   Synch with new upstream
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+   Imported fvwm-2.5.14
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:01:47 CDT 2005
+Standard-date: 2005-07-08 01:01:47 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+Summary: Sych with all branches
+Keywords: 
+
+Sych with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,37 @@
+Revision: fvwm--devo--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:53 CDT 2005
+Standard-date: 2005-07-08 05:47:53 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+   apply 64-bit patch for perllib by Viktor Griph
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,53 @@
+Revision: fvwm--devo--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:51:59 CDT 2005
+Standard-date: 2005-07-08 00:51:59 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Summary: Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Keywords: 
+
+Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+   Sych with fvwm--upstream--2.5--base-0
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+   Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+   Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+   Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,36 @@
+Revision: fvwm--devo--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:53 CDT 2005
+Standard-date: 2005-07-08 01:19:53 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+   * Fixed crashes and bugs in handling of the root window / other unmanaged
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,21 @@
+Revision: fvwm--devo--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:57:26 CDT 2005
+Standard-date: 2005-07-08 00:57:26 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+   * Fixed "random" wire frame position during move/resize.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:47 CDT 2005
+Standard-date: 2005-07-08 05:33:47 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+   * Fixed circulate crash.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:45 CDT 2005
+Standard-date: 2005-07-08 01:20:45 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+   * Fixed ALT-Move to disable snapping.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-67
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-67
@@ -0,0 +1,200 @@
+Revision: fvwm--devo--2.5--patch-67
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 20:34:56 CDT 2005
+Standard-date: 2005-08-09 01:34:56 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog NEWS configure.in docs/ANNOUNCE
+    docs/FAQ fvwm/add_window.c fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/focus.c
+    fvwm/fvwm.c fvwm/geometry.c fvwm/gnome.c fvwm/icons.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/module_interface.c fvwm/stack.c
+    fvwm/style.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/Colorset.c libs/Strings.c
+    libs/vpacket.h modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Synch with upstream branch
+Keywords: 
+
+Synch with upstream branch
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+   Synch with upstream branch
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+   Synch with upstream branch
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+   Synch with upstream branch
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+   Synch with upstream branch
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+   * FvwmPerl: support window context in "preprocess" action
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+   * Fixed hang when a gnome application requests a layer < 0.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+   * NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+   * Fixed aspect pixmap size calculations.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+   * Fixed bogus "ewmh_WMIconGeometry" warning message.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+   * Dominik: fixed select/focus button state lost when deiconifying a window
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+   * Minor cleanup.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+   * Fixed hang in button grabbing code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+   * Updated NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+   * Minor update.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+   * Added check for supported system architectures.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+   * Use the new logo in FvwmBanner.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+   * Fixed a memory leak in style merging, tweaked and simplified the code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+   * Two menu fixes by  ViktorGriph.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+   Added FvwmProxy option ProxyIconified
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+   Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:14 CDT 2005
+Standard-date: 2005-07-08 05:45:14 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+   * FvwmScript/FvwmScript.1.in (following)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-60
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-60
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-60
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 08:58:41 CDT 2005
+Standard-date: 2005-07-09 13:58:41 GMT
+Modified-files: fvwm/ConfigFvwmSetup
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-60
+Summary: Fix default styles to allow openoffice impress to work in full screen mode
+Keywords: 
+
+Fix default styles to allow openoffice impress to work in full screen mode
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+   Add to default styles to make openoffice behave sensibly
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:06:55 CDT 2005
+Standard-date: 2005-07-08 01:06:55 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+   * Fixed MoveToPage w/o argument.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-61
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-61
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-61
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:18:53 CDT 2005
+Standard-date: 2005-07-09 20:18:53 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+   fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:51 CDT 2005
+Standard-date: 2005-07-08 01:17:51 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+   * Do not lock a submenu menu item if it's clicked on but the submenu does not
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,35 @@
+Revision: fvwm--devo--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:05 CDT 2005
+Standard-date: 2005-07-08 05:49:05 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:39 CDT 2005
+Standard-date: 2005-07-08 05:46:39 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,46 @@
+Revision: fvwm--devo--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:38:06 CDT 2005
+Standard-date: 2005-07-08 05:38:06 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+   * FAQ
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,45 @@
+Revision: fvwm--devo--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:22:01 CDT 2005
+Standard-date: 2005-07-08 01:22:01 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+   * Added a set of functions for implementing tool tips
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:04:25 CDT 2005
+Standard-date: 2005-07-08 01:04:25 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+Summary: Synch with all branches
+Keywords: 
+
+Synch with all branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:08:06 CDT 2005
+Standard-date: 2005-07-08 01:08:06 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+   * Fixed compiling FvwmCommand.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:22 CDT 2005
+Standard-date: 2005-07-08 05:34:22 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+   * FAQ (3.23): Typo.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:55 CDT 2005
+Standard-date: 2005-07-08 05:34:55 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+   * fvwm/fvwm.1.in (Focus): Typos in focus section.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--devo--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:18:15 CDT 2005
+Standard-date: 2005-07-08 00:18:15 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+   fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,34 @@
+Revision: fvwm--devo--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:32 CDT 2005
+Standard-date: 2005-07-08 05:24:32 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+   Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+   * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-63
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-63
@@ -0,0 +1,59 @@
+Revision: fvwm--devo--2.5--patch-63
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:28:59 CDT 2005
+Standard-date: 2005-07-18 17:28:59 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-63
+Summary: Re run autoconf and friends to regenerate the Makefiles and so on
+Keywords: 
+
+Re run autoconf and friends to regenerate the Makefiles and so on
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+   Re run autoconf and friends to regenerate the Makefiles and so on
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,20 @@
+Revision: fvwm--devo--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:01:14 CDT 2005
+Standard-date: 2005-07-08 01:01:14 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+   * Fixed positioning of shaped windows on pages other than 0 0.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,493 @@
+Revision: fvwm--devo--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:34 CDT 2006
+Standard-date: 2006-08-06 20:33:34 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Continuation-of: srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-5
+Summary: tag of srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-5
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,21 @@
+Revision: fvwm--devo--2.5.17--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:34:50 CDT 2006
+Standard-date: 2006-08-06 21:34:50 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+   Sync
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+   Sync
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,22 @@
+Revision: fvwm--devo--2.5.17--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Aug  8 20:10:59 CDT 2006
+Standard-date: 2006-08-09 01:10:59 GMT
+Modified-files: libs/FlocaleCharset.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-3
+Summary: Synch with minor local fix.
+Keywords: 
+
+Synch with minor local fix.
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-2
+   Support local character sets
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+   Support local character sets
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,169 @@
+Revision: fvwm--devo--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:19:57 CDT 2006
+Standard-date: 2006-08-06 21:19:57 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS README
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1 bin/fvwm-bug.in
+    bin/fvwm-config.1 bin/fvwm-config.1.in
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.1.in
+    config.h.in configure configure.ac docs/ANNOUNCE
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ fvwm/ConfigFvwmSetup
+    fvwm/add_window.c fvwm/builtins.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh_events.c
+    fvwm/expand.c fvwm/focus.c fvwm/focus.h fvwm/frame.c
+    fvwm/functable.c fvwm/functions.c fvwm/fvwm.1.in
+    fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c fvwm/menuitem.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+   Imported fvwm-2.5.17
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,470 @@
+Revision: fvwm--devo--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:59:02 CST 2006
+Standard-date: 2006-01-22 05:59:02 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Continuation-of: srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+Summary: tag of srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,19 @@
+Revision: fvwm--devo--2.5.16--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 11:22:54 CST 2006
+Standard-date: 2006-01-22 17:22:54 GMT
+Modified-files: configure configure.ac fvwm/Makefile.in
+    modules/FvwmTabs/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-4
+Summary: Regenerated with new auto tools
+Keywords: 
+
+Regenerated with new auto tools
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+   Regenerated with new auto tools
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,29 @@
+Revision: fvwm--devo--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:33:04 CST 2006
+Standard-date: 2006-01-22 06:33:04 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+   Synch with upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5.16--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 01:29:42 CST 2006
+Standard-date: 2006-01-22 07:29:42 GMT
+Modified-files: configure
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-3
+Summary: refix imlib detection
+Keywords: 
+
+refix imlib detection
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+   Fix the imlib detection again
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,181 @@
+Revision: fvwm--devo--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:24:58 CST 2006
+Standard-date: 2006-01-22 06:24:58 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/Makefile.in
+    fvwm/Makefile.am fvwm/Makefile.in fvwm/add_window.c
+    fvwm/bindings.c fvwm/borders.c fvwm/conditional.c
+    fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+   Imported fvwm-2.5.16
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.16/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,43 @@
+Revision: fvwm--devo--2.5.16--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:17:49 CST 2006
+Standard-date: 2006-02-08 00:17:49 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+   Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,509 @@
+Revision: fvwm--devo--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:24 CDT 2006
+Standard-date: 2006-09-12 03:29:24 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--debian--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--2003-primary/fvwm--devo--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--mips-fix--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--debian--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-2
+    srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--devo--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-4
+    srivasta@debian.org--etch/fvwm--devo--2.5.16--patch-5
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Continuation-of: srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-3
+Summary: tag of srivasta@debian.org--etch/fvwm--devo--2.5.17--patch-3
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5.18--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Nov 10 23:36:17 CST 2006
+Standard-date: 2006-11-11 05:36:17 GMT
+Modified-files: bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-3
+    srivasta@debian.org--etch/fvwm--devo--2.5.18--patch-4
+Summary: improved dir name escaping.
+Keywords: 
+
+improved dir name escaping.
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-3
+   Improve escaping of directory names.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5.18--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 00:48:28 CDT 2006
+Standard-date: 2006-09-12 05:48:28 GMT
+Modified-files: configure
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.18--patch-2
+Summary: Refresh autotools files.
+Keywords: 
+
+Refresh autotools files.
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-2
+   Refresh autotools files.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,18 @@
+Revision: fvwm--devo--2.5.18--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 01:21:03 CDT 2006
+Standard-date: 2006-09-12 06:21:03 GMT
+Modified-files: libs/FlocaleCharset.c
+New-patches: srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-2
+    srivasta@debian.org--etch/fvwm--devo--2.5.18--patch-3
+Summary: Fix sigsegv when starting with a locale Xlib does not like.
+Keywords: 
+
+Fix sigsegv when starting with a locale Xlib does not like.
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-2
+   Fix sigsegv at startup with bad locale
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--devo/fvwm--devo--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,116 @@
+Revision: fvwm--devo--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 00:28:19 CDT 2006
+Standard-date: 2006-09-12 05:28:19 GMT
+Modified-files: ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 utils/ChangeLog
+    utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--debian--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--devo--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: Synch with upstream and other branches
+Keywords: 
+
+Synch with upstream and other branches
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-1
+   Sync with upstream
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--debian--2.5.17--patch-3
+
+ * srivasta@debian.org--etch/fvwm--debian--2.5.18--patch-1
+   Sync with upstream
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--mips-fix--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--mips-fix--2.5.18--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--patch-1
+   Synch with upstream
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+   New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,163 @@
+Revision: fvwm--terminal-emulator--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:45 CDT 2006
+Standard-date: 2006-08-06 20:33:45 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Continuation-of: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+Summary: tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,146 @@
+Revision: fvwm--terminal-emulator--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:31:55 CDT 2006
+Standard-date: 2006-08-06 21:31:55 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS README
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1 bin/fvwm-bug.in
+    bin/fvwm-config.1 bin/fvwm-config.1.in
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.1.in
+    config.h.in configure configure.ac docs/ANNOUNCE
+    docs/COMMANDS docs/CONVENTIONS docs/ChangeLog
+    docs/DEVELOPERS docs/FAQ docs/fvwm.lsm
+    fvwm/ConfigFvwmSetup fvwm/add_window.c fvwm/builtins.c
+    fvwm/commands.h fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/focus.c
+    fvwm/focus.h fvwm/frame.c fvwm/functable.c
+    fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/gnome.c fvwm/menuitem.c fvwm/menus.c
+    fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 perllib/ChangeLog
+    perllib/FVWM/Commands.pm perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Sync
+Keywords: 
+
+Sync
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+   Imported fvwm-2.5.17
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,157 @@
+Revision: fvwm--terminal-emulator--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:59:09 CST 2006
+Standard-date: 2006-01-22 05:59:09 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Continuation-of: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+Summary: tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,27 @@
+Revision: fvwm--terminal-emulator--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:16:23 CST 2006
+Standard-date: 2006-02-08 00:16:23 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+   Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,166 @@
+Revision: fvwm--terminal-emulator--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:31:24 CST 2006
+Standard-date: 2006-01-22 06:31:24 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure debian/ChangeLog debian/Makefile.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.am
+    fvwm/Makefile.in fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+   Imported fvwm-2.5.16
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,167 @@
+Revision: fvwm--terminal-emulator--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:34 CDT 2006
+Standard-date: 2006-09-12 03:29:34 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Continuation-of: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+Summary: tag of srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.17--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,84 @@
+Revision: fvwm--terminal-emulator--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 00:19:48 CDT 2006
+Standard-date: 2006-09-12 05:19:48 GMT
+Modified-files: ChangeLog NEWS acinclude.m4 bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog docs/fvwm.lsm
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 rpm/fvwm.spec
+    utils/ChangeLog utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+   New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,11 @@
+Revision: fvwm--terminal-emulator--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 12:57:02 CST 2003
+Standard-date: 2003-11-25 18:57:02 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--terminal-emulator--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:57:03 CDT 2005
+Standard-date: 2005-05-19 03:57:03 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+Summary: fvwm--terminal-emulator is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--terminal-emulator
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
@@ -0,0 +1,59 @@
+Revision: fvwm--terminal-emulator--2.5--patch-4
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 11:05:14 CDT 2004
+Standard-date: 2004-10-06 16:05:14 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/fvwm.lsm fvwm/add_window.c
+    fvwm/builtins.c fvwm/commands.h fvwm/events.c
+    fvwm/frame.c fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/screen.h fvwm/update.c fvwm/virtual.c
+    fvwm/window_flags.h libs/envvar.c libs/envvar.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: New upstream version
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+   Imported fvwm-2.5.12
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,129 @@
+Revision: fvwm--terminal-emulator--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:00:22 CDT 2004
+Standard-date: 2004-10-01 07:00:22 GMT
+New-files: debian/.arch-ids/conffiles.id
+    debian/.arch-ids/copyright.id debian/.arch-ids/prerm.id
+    debian/conffiles debian/copyright debian/prerm
+    perllib/FVWM/Module/.arch-ids/Terminal.pm.id
+    perllib/FVWM/Module/Terminal.pm
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    acinclude.m4 aclocal.m4 bin/ChangeLog bin/Makefile.in
+    bin/fvwm-bug.in bin/fvwm-config.in bin/fvwm-convert-2.2
+    bin/fvwm-menu-desktop.in bin/fvwm-menu-directory.in
+    bin/fvwm-menu-headlines.1 bin/fvwm-menu-headlines.in
+    config.guess config.h.in config.sub configure configure.in
+    debian/ChangeLog debian/Makefile.am debian/Makefile.in
+    debian/control.in debian/docs debian/fvwm.menu
+    debian/postinst debian/postrm docs/ANNOUNCE
+    docs/ChangeLog docs/DEVELOPERS docs/FAQ docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/add_window.c
+    fvwm/add_window.h fvwm/bindings.c fvwm/borders.c
+    fvwm/builtins.c fvwm/colorset.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh.c fvwm/ewmh.h
+    fvwm/ewmh_conf.c fvwm/ewmh_events.c fvwm/expand.c
+    fvwm/focus.c fvwm/functable.c fvwm/functions.c
+    fvwm/functions.h fvwm/fvwm.1.in fvwm/fvwm.c fvwm/fvwm.h
+    fvwm/icons.c fvwm/menus.c fvwm/menus.h fvwm/menustyle.c
+    fvwm/menustyle.h fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/placement.h
+    fvwm/schedule.c fvwm/screen.h fvwm/session.c fvwm/stack.c
+    fvwm/style.c fvwm/style.h fvwm/virtual.c libs/Bindings.c
+    libs/FImage.c libs/FScreen.c libs/FScreen.h
+    libs/Flocale.c libs/Flocale.h libs/Graphics.c
+    libs/Makefile.in libs/charmap.c libs/defaults.h
+    libs/gravity.c libs/gravity.h libs/wcontext.c
+    libs/wcontext.h modules/ChangeLog
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/findcmd.pl
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmCommand/scripts/ex-auto.pl
+    modules/FvwmCommand/scripts/ex-cascade.pl
+    modules/FvwmCommand/scripts/ex-grpmv.pl
+    modules/FvwmCommand/scripts/focus-Netscape.pl
+    modules/FvwmCommand/scripts/focus-link.pl
+    modules/FvwmCommand/scripts/push-away.pl
+    modules/FvwmCommand/scripts/test1.pl
+    modules/FvwmCommand/scripts/test2.sh
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-Quit
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Scripts/fvwm-script-setup95.pl
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScript/Widgets/Tools.c
+    modules/FvwmScript/Widgets/Tools.h
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/EventNames.pm
+    perllib/FVWM/Makefile.in perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Gtk.pm perllib/FVWM/Module/Gtk2.pm
+    perllib/FVWM/Module/Makefile.am
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/create-commands
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec rpm/fvwm.spec.in sample.fvwmrc/Makefile.in
+    sample.fvwmrc/system.fvwm2rc-sample-95 tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/test_options utils/ChangeLog utils/Makefile.in
+    utils/build_dev.sh utils/configure_dev.sh
+    utils/fvwm_make_browse_menu.sh
+    utils/fvwm_make_directory_menu.sh
+    utils/quantize_pixmaps utils/rebuild_dev.sh
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: upgrade to version 2.5.10
+Keywords: 
+
+upgrade to version 2.5.10
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+   Imported fvwm-2.5.10.orig
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,198 @@
+Revision: fvwm--terminal-emulator--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:02:50 CDT 2004
+Standard-date: 2004-10-01 07:02:50 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS acconfig.h
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-root.1
+    bin/fvwm-root.c config.h.in configure.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/fvwm.lsm fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/builtins.c fvwm/colorset.c
+    fvwm/colorset.h fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menuitem.h fvwm/menus.c fvwm/menus.h
+    fvwm/modconf.c fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/read.c
+    fvwm/screen.h fvwm/session.c fvwm/stack.c fvwm/style.c
+    fvwm/style.h fvwm/virtual.c fvwm/window_flags.h
+    libs/Bindings.c libs/Bindings.h libs/CombineChars.c
+    libs/FEvent.c libs/FEvent.h libs/FImage.c libs/FScreen.c
+    libs/Fft.c libs/Ficonv.c libs/Flocale.c
+    libs/PictureUtils.c libs/System.c libs/defaults.h
+    libs/envvar.c libs/envvar.h libs/fvwmlib.h
+    libs/fvwmsignal.c libs/fvwmsignal.h libs/gravity.h
+    libs/vpacket.h libs/wcontext.h libs/wild.c libs/wild.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm po/ChangeLog
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc-sample-1
+    tests/ChangeLog tests/hints/hints_test.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: New upstream version
+Keywords: 
+
+New upstream version
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+   Imported fvwm-2.5.11
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,15 @@
+Revision: fvwm--terminal-emulator--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Nov 25 13:49:52 CST 2003
+Standard-date: 2003-11-25 19:49:52 GMT
+Modified-files: modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+Summary: Changed the hard-coded xterm into x-terminal-emulator as per Debian policy
+Keywords: 
+
+Also in keeping with Debian policy, change the option --title to -T,
+and removed the --name option. Changed the man page to document the
+Debian specific change.
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,17 @@
+Revision: fvwm--terminal-emulator--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:16:38 CDT 2005
+Standard-date: 2005-07-08 01:16:38 GMT
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:53 CDT 2005
+Standard-date: 2005-07-08 05:33:53 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+   * Fixed circulate crash.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:47 CDT 2005
+Standard-date: 2005-07-08 05:46:47 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+   * Fixed interective resize (reduction) via the bottom border
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:07 CDT 2005
+Standard-date: 2005-07-08 05:44:07 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+   * NEWS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,20 @@
+Revision: fvwm--terminal-emulator--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:24 CDT 2005
+Standard-date: 2005-07-08 05:33:24 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+   2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:59 CDT 2005
+Standard-date: 2005-07-08 05:47:59 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+   * Dominik Vogt
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,180 @@
+Revision: fvwm--terminal-emulator--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:50:17 CDT 2005
+Standard-date: 2005-08-09 00:50:17 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog NEWS configure.in docs/ANNOUNCE
+    docs/FAQ fvwm/add_window.c fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/focus.c
+    fvwm/fvwm.c fvwm/geometry.c fvwm/gnome.c fvwm/icons.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/module_interface.c fvwm/stack.c
+    fvwm/style.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/Colorset.c libs/Strings.c
+    libs/vpacket.h modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Synch with upstream branch
+Keywords: 
+
+Synch with upstream branch
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+   * FvwmPerl: support window context in "preprocess" action
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+   * Fixed hang when a gnome application requests a layer < 0.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+   * NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+   * Fixed aspect pixmap size calculations.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+   * Fixed bogus "ewmh_WMIconGeometry" warning message.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+   * Dominik: fixed select/focus button state lost when deiconifying a window
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+   * Minor cleanup.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+   * Fixed hang in button grabbing code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+   * Updated NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+   * Minor update.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+   * Added check for supported system architectures.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+   * Use the new logo in FvwmBanner.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+   * Fixed a memory leak in style merging, tweaked and simplified the code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+   * Two menu fixes by  ViktorGriph.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+   Added FvwmProxy option ProxyIconified
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+   Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:21 CDT 2005
+Standard-date: 2005-07-08 01:17:21 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+   * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,27 @@
+Revision: fvwm--terminal-emulator--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:46 CDT 2005
+Standard-date: 2005-07-08 05:35:46 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:19 CDT 2005
+Standard-date: 2005-07-08 05:25:19 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+   * Small session management fixes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:05 CDT 2005
+Standard-date: 2005-07-08 05:35:05 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+   * fvwm/fvwm.1.in (Focus): Typos in focus section.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,20 @@
+Revision: fvwm--terminal-emulator--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:57:25 CDT 2005
+Standard-date: 2005-05-19 03:57:25 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,21 @@
+Revision: fvwm--terminal-emulator--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:27 CDT 2005
+Standard-date: 2005-07-08 05:47:27 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+   apply 64-bit patch for perllib by Viktor Griph
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:04 CDT 2005
+Standard-date: 2005-07-08 05:24:04 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+   * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:44 CDT 2005
+Standard-date: 2005-07-08 05:31:44 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+   update news
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:57 CDT 2005
+Standard-date: 2005-07-08 01:20:57 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+   * Fixed ALT-Move to disable snapping.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:22:45 CDT 2005
+Standard-date: 2005-07-08 05:22:45 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+   * ButtonStyle Reset takes effect immediately.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:11 CDT 2005
+Standard-date: 2005-07-08 05:49:11 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+   * Dominik Vogt: fixed drawing of relief with very small rectangles
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:07:57 CDT 2005
+Standard-date: 2005-07-08 01:07:57 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+   * Fixed compiling FvwmCommand.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:16:39 CDT 2005
+Standard-date: 2005-07-08 05:16:39 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+   * Really commit EWMHUseStackingOrderHints documentation update
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:30:38 CDT 2005
+Standard-date: 2005-07-08 05:30:38 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+   * Fixed my previous commit
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:21:29 CDT 2005
+Standard-date: 2005-07-08 01:21:29 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+   * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:32 CDT 2005
+Standard-date: 2005-07-08 05:37:32 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+   * FAQ
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,20 @@
+Revision: fvwm--terminal-emulator--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:13 CDT 2005
+Standard-date: 2005-07-08 01:20:13 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+   * Fixed crashes and bugs in handling of the root window / other unmanaged
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:42 CDT 2005
+Standard-date: 2005-07-08 01:18:42 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+   * Fixed aborting move/resize with the mouse.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,175 @@
+Revision: fvwm--terminal-emulator--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:55:07 CDT 2005
+Standard-date: 2005-08-25 20:55:07 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/conditional.c
+    fvwm/ewmh_events.c fvwm/fvwm.1.in fvwm/session.c
+    fvwm/virtual.c install-sh libs/Makefile.in missing
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+   Imported fvwm-2.5.14
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:11 CDT 2005
+Standard-date: 2005-07-08 05:31:11 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+   * fvwm/bindings.c (ParseBinding)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,52 @@
+Revision: fvwm--terminal-emulator--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:29:15 CDT 2005
+Standard-date: 2005-07-20 02:29:15 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog bin/fvwm-root.c
+    configure.in fvwm/add_window.c fvwm/colorset.c
+    fvwm/decorations.c fvwm/ewmh.c fvwm/ewmh_icons.c
+    fvwm/ewmh_names.c fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c
+    fvwm/icccm2.c fvwm/move_resize.c fvwm/session.c
+    libs/FTips.c libs/FTips.h libs/FlocaleCharset.c
+    libs/Target.c libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h po/FvwmTaskBar.ar.gmo
+    po/FvwmTaskBar.fr.gmo tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+   * Updated for 2.5.14.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+   * Fixed compile problem (don't use rintf() as it's C99).
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+   * 64-bit fixes by Dominik
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+   actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:38 CDT 2005
+Standard-date: 2005-07-08 05:44:38 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+   * FvwmScript/FvwmScript.1.in (following)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:16:38 CDT 2005
+Standard-date: 2005-07-09 20:16:38 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+   fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:11 CDT 2005
+Standard-date: 2005-07-08 05:19:11 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+   /tmp/f
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:42 CDT 2005
+Standard-date: 2005-07-08 05:24:42 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+   * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:29:51 CDT 2005
+Standard-date: 2005-07-08 05:29:51 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+   * Fixed some FvwmIconMan flickering
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:02:40 CDT 2005
+Standard-date: 2005-07-08 01:02:40 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+   * Allow whitespace before commas in WindowList options.  May affect other
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:05 CDT 2005
+Standard-date: 2005-07-08 05:46:05 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:19 CDT 2005
+Standard-date: 2005-07-08 05:37:19 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+   * fvwm/fvwm.1.in (Example)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:29 CDT 2005
+Standard-date: 2005-07-08 05:34:29 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+   * FAQ (3.23): Typo.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:06:46 CDT 2005
+Standard-date: 2005-07-08 01:06:46 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+   * Fixed MoveToPage w/o argument.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,169 @@
+Revision: fvwm--terminal-emulator--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:13:23 CDT 2005
+Standard-date: 2005-07-18 17:13:23 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.in
+    install-sh libs/Makefile.in missing mkinstalldirs
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Synchronize with release 2.5.13
+Keywords: 
+
+Synchronize with release 2.5.13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+   Imported fvwm-2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,21 @@
+Revision: fvwm--terminal-emulator--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:53:47 CDT 2005
+Standard-date: 2005-07-08 00:53:47 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+   * Fixed "random" wire frame position during move/resize.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:41 CDT 2005
+Standard-date: 2005-07-08 05:19:41 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+   * Try to clarify TipsJustification IconMan option
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,20 @@
+Revision: fvwm--terminal-emulator--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:01:07 CDT 2005
+Standard-date: 2005-07-08 01:01:07 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+   * Fixed positioning of shaped windows on pages other than 0 0.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:38:12 CDT 2005
+Standard-date: 2005-07-08 05:38:12 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:11 CDT 2005
+Standard-date: 2005-07-08 05:20:11 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+   * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:36 CDT 2005
+Standard-date: 2005-07-08 05:48:36 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:05 CDT 2005
+Standard-date: 2005-07-08 01:18:05 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+   * Do not lock a submenu menu item if it's clicked on but the submenu does not
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,29 @@
+Revision: fvwm--terminal-emulator--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:22:43 CDT 2005
+Standard-date: 2005-07-08 01:22:43 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+   * Added a set of functions for implementing tool tips
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:50:46 CDT 2005
+Standard-date: 2005-07-20 02:50:46 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+   Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,90 @@
+Revision: fvwm--terminal-emulator--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:06:06 CDT 2005
+Standard-date: 2005-07-08 07:06:06 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+   Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:23 CDT 2005
+Standard-date: 2005-07-08 05:45:23 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,23 @@
+Revision: fvwm--terminal-emulator--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:33 CDT 2005
+Standard-date: 2005-07-08 05:23:33 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+   * FAQ (1.7)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:08:59 CDT 2005
+Standard-date: 2005-07-08 01:08:59 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+   * Fixed CopyToken delimiter parsing.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:22 CDT 2005
+Standard-date: 2005-07-08 01:19:22 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+   * Fixed endless loop in DeIconify().
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,19 @@
+Revision: fvwm--terminal-emulator--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:42:40 CDT 2005
+Standard-date: 2005-07-08 05:42:40 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+   * FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,22 @@
+Revision: fvwm--terminal-emulator--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:27 CDT 2005
+Standard-date: 2005-07-08 05:43:27 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+   * A little clean-up.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--terminal-emulator--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:47:52 CDT 2005
+Standard-date: 2005-07-08 00:47:52 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-1
+Summary: Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+Keywords: 
+
+Sych wit srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+   fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,18 @@
+Revision: fvwm--terminal-emulator--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:32:44 CDT 2005
+Standard-date: 2005-07-08 05:32:44 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--terminal-emulator/fvwm--terminal-emulator--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,22 @@
+Revision: fvwm--terminal-emulator--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:11 CDT 2005
+Standard-date: 2005-07-08 01:05:11 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--terminal-emulator--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+   * Updated FAQ.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,165 @@
+Revision: fvwm--autotools--2.5.16--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jan 21 23:58:44 CST 2006
+Standard-date: 2006-01-22 05:58:44 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Continuation-of: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+Summary: tag of srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,14 @@
+Revision: fvwm--autotools--2.5.16--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 11:20:45 CST 2006
+Standard-date: 2006-01-22 17:20:45 GMT
+Modified-files: Makefile.am configure configure.ac
+    debian/Makefile.in fvwm/Makefile.in
+    modules/FvwmTabs/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+Summary: Regenerated with new auto tools
+Keywords: 
+
+Regenerated with new auto tools
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,27 @@
+Revision: fvwm--autotools--2.5.16--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Feb  7 18:13:34 CST 2006
+Standard-date: 2006-02-08 00:13:34 GMT
+Modified-files: ChangeLog NEWS fvwm/add_window.c
+    fvwm/events.c fvwm/fvwm.c fvwm/menus.c fvwm/virtual.c
+    libs/Module.h modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+   Fixed detection of running non-ICCCM2 wm
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.16/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,166 @@
+Revision: fvwm--autotools--2.5.16--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Jan 22 00:27:45 CST 2006
+Standard-date: 2006-01-22 06:27:45 GMT
+New-files: .arch-ids/configure.ac.id configure.ac
+    modules/FvwmTabs/.arch-ids/=id
+    modules/FvwmTabs/.arch-ids/ConfigFvwmTabs.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs-DefaultSetup.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.1.id
+    modules/FvwmTabs/.arch-ids/FvwmTabs.in.id
+    modules/FvwmTabs/.arch-ids/Makefile.am.id
+    modules/FvwmTabs/.arch-ids/Makefile.in.id
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.am
+    modules/FvwmTabs/Makefile.in
+New-directories: modules/FvwmTabs
+    modules/FvwmTabs/.arch-ids
+Removed-files: .arch-ids/acconfig.h.id
+    .arch-ids/configure.in.id acconfig.h configure.in
+    fvwm/.arch-ids/colors.c.id fvwm/.arch-ids/colors.h.id
+    fvwm/colors.c fvwm/colors.h
+Modified-files: AUTHORS ChangeLog INSTALL Makefile.am
+    Makefile.in NEWS acinclude.m4 bin/ChangeLog
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-perllib.in bin/fvwm-root.1 bin/fvwm-root.c
+    config.h.in configure debian/ChangeLog debian/Makefile.in
+    docs/ANNOUNCE docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/Makefile.in docs/fvwm.lsm fvwm/Makefile.am
+    fvwm/Makefile.in fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/conditional.c fvwm/events.c
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_conf.c
+    fvwm/ewmh_events.c fvwm/ewmh_names.c fvwm/expand.c
+    fvwm/frame.c fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.h
+    fvwm/icons.c fvwm/menuitem.c fvwm/menuitem.h fvwm/menus.c
+    fvwm/menus.h fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/move_resize.c fvwm/move_resize.h fvwm/session.c
+    fvwm/style.c fvwm/style.h fvwm/window_flags.h
+    libs/ColorUtils.c libs/CombineChars.c libs/FBidi.c
+    libs/FGettext.c libs/FScreen.c libs/FTips.c libs/Fft.h
+    libs/Flocale.c libs/Graphics.c libs/Makefile.in
+    libs/Parse.c libs/PictureUtils.c libs/System.c
+    libs/XError.c libs/alloca.c libs/envvar.c libs/fvwmlib.h
+    libs/fvwmsignal.c libs/safemalloc.c libs/strdup.c
+    libs/usleep.c libs/wcontext.c libs/wcontext.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.c modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/FvwmCpp.c
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmOldDebug.c
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in modules/FvwmGtk/expand.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconBox/icons.c
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1 modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/ASSound/ASSound.c
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/FvwmWharf.c
+    modules/FvwmWharf/Makefile.in modules/FvwmWharf/icons.c
+    modules/FvwmWharf/stepgfx.c
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/List.c
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.am
+    modules/Makefile.in perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/ChangeLog po/Makefile.in rpm/ChangeLog rpm/Makefile.in
+    rpm/fvwm.spec sample.fvwmrc/Makefile.in tests/ChangeLog
+    tests/Makefile.in tests/hints/Makefile.in
+    tests/hints/hints_test.c utils/ChangeLog
+    utils/Makefile.in utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+   Imported fvwm-2.5.16
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.17/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.17/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,172 @@
+Revision: fvwm--autotools--2.5.17--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 15:33:23 CDT 2006
+Standard-date: 2006-08-06 20:33:23 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+Continuation-of: srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+Summary: tag of srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.17/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,185 @@
+Revision: fvwm--autotools--2.5.17--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sun Aug  6 16:30:08 CDT 2006
+Standard-date: 2006-08-06 21:30:08 GMT
+New-files: libs/.arch-ids/fvwm_sys_stat.h.id
+    libs/fvwm_sys_stat.h
+    modules/FvwmCommand/.arch-ids/fifos.c.id
+    modules/FvwmCommand/fifos.c
+    utils/.arch-ids/changelog.vim.id utils/changelog.vim
+Removed-files: libs/.arch-ids/debug.c.id libs/debug.c
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm Makefile.in
+    NEWS README acinclude.m4 bin/ChangeLog bin/Makefile.in
+    bin/fvwm-bug.1 bin/fvwm-bug.in bin/fvwm-config.1
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-headlines.1
+    bin/fvwm-menu-headlines.in bin/fvwm-perllib.in
+    bin/fvwm-root.1 bin/fvwm-root.1.in config.h.in configure
+    configure.ac docs/ANNOUNCE docs/COMMANDS docs/CONVENTIONS
+    docs/ChangeLog docs/DEVELOPERS docs/FAQ docs/Makefile.in
+    docs/fvwm.lsm fvwm/ConfigFvwmSetup fvwm/Makefile.in
+    fvwm/add_window.c fvwm/builtins.c fvwm/commands.h
+    fvwm/conditional.c fvwm/events.c fvwm/ewmh_events.c
+    fvwm/expand.c fvwm/focus.c fvwm/focus.h fvwm/frame.c
+    fvwm/functable.c fvwm/functions.c fvwm/fvwm.1.in
+    fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c fvwm/menuitem.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/menustyle.h
+    fvwm/module_interface.c fvwm/move_resize.c
+    fvwm/placement.c fvwm/schedule.c fvwm/style.c
+    fvwm/virtual.c fvwm/windowshade.c libs/Colorset.c
+    libs/FEvent.c libs/FEvent.h libs/Fft.c libs/Flocale.c
+    libs/FlocaleCharset.c libs/Makefile.am libs/Makefile.in
+    libs/Module.c libs/Module.h libs/Parse.c libs/Picture.h
+    libs/PictureBase.c libs/PictureGraphics.c
+    libs/PictureGraphics.h libs/PictureUtils.c
+    libs/Strings.c libs/Strings.h libs/System.c libs/alloca.c
+    libs/fvwmlib.h libs/fvwmsignal.c libs/fvwmsignal.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/FvwmAnimate.c
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.h
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/misc.c modules/FvwmButtons/misc.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommand.h
+    modules/FvwmCommand/FvwmCommandS.c
+    modules/FvwmCommand/Makefile.am
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/FvwmGtkDebug.1
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm-Rlogin
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/FvwmGtk.c modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmIdent/FvwmIdent.c
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPager/x_pager.c modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/FvwmRearrange.c
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSave/FvwmSave.c
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/FvwmScript-ComExample.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/Widgets/Menu.c
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/FvwmScroll.c
+    modules/FvwmScroll/FvwmScroll.h
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTabs/ConfigFvwmTabs
+    modules/FvwmTabs/FvwmTabs-DefaultSetup
+    modules/FvwmTabs/FvwmTabs.1
+    modules/FvwmTabs/FvwmTabs.in
+    modules/FvwmTabs/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/List.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmTheme/FvwmTheme.c
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Commands.pm
+    perllib/FVWM/Makefile.in perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Module/Tk.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in sample.fvwmrc/system.fvwm2rc
+    sample.fvwmrc/system.fvwm2rc-sample-1 tests/Makefile.in
+    tests/hints/Makefile.in utils/ChangeLog
+    utils/Makefile.am utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Summary: Sync
+Keywords: 
+
+Sync
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+   Imported fvwm-2.5.17
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,176 @@
+Revision: fvwm--autotools--2.5.18--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 22:29:13 CDT 2006
+Standard-date: 2006-09-12 03:29:13 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--autotools--2.5.16--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+    srivasta@debian.org--etch/fvwm--autotools--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.16--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+Continuation-of: srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+Summary: tag of srivasta@debian.org--etch/fvwm--autotools--2.5.17--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,12 @@
+Revision: fvwm--autotools--2.5.18--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Sep 12 00:44:53 CDT 2006
+Standard-date: 2006-09-12 05:44:53 GMT
+Modified-files: configure
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-2
+Summary: Refresh autotools files.
+Keywords: 
+
+Refresh autotools files.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5.18/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,84 @@
+Revision: fvwm--autotools--2.5.18--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Sep 11 23:36:30 CDT 2006
+Standard-date: 2006-09-12 04:36:30 GMT
+Modified-files: ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 configure
+    configure.ac docs/ANNOUNCE docs/ChangeLog docs/fvwm.lsm
+    fvwm/add_window.c fvwm/conditional.c fvwm/decorations.c
+    fvwm/decorations.h fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh_events.c fvwm/expand.c fvwm/fvwm.1.in
+    fvwm/fvwm.h fvwm/gnome.c fvwm/icccm2.c
+    fvwm/module_interface.c fvwm/move_resize.c fvwm/read.c
+    fvwm/read.h fvwm/style.c libs/Flocale.c libs/Strings.h
+    libs/vpacket.h libs/wild.c modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h
+    modules/FvwmForm/ReadXServer.c
+    modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/debug.c modules/FvwmIconMan/debug.h
+    modules/FvwmIconMan/debuglevels.h
+    modules/FvwmIconMan/functions.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/winlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/FvwmM4.c modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.c
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Widgets/TextField.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/GrabWindow.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Start.c
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1 rpm/fvwm.spec
+    utils/ChangeLog utils/xselection.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5.18--patch-1
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+    srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+Summary: Sync with upstream
+Keywords: 
+
+Sync with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--base-0
+   tag of srivasta@debian.org--etch/fvwm--upstream--2.5.17--patch-1
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5.18--patch-1
+   New upstream-revision.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/base-0
@@ -0,0 +1,12 @@
+Revision: fvwm--autotools--2.5--base-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:21:35 CDT 2004
+Standard-date: 2004-04-19 08:21:35 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-7
@@ -0,0 +1,14 @@
+Revision: fvwm--autotools--2.5--patch-7
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 17:13:11 CST 2005
+Standard-date: 2005-03-17 23:13:11 GMT
+Modified-files: acinclude.m4
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+Summary: Try to make configure detect gdk-imlib 1.9.14.
+Keywords: 
+
+* acinclude.m4: Removed all mention of Imlib.h, substituting instead
+  gdk_imlib.h, since no source file in the current snapshot includes
+  Imlib.h
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/version-0
@@ -0,0 +1,9 @@
+Revision: fvwm--autotools--2.5--version-0
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:54:50 CDT 2005
+Standard-date: 2005-05-19 03:54:50 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+Summary: fvwm--autotools is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--autotools
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-4
@@ -0,0 +1,12 @@
+Revision: fvwm--autotools--2.5--patch-4
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 02:44:49 CDT 2004
+Standard-date: 2004-10-01 07:44:49 GMT
+Modified-files: libs/FImage.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-6
@@ -0,0 +1,59 @@
+Revision: fvwm--autotools--2.5--patch-6
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed Oct  6 10:50:06 CDT 2004
+Standard-date: 2004-10-06 15:50:06 GMT
+Modified-files: AUTHORS ChangeLog NEWS bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-root.1 config.h.in
+    configure configure.in docs/ANNOUNCE docs/ChangeLog
+    docs/DEVELOPERS docs/fvwm.lsm fvwm/add_window.c
+    fvwm/builtins.c fvwm/commands.h fvwm/events.c
+    fvwm/frame.c fvwm/functable.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/screen.h fvwm/update.c fvwm/virtual.c
+    fvwm/window_flags.h libs/envvar.c libs/envvar.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/Scripts/FvwmScript-BellSetup
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/FvwmWinList.1
+    perllib/FVWM/Commands.pm rpm/fvwm.spec
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+Summary: New upstream version
+Keywords: 
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+   Imported fvwm-2.5.12
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-2
@@ -0,0 +1,191 @@
+Revision: fvwm--autotools--2.5--patch-2
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:18:43 CDT 2004
+Standard-date: 2004-10-01 06:18:43 GMT
+New-files: bin/.arch-ids/fvwm-bug.1.in.id
+    bin/.arch-ids/fvwm-config.1.in.id
+    bin/.arch-ids/fvwm-convert-2.2.1.in.id
+    bin/.arch-ids/fvwm-convert-2.4.1.in.id
+    bin/.arch-ids/fvwm-convert-2.6.1.in.id
+    bin/.arch-ids/fvwm-menu-desktop.1.in.id
+    bin/.arch-ids/fvwm-root.1.in.id bin/fvwm-bug.1.in
+    bin/fvwm-config.1.in bin/fvwm-convert-2.2.1.in
+    bin/fvwm-convert-2.4.1.in bin/fvwm-convert-2.6.1.in
+    bin/fvwm-menu-desktop.1.in bin/fvwm-root.1.in
+    modules/FvwmAnimate/.arch-ids/FvwmAnimate.1.in.id
+    modules/FvwmAnimate/FvwmAnimate.1.in
+    modules/FvwmAuto/.arch-ids/FvwmAuto.1.in.id
+    modules/FvwmAuto/FvwmAuto.1.in
+    modules/FvwmBacker/.arch-ids/FvwmBacker.1.in.id
+    modules/FvwmBacker/FvwmBacker.1.in
+    modules/FvwmBanner/.arch-ids/FvwmBanner.1.in.id
+    modules/FvwmBanner/FvwmBanner.1.in
+    modules/FvwmButtons/.arch-ids/FvwmButtons.1.in.id
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmCommand/.arch-ids/FvwmCommand.1.in.id
+    modules/FvwmCommand/FvwmCommand.1.in
+    modules/FvwmConsole/.arch-ids/FvwmConsole.1.in.id
+    modules/FvwmConsole/.arch-ids/FvwmConsoleC.pl.1.in.id
+    modules/FvwmConsole/FvwmConsole.1.in
+    modules/FvwmConsole/FvwmConsoleC.pl.1.in
+    modules/FvwmCpp/.arch-ids/FvwmCpp.1.in.id
+    modules/FvwmCpp/FvwmCpp.1.in
+    modules/FvwmDragWell/.arch-ids/FvwmDragWell.1.in.id
+    modules/FvwmDragWell/FvwmDragWell.1.in
+    modules/FvwmEvent/.arch-ids/FvwmEvent.1.in.id
+    modules/FvwmEvent/FvwmEvent.1.in
+    modules/FvwmForm/.arch-ids/FvwmForm.1.in.id
+    modules/FvwmForm/FvwmForm.1.in
+    modules/FvwmGtk/.arch-ids/FvwmGtk.1.in.id
+    modules/FvwmGtk/FvwmGtk.1.in
+    modules/FvwmIconBox/.arch-ids/FvwmIconBox.1.in.id
+    modules/FvwmIconBox/FvwmIconBox.1.in
+    modules/FvwmIconMan/.arch-ids/FvwmIconMan.1.in.id
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIdent/.arch-ids/FvwmIdent.1.in.id
+    modules/FvwmIdent/FvwmIdent.1.in
+    modules/FvwmM4/.arch-ids/FvwmM4.1.in.id
+    modules/FvwmM4/FvwmM4.1.in
+    modules/FvwmPager/.arch-ids/FvwmPager.1.in.id
+    modules/FvwmPager/FvwmPager.1.in
+    modules/FvwmProxy/.arch-ids/FvwmProxy.1.in.id
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmRearrange/.arch-ids/FvwmRearrange.1.in.id
+    modules/FvwmRearrange/FvwmRearrange.1.in
+    modules/FvwmSave/.arch-ids/FvwmSave.1.in.id
+    modules/FvwmSave/FvwmSave.1.in
+    modules/FvwmSaveDesk/.arch-ids/FvwmSaveDesk.1.in.id
+    modules/FvwmSaveDesk/FvwmSaveDesk.1.in
+    modules/FvwmScript/.arch-ids/FvwmScript.1.in.id
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScroll/.arch-ids/FvwmScroll.1.in.id
+    modules/FvwmScroll/FvwmScroll.1.in
+    modules/FvwmTaskBar/.arch-ids/FvwmTaskBar.1.in.id
+    modules/FvwmTaskBar/FvwmTaskBar.1.in
+    modules/FvwmTheme/.arch-ids/FvwmTheme.1.in.id
+    modules/FvwmTheme/FvwmTheme.1.in
+    modules/FvwmWharf/.arch-ids/FvwmWharf.1.in.id
+    modules/FvwmWharf/FvwmWharf.1.in
+    modules/FvwmWinList/.arch-ids/FvwmWinList.1.in.id
+    modules/FvwmWinList/FvwmWinList.1.in
+    po/.arch-ids/FvwmScript.zh_CN.gmo.id
+    po/.arch-ids/FvwmScript.zh_CN.po.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.gmo.id
+    po/.arch-ids/FvwmTaskBar.zh_CN.po.id
+    po/.arch-ids/fvwm.zh_CN.gmo.id
+    po/.arch-ids/fvwm.zh_CN.po.id po/FvwmScript.zh_CN.gmo
+    po/FvwmScript.zh_CN.po po/FvwmTaskBar.zh_CN.gmo
+    po/FvwmTaskBar.zh_CN.po po/fvwm.zh_CN.gmo
+    po/fvwm.zh_CN.po
+Modified-files: AUTHORS ChangeLog INSTALL.fvwm NEWS acconfig.h
+    acinclude.m4 bin/ChangeLog bin/fvwm-bug.1
+    bin/fvwm-config.1 bin/fvwm-convert-2.2.1
+    bin/fvwm-convert-2.4.1 bin/fvwm-convert-2.6.1
+    bin/fvwm-menu-desktop.1 bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in bin/fvwm-root.1
+    bin/fvwm-root.c config.h.in configure.in docs/ANNOUNCE
+    docs/CONVENTIONS docs/ChangeLog docs/DEVELOPERS docs/FAQ
+    docs/fvwm.lsm fvwm/add_window.c fvwm/bindings.c
+    fvwm/borders.c fvwm/builtins.c fvwm/colorset.c
+    fvwm/colorset.h fvwm/conditional.c fvwm/decorations.c
+    fvwm/eventhandler.h fvwm/events.c fvwm/events.h
+    fvwm/ewmh.c fvwm/ewmh.h fvwm/ewmh_events.c
+    fvwm/ewmh_intern.h fvwm/execcontext.c fvwm/expand.c
+    fvwm/focus.c fvwm/focus_policy.h fvwm/frame.c
+    fvwm/frame.h fvwm/functions.c fvwm/fvwm.1.in fvwm/fvwm.c
+    fvwm/fvwm.h fvwm/geometry.c fvwm/geometry.h fvwm/gnome.h
+    fvwm/menudim.c fvwm/menuitem.h fvwm/menus.c fvwm/menus.h
+    fvwm/modconf.c fvwm/module_interface.c
+    fvwm/move_resize.c fvwm/placement.c fvwm/read.c
+    fvwm/screen.h fvwm/session.c fvwm/stack.c fvwm/style.c
+    fvwm/style.h fvwm/virtual.c fvwm/window_flags.h
+    libs/Bindings.c libs/Bindings.h libs/CombineChars.c
+    libs/FEvent.c libs/FEvent.h libs/FImage.c libs/FScreen.c
+    libs/Fft.c libs/Ficonv.c libs/Flocale.c
+    libs/PictureUtils.c libs/System.c libs/defaults.h
+    libs/envvar.c libs/envvar.h libs/fvwmlib.h
+    libs/fvwmsignal.c libs/fvwmsignal.h libs/gravity.h
+    libs/vpacket.h libs/wcontext.h libs/wild.c libs/wild.h
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAuto/FvwmAuto.1 modules/FvwmAuto/FvwmAuto.c
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmBacker/FvwmBacker.h
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/FvwmBanner.c
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmConsole/FvwmConsole.h
+    modules/FvwmConsole/FvwmConsoleC.c
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/getline.c modules/FvwmCpp/FvwmCpp.1
+    modules/FvwmDebug/FvwmDebug.in
+    modules/FvwmDebug/FvwmGtkDebug.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/fvwmDragWell.c
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmForm/FvwmForm.1 modules/FvwmForm/FvwmForm.c
+    modules/FvwmForm/FvwmForm.h modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.am
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/FvwmIconBox.c
+    modules/FvwmIconBox/FvwmIconBox.h
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/readconfig.h
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1 modules/FvwmM4/FvwmM4.1
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/FvwmPager.c
+    modules/FvwmPager/FvwmPager.h
+    modules/FvwmPager/x_pager.c
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/FvwmScript.c
+    modules/FvwmScript/Instructions.c
+    modules/FvwmScript/libyywrap.c
+    modules/FvwmScript/script.c modules/FvwmScript/script.y
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Goodies.c
+    modules/FvwmTaskBar/Goodies.h
+    modules/FvwmTaskBar/Start.c modules/FvwmTaskBar/Start.h
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWinList/ButtonArray.c
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWindowMenu/FvwmWindowMenu.1
+    modules/FvwmWindowMenu/FvwmWindowMenu.in
+    perllib/ChangeLog perllib/FVWM/Event.pm
+    perllib/FVWM/EventNames.pm perllib/FVWM/Tracker.pm
+    perllib/FVWM/Tracker/PageInfo.pm
+    perllib/FVWM/Tracker/WindowList.pm po/ChangeLog
+    rpm/fvwm.spec sample.fvwmrc/system.fvwm2rc-sample-1
+    tests/ChangeLog tests/hints/hints_test.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+Summary: New upstream release. See NEWS file for details
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-3
@@ -0,0 +1,53 @@
+Revision: fvwm--autotools--2.5--patch-3
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 01:47:34 CDT 2004
+Standard-date: 2004-10-01 06:47:34 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    config.h.in configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+Summary: Refreshed with autoreconf
+Keywords: 
+
+Refreshed with autoreconf
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-8
@@ -0,0 +1,10 @@
+Revision: fvwm--autotools--2.5--patch-8
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Mar 17 17:20:03 CST 2005
+Standard-date: 2005-03-17 23:20:03 GMT
+Modified-files: configure
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+Summary: Refresh configure after the nre acinclude.
+Keywords: 
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-1
@@ -0,0 +1,55 @@
+Revision: fvwm--autotools--2.5--patch-1
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Apr 19 03:32:27 CDT 2004
+Standard-date: 2004-04-19 08:32:27 GMT
+Modified-files: Makefile.am Makefile.in aclocal.m4
+    bin/Makefile.in config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in
+    docs/Makefile.in fvwm/Makefile.in libs/Makefile.in
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+Summary: Refreshed autotools
+Keywords: 
+
+Refreshed autotools
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--2003-primary/patch-log/patch-5
@@ -0,0 +1,12 @@
+Revision: fvwm--autotools--2.5--patch-5
+Archive: srivasta@debian.org--2003-primary
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Oct  1 03:01:53 CDT 2004
+Standard-date: 2004-10-01 08:01:53 GMT
+Modified-files: bin/fvwm-root.c
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+Summary: Typo fix
+Keywords: 
+
+Typo fix
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-9
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-9
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-9
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:08:54 CDT 2005
+Standard-date: 2005-07-08 01:08:54 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in libs/Parse.c
+    modules/ChangeLog modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-9
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-7
+   * Fixed CopyToken delimiter parsing.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-33
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-33
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-33
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:20 CDT 2005
+Standard-date: 2005-07-08 05:33:20 GMT
+Modified-files: ChangeLog fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-33
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-31
+   * Fixed circulate crash.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-46
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-46
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-46
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:47 CDT 2005
+Standard-date: 2005-07-08 05:46:47 GMT
+Modified-files: ChangeLog fvwm/move_resize.c libs/Fpng.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-46
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-44
+   * Fixed interective resize (reduction) via the bottom border
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-42
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-42
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-42
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:03 CDT 2005
+Standard-date: 2005-07-08 05:44:03 GMT
+Modified-files: ChangeLog NEWS fvwm/fvwm.1.in
+    modules/ChangeLog modules/FvwmAuto/FvwmAuto.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-42
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-40
+   * NEWS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-32
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-32
@@ -0,0 +1,20 @@
+Revision: fvwm--autotools--2.5--patch-32
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:32:44 CDT 2005
+Standard-date: 2005-07-08 05:32:44 GMT
+Modified-files: AUTHORS ChangeLog NEWS modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+    modules/FvwmScript/FvwmScript.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-32
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-30
+   2005-02-05  Bjoern Steinbrink <b.steinbrink@gmx.de>
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-48
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-48
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-48
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:57 CDT 2005
+Standard-date: 2005-07-08 05:47:57 GMT
+Modified-files: ChangeLog fvwm/placement.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-48
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-46
+   * Dominik Vogt
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-59
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-59
@@ -0,0 +1,180 @@
+Revision: fvwm--autotools--2.5--patch-59
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Aug  8 19:46:07 CDT 2005
+Standard-date: 2005-08-09 00:46:07 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog NEWS configure.in docs/ANNOUNCE
+    docs/FAQ fvwm/add_window.c fvwm/events.c fvwm/ewmh.c
+    fvwm/ewmh.h fvwm/ewmh_events.c fvwm/ewmh_icons.c
+    fvwm/ewmh_intern.h fvwm/ewmh_names.c fvwm/focus.c
+    fvwm/fvwm.c fvwm/geometry.c fvwm/gnome.c fvwm/icons.c
+    fvwm/menus.c fvwm/menustyle.c fvwm/misc.c fvwm/misc.h
+    fvwm/modconf.c fvwm/module_interface.c fvwm/stack.c
+    fvwm/style.c fvwm/update.c fvwm/virtual.c
+    fvwm/windowshade.c libs/Colorset.c libs/Strings.c
+    libs/vpacket.h modules/ChangeLog
+    modules/FvwmBanner/fvwm-logo-current.xbm
+    modules/FvwmBanner/fvwm-logo-current.xpm
+    modules/FvwmConsole/FvwmConsole.c
+    modules/FvwmGtk/windowlist.c
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmProxy/FvwmProxy.1.in
+    modules/FvwmProxy/FvwmProxy.c
+    modules/FvwmProxy/FvwmProxy.h
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+Summary: Synch with upstream branch
+Keywords: 
+
+Synch with upstream branch
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-59
+   * FvwmPerl: support window context in "preprocess" action
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-60
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-61
+   * Fixed hang when a gnome application requests a layer < 0.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-62
+   * NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-63
+   * Fixed aspect pixmap size calculations.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-64
+   * Fixed bogus "ewmh_WMIconGeometry" warning message.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-65
+   * Dominik: fixed select/focus button state lost when deiconifying a window
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-66
+   * Minor cleanup.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-67
+   * Fixed hang in button grabbing code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-68
+   * Updated NEWS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-69
+   * Minor update.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-70
+   * 64-bit fixes.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-71
+   * Added check for supported system architectures.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-72
+   * Use the new logo in FvwmBanner.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-73
+   * Fixed a memory leak in style merging, tweaked and simplified the code.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-74
+   * Two menu fixes by  ViktorGriph.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-75
+   Added FvwmProxy option ProxyIconified
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-76
+   Finalize additions from CVS missed by cscvs
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-56
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-56
@@ -0,0 +1,52 @@
+Revision: fvwm--autotools--2.5--patch-56
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:27:23 CDT 2005
+Standard-date: 2005-07-20 02:27:23 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog bin/fvwm-root.c
+    configure.in fvwm/add_window.c fvwm/colorset.c
+    fvwm/decorations.c fvwm/ewmh.c fvwm/ewmh_icons.c
+    fvwm/ewmh_names.c fvwm/fvwm.c fvwm/fvwm.h fvwm/gnome.c
+    fvwm/icccm2.c fvwm/move_resize.c fvwm/session.c
+    libs/FTips.c libs/FTips.h libs/FlocaleCharset.c
+    libs/Target.c libs/fsm.c modules/ChangeLog
+    modules/FvwmBacker/FvwmBacker.c
+    modules/FvwmDragWell/xdndDragSource.c
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/FvwmTaskBar.h
+    modules/FvwmWinList/FvwmWinList.c
+    modules/FvwmWinList/FvwmWinList.h po/FvwmTaskBar.ar.gmo
+    po/FvwmTaskBar.fr.gmo tests/ChangeLog
+    tests/hints/hints_test.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-52
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-53
+   * Updated DEVELOPERS.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-54
+   * Updated for 2.5.14.
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-55
+   * Fixed compile problem (don't use rintf() as it's C99).
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-56
+   * 64-bit fixes by Dominik
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-57
+   actually support euc-jp encodings (as pointed by Yasuhiro Nakazaki)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-58
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-58
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-58
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:47:24 CDT 2005
+Standard-date: 2005-07-20 02:47:24 GMT
+Modified-files: po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.fr.gmo
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-58
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-58
+   Fix differences from upstream in non-text files
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-10
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-10
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-10
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:16:33 CDT 2005
+Standard-date: 2005-07-08 01:16:33 GMT
+Modified-files: ChangeLog fvwm/events.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-10
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-8
+   * Fixed drawing of decorations with the !FPAllowFocusClickFunction and
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-36
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-36
@@ -0,0 +1,27 @@
+Revision: fvwm--autotools--2.5--patch-36
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:09 CDT 2005
+Standard-date: 2005-07-08 05:35:09 GMT
+Modified-files: NEWS modules/ChangeLog
+    modules/FvwmButtons/FvwmButtons.1.in
+    modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/FvwmButtons.h
+    modules/FvwmButtons/button.c
+    modules/FvwmButtons/button.h modules/FvwmButtons/draw.c
+    modules/FvwmButtons/dynamic.c
+    modules/FvwmButtons/icons.c modules/FvwmButtons/icons.h
+    modules/FvwmButtons/output.c
+    modules/FvwmButtons/parse.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-36
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-34
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-26
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-26
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-26
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:39 CDT 2005
+Standard-date: 2005-07-08 05:24:39 GMT
+Modified-files: ChangeLog fvwm/session.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-26
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-24
+   * Small session management fixes
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-35
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-35
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-35
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:34:28 CDT 2005
+Standard-date: 2005-07-08 05:34:28 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-35
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-33
+   * fvwm/fvwm.1.in (Focus): Typos in focus section.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/base-0
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/base-0
@@ -0,0 +1,24 @@
+Revision: fvwm--autotools--2.5--base-0
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Wed May 18 22:55:12 CDT 2005
+Standard-date: 2005-05-19 03:55:12 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--base-0
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-1
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-2
+    srivasta@debian.org--2003-primary/fvwm--upstream--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--autotools--2.5--base-0
+Continuation-of: srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+Summary: tag of srivasta@debian.org--2003-primary/fvwm--autotools--2.5--version-0
+
+(automatically generated log message)
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-47
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-47
@@ -0,0 +1,21 @@
+Revision: fvwm--autotools--2.5--patch-47
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:47:23 CDT 2005
+Standard-date: 2005-07-08 05:47:23 GMT
+Modified-files: AUTHORS NEWS modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in perllib/ChangeLog
+    perllib/FVWM/Constants.pm perllib/FVWM/EventNames.pm
+    perllib/FVWM/Module.pm.in perllib/FVWM/create-constants
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-47
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-45
+   apply 64-bit patch for perllib by Viktor Griph
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-24
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-24
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-24
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:23:33 CDT 2005
+Standard-date: 2005-07-08 05:23:33 GMT
+Modified-files: AUTHORS ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-24
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-22
+   * Applied Arnaud Vrac patch which fixes maximize by growing vs EWMH working area
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-30
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-30
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-30
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:10 CDT 2005
+Standard-date: 2005-07-08 05:31:10 GMT
+Modified-files: NEWS
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-30
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-28
+   update news
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-15
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-15
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-15
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:13 CDT 2005
+Standard-date: 2005-07-08 01:20:13 GMT
+Modified-files: ChangeLog fvwm/add_window.c fvwm/functions.c
+    fvwm/menus.c fvwm/module_interface.c fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-15
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-13
+   * Fixed ALT-Move to disable snapping.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-22
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-22
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-22
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:20:11 CDT 2005
+Standard-date: 2005-07-08 05:20:11 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-22
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-20
+   * ButtonStyle Reset takes effect immediately.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-50
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-50
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-50
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:49:09 CDT 2005
+Standard-date: 2005-07-08 05:49:09 GMT
+Modified-files: ChangeLog libs/Graphics.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-50
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-48
+   * Dominik Vogt: fixed drawing of relief with very small rectangles
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-7
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-7
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-7
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:06:47 CDT 2005
+Standard-date: 2005-07-08 01:06:47 GMT
+Modified-files: ChangeLog NEWS fvwm/virtual.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-7
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-5
+   * Fixed MoveToPage w/o argument.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-18
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-18
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-18
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:22:38 CDT 2005
+Standard-date: 2005-07-08 01:22:38 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-18
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-16
+   * Really commit EWMHUseStackingOrderHints documentation update
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-28
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-28
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-28
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:29:49 CDT 2005
+Standard-date: 2005-07-08 05:29:49 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-28
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-26
+   * Fixed my previous commit
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-16
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-16
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-16
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:20:54 CDT 2005
+Standard-date: 2005-07-08 01:20:54 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-16
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-14
+   * fvwm/fvwm.1.in: Fix keysym description add XKeysymDB.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-38
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-38
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-38
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:37:24 CDT 2005
+Standard-date: 2005-07-08 05:37:24 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-38
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-36
+   * FAQ
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-14
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-14
@@ -0,0 +1,20 @@
+Revision: fvwm--autotools--2.5--patch-14
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:19:20 CDT 2005
+Standard-date: 2005-07-08 01:19:20 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/builtins.c
+    fvwm/events.c fvwm/module_interface.c libs/Bindings.c
+    libs/Bindings.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-14
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-12
+   * Fixed crashes and bugs in handling of the root window / other unmanaged
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-12
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-12
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-12
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:02 CDT 2005
+Standard-date: 2005-07-08 01:18:02 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-12
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-10
+   * Fixed aborting move/resize with the mouse.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-57
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-57
@@ -0,0 +1,11 @@
+Revision: fvwm--autotools--2.5--patch-57
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Tue Jul 19 21:40:47 CDT 2005
+Standard-date: 2005-07-20 02:40:47 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-57
+Summary: Synch with upstream CVS
+Keywords: 
+
+Synch with upstream CVS
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-29
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-29
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-29
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:30:37 CDT 2005
+Standard-date: 2005-07-08 05:30:37 GMT
+Modified-files: ChangeLog fvwm/bindings.c fvwm/conditional.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-29
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-27
+   * fvwm/bindings.c (ParseBinding)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-54
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-54
@@ -0,0 +1,169 @@
+Revision: fvwm--autotools--2.5--patch-54
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 11:54:55 CDT 2005
+Standard-date: 2005-07-18 16:54:55 GMT
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: ChangeLog Makefile.in NEWS aclocal.m4
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.sub configure
+    configure.in debian/Makefile.in depcomp docs/ANNOUNCE
+    docs/ChangeLog docs/DEVELOPERS docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in install-sh
+    libs/Makefile.in missing mkinstalldirs modules/ChangeLog
+    modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIconMan/xmanager.c
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/FVWM/create-constants
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/FvwmTaskBar.ar.gmo po/FvwmTaskBar.ar.po
+    po/FvwmTaskBar.fr.gmo po/FvwmTaskBar.fr.po
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-54
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+Summary: Synchronize with release 2.5.13
+Keywords: 
+
+Synchronize with release 2.5.13
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-51
+   Imported fvwm-2.5.13
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-43
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-43
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-43
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:44:38 CDT 2005
+Standard-date: 2005-07-08 05:44:38 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-43
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-41
+   * FvwmScript/FvwmScript.1.in (following)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-52
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-52
@@ -0,0 +1,53 @@
+Revision: fvwm--autotools--2.5--patch-52
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:13:22 CDT 2005
+Standard-date: 2005-07-08 07:13:22 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-52
+Summary: regenerate autoconf files by running autorecong
+Keywords: 
+
+regenerate autoconf files by running autorecong
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-19
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-19
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-19
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:16:39 CDT 2005
+Standard-date: 2005-07-08 05:16:39 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-19
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-17
+   /tmp/f
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-25
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-25
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-25
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:24:05 CDT 2005
+Standard-date: 2005-07-08 05:24:05 GMT
+Modified-files: ChangeLog fvwm/move_resize.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-25
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-23
+   * Fixed a one pixel bug in the Move and AnimatedMove commands by rounding
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-27
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-27
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-27
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:25:21 CDT 2005
+Standard-date: 2005-07-08 05:25:21 GMT
+Modified-files: modules/ChangeLog modules/FvwmIconMan/x.c
+    modules/FvwmIconMan/xmanager.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-27
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-25
+   * Fixed some FvwmIconMan flickering
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-4
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-4
@@ -0,0 +1,20 @@
+Revision: fvwm--autotools--2.5--patch-4
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:00:59 CDT 2005
+Standard-date: 2005-07-08 01:00:59 GMT
+Modified-files: ChangeLog fvwm/events.c fvwm/frame.c
+    modules/ChangeLog modules/FvwmButtons/FvwmButtons.c
+    modules/FvwmButtons/draw.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-4
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-2
+   * Fixed positioning of shaped windows on pages other than 0 0.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-45
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-45
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-45
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:46:03 CDT 2005
+Standard-date: 2005-07-08 05:46:03 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-45
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-43
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-37
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-37
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-37
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:35:43 CDT 2005
+Standard-date: 2005-07-08 05:35:43 GMT
+Modified-files: ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-37
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-35
+   * fvwm/fvwm.1.in (Example)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-34
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-34
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-34
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:33:53 CDT 2005
+Standard-date: 2005-07-08 05:33:53 GMT
+Modified-files: docs/ChangeLog docs/FAQ
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-34
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-32
+   * FAQ (3.23): Typo.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-6
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-6
@@ -0,0 +1,22 @@
+Revision: fvwm--autotools--2.5--patch-6
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:05:16 CDT 2005
+Standard-date: 2005-07-08 01:05:16 GMT
+Modified-files: ChangeLog docs/ChangeLog docs/FAQ
+    fvwm/builtins.c fvwm/colorset.c fvwm/events.c
+    fvwm/fvwm.1.in modules/ChangeLog
+    modules/FvwmCommand/FvwmCommand.c
+    modules/FvwmCommand/FvwmCommandS.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-6
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-4
+   * Updated FAQ.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-53
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-53
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-53
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Sat Jul  9 15:15:47 CDT 2005
+Standard-date: 2005-07-09 20:15:47 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-directory.1
+    bin/fvwm-menu-directory.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-53
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-50
+   fvwm-menu-directory: correct a typo
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-2
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-2
@@ -0,0 +1,17 @@
+Revision: fvwm--autotools--2.5--patch-2
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:32:55 CDT 2005
+Standard-date: 2005-07-08 00:32:55 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-2
+    srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+Summary: Sych with fvwm--upstream--2.5--base-0
+Keywords: 
+
+Sych with fvwm--upstream--2.5--base-0
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--base-0
+   tag of srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-20
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-20
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-20
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:09 CDT 2005
+Standard-date: 2005-07-08 05:19:09 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-20
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-18
+   * Try to clarify TipsJustification IconMan option
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-3
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-3
@@ -0,0 +1,21 @@
+Revision: fvwm--autotools--2.5--patch-3
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:54:06 CDT 2005
+Standard-date: 2005-07-08 00:54:06 GMT
+Modified-files: ChangeLog fvwm/builtins.c fvwm/events.c
+    fvwm/fvwm.1.in fvwm/move_resize.c fvwm/screen.h
+    modules/FvwmScript/Scripts/system.fvwmrc
+    sample.fvwmrc/system.fvwm2rc-sample-95
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-3
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-1
+   * Fixed "random" wire frame position during move/resize.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-39
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-39
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-39
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:38:11 CDT 2005
+Standard-date: 2005-07-08 05:38:11 GMT
+Modified-files: bin/ChangeLog bin/fvwm-menu-desktop.1.in
+    modules/ChangeLog modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-39
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-37
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-21
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-21
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-21
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:19:39 CDT 2005
+Standard-date: 2005-07-08 05:19:39 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-21
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-19
+   * FvwmIconMan/FvwmIconMan.1.in: Remove lang_check markers.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-49
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-49
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-49
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:48:33 CDT 2005
+Standard-date: 2005-07-08 05:48:33 GMT
+Modified-files: ChangeLog NEWS bin/ChangeLog
+    bin/fvwm-menu-desktop.1.in bin/fvwm-menu-desktop.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-49
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-47
+   * fvwm-menu-desktop.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-60
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-60
@@ -0,0 +1,175 @@
+Revision: fvwm--autotools--2.5--patch-60
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:17:29 CDT 2005
+Standard-date: 2005-08-25 20:17:29 GMT
+New-files: .arch-ids/ltmain.sh.id ltmain.sh
+Removed-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id .arch-ids/mkinstalldirs.id
+    ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h mkinstalldirs
+    modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/=id tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-gtkwinlist
+    tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+Removed-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/perl tests/perl/.arch-ids
+    tests/purify tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: AUTHORS ChangeLog Makefile.in NEWS
+    bin/Makefile.in bin/fvwm-bug.1 bin/fvwm-config.1
+    bin/fvwm-convert-2.2.1 bin/fvwm-convert-2.4.1
+    bin/fvwm-convert-2.6.1 bin/fvwm-menu-desktop.1
+    bin/fvwm-root.1 config.guess config.h.in config.sub
+    configure configure.in debian/Makefile.in depcomp
+    docs/ANNOUNCE docs/ChangeLog docs/Makefile.in
+    docs/fvwm.lsm fvwm/Makefile.in fvwm/conditional.c
+    fvwm/ewmh_events.c fvwm/fvwm.1.in fvwm/session.c
+    fvwm/virtual.c install-sh libs/Makefile.in missing
+    modules/ChangeLog modules/FvwmAnimate/FvwmAnimate.1
+    modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/FvwmAuto.1
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/FvwmBacker.1
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/FvwmBanner.1
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/FvwmButtons.1
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/FvwmCommand.1
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/FvwmConsole.1
+    modules/FvwmConsole/FvwmConsoleC.pl.1
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/FvwmCpp.1 modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/FvwmDragWell.1
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/FvwmEvent.1
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/FvwmForm.1
+    modules/FvwmForm/Makefile.in modules/FvwmGtk/FvwmGtk.1
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/FvwmIconBox.1
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/FvwmIconMan.1
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/FvwmIdent.1
+    modules/FvwmIdent/Makefile.in modules/FvwmM4/FvwmM4.1
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/FvwmPager.1
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/FvwmPerl.1
+    modules/FvwmPerl/FvwmPerl.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/FvwmProxy.1
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/FvwmRearrange.1
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/FvwmSave.1
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/FvwmSaveDesk.1
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/FvwmScript.1
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScript/scanner.c
+    modules/FvwmScroll/FvwmScroll.1
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/ButtonArray.c
+    modules/FvwmTaskBar/FvwmTaskBar.1
+    modules/FvwmTaskBar/FvwmTaskBar.c
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/FvwmTheme.1
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/FvwmWharf.1
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/FvwmWinList.1
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/ChangeLog perllib/FVWM/Makefile.in
+    perllib/FVWM/Module.pm.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in rpm/fvwm.spec
+    sample.fvwmrc/Makefile.in tests/Makefile.in
+    tests/hints/Makefile.in utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-60
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+Summary: Synch with new upstream
+Keywords: 
+
+Synch with new upstream
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-77
+   Imported fvwm-2.5.14
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-11
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-11
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-11
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:17:17 CDT 2005
+Standard-date: 2005-07-08 01:17:17 GMT
+Modified-files: ChangeLog fvwm/menus.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-11
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-9
+   * Do not lock a submenu menu item if it's clicked on but the submenu does not
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-61
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-61
@@ -0,0 +1,11 @@
+Revision: fvwm--autotools--2.5--patch-61
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Aug 25 15:51:00 CDT 2005
+Standard-date: 2005-08-25 20:51:00 GMT
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-61
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-17
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-17
@@ -0,0 +1,29 @@
+Revision: fvwm--autotools--2.5--patch-17
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:21:31 CDT 2005
+Standard-date: 2005-07-08 01:21:31 GMT
+New-files: libs/.arch-ids/FTips.c.id
+    libs/.arch-ids/FTips.h.id libs/FTips.c libs/FTips.h
+Modified-files: ChangeLog NEWS libs/Makefile.am
+    libs/defaults.h modules/ChangeLog
+    modules/FvwmIconMan/FvwmIconMan.1.in
+    modules/FvwmIconMan/FvwmIconMan.c
+    modules/FvwmIconMan/FvwmIconMan.h
+    modules/FvwmIconMan/fvwm.c
+    modules/FvwmIconMan/globals.c
+    modules/FvwmIconMan/readconfig.c
+    modules/FvwmIconMan/x.c modules/FvwmIconMan/xmanager.c
+    modules/FvwmIconMan/xmanager.h
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-17
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-15
+   * Added a set of functions for implementing tool tips
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-55
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-55
@@ -0,0 +1,53 @@
+Revision: fvwm--autotools--2.5--patch-55
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Mon Jul 18 12:24:26 CDT 2005
+Standard-date: 2005-07-18 17:24:26 GMT
+Modified-files: Makefile.in aclocal.m4 bin/Makefile.in
+    configure docs/Makefile.in fvwm/Makefile.in
+    libs/Makefile.in modules/FvwmAnimate/Makefile.in
+    modules/FvwmAuto/Makefile.in
+    modules/FvwmBacker/Makefile.in
+    modules/FvwmBanner/Makefile.in
+    modules/FvwmButtons/Makefile.in
+    modules/FvwmCommand/Makefile.in
+    modules/FvwmCommand/scripts/Makefile.in
+    modules/FvwmConsole/Makefile.in
+    modules/FvwmCpp/Makefile.in
+    modules/FvwmDebug/Makefile.in
+    modules/FvwmDragWell/Makefile.in
+    modules/FvwmEvent/Makefile.in
+    modules/FvwmForm/Makefile.in
+    modules/FvwmGtk/Makefile.in
+    modules/FvwmIconBox/Makefile.in
+    modules/FvwmIconMan/Makefile.in
+    modules/FvwmIdent/Makefile.in
+    modules/FvwmM4/Makefile.in
+    modules/FvwmPager/Makefile.in
+    modules/FvwmPerl/Makefile.in
+    modules/FvwmProxy/Makefile.in
+    modules/FvwmRearrange/Makefile.in
+    modules/FvwmSave/Makefile.in
+    modules/FvwmSaveDesk/Makefile.in
+    modules/FvwmScript/Makefile.in
+    modules/FvwmScript/Scripts/Makefile.in
+    modules/FvwmScript/Widgets/Makefile.in
+    modules/FvwmScroll/Makefile.in
+    modules/FvwmTaskBar/Makefile.in
+    modules/FvwmTheme/Makefile.in
+    modules/FvwmWharf/Makefile.in
+    modules/FvwmWinList/Makefile.in
+    modules/FvwmWindowMenu/Makefile.in modules/Makefile.in
+    perllib/FVWM/Makefile.in
+    perllib/FVWM/Module/Makefile.in
+    perllib/FVWM/Tracker/Makefile.in
+    perllib/General/Makefile.in perllib/Makefile.in
+    po/Makefile.in rpm/Makefile.in sample.fvwmrc/Makefile.in
+    tests/Makefile.in tests/hints/Makefile.in
+    utils/Makefile.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-55
+Summary: Re run autoconf and friends to regenerate the Makefiles and so on
+Keywords: 
+
+Re run autoconf and friends to regenerate the Makefiles and so on
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-51
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-51
@@ -0,0 +1,90 @@
+Revision: fvwm--autotools--2.5--patch-51
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 02:06:08 CDT 2005
+Standard-date: 2005-07-08 07:06:08 GMT
+New-files: .arch-ids/ChangeLog-pre-2.4.id
+    .arch-ids/ONEWS.id ChangeLog-pre-2.4 ONEWS
+    docs/.arch-ids/WindowStyle_proposal.txt.id
+    docs/.arch-ids/color_combos.id
+    docs/.arch-ids/m4_hacks.id docs/.arch-ids/todo-2.4.id
+    docs/.arch-ids/todo-2.6.id docs/.arch-ids/todo-3.0.id
+    docs/WindowStyle_proposal.txt docs/color_combos
+    docs/m4_hacks docs/todo-2.4 docs/todo-2.6 docs/todo-3.0
+    fvwm/.arch-ids/template.c.id
+    fvwm/.arch-ids/template.h.id fvwm/template.c
+    fvwm/template.h modules/.arch-ids/ChangeLog-pre-2.2.id
+    modules/ChangeLog-pre-2.2
+    modules/FvwmCommand/.arch-ids/Changes.id
+    modules/FvwmCommand/Changes
+    modules/FvwmDebug/.arch-ids/FvwmOldDebug.1.id
+    modules/FvwmDebug/FvwmOldDebug.1
+    modules/FvwmForm/.arch-ids/FvwmForm-RootCursor.pl.id
+    modules/FvwmForm/FvwmForm-RootCursor.pl
+    tests/FvwmButtons/.arch-ids/=id
+    tests/FvwmButtons/.arch-ids/FvwmButtons.sh.id
+    tests/FvwmButtons/FvwmButtons.sh
+    tests/menus/.arch-ids/=id
+    tests/menus/.arch-ids/README.id
+    tests/menus/.arch-ids/icon1.xpm.id
+    tests/menus/.arch-ids/icon2.xpm.id
+    tests/menus/.arch-ids/icon3.xpm.id
+    tests/menus/.arch-ids/install.menus.id
+    tests/menus/.arch-ids/menus.read.id
+    tests/menus/.arch-ids/sidepic.xpm.id tests/menus/README
+    tests/menus/icon1.xpm tests/menus/icon2.xpm
+    tests/menus/icon3.xpm tests/menus/install.menus
+    tests/menus/menus.read tests/menus/sidepic.xpm
+    tests/perl/.arch-ids/README.id
+    tests/perl/.arch-ids/module-example.id
+    tests/perl/.arch-ids/module-flash.id
+    tests/perl/.arch-ids/module-gtkflash.id
+    tests/perl/.arch-ids/module-tkdesker.id
+    tests/perl/.arch-ids/module-trackertest.id
+    tests/perl/.arch-ids/module-winlist.id
+    tests/perl/.arch-ids/xmessage.fpl.id
+    tests/perl/.arch-ids/xmessage.ppp.id tests/perl/README
+    tests/perl/module-example tests/perl/module-flash
+    tests/perl/module-gtkflash tests/perl/module-tkdesker
+    tests/perl/module-trackertest tests/perl/module-winlist
+    tests/perl/xmessage.fpl tests/perl/xmessage.ppp
+    tests/purify/.arch-ids/=id
+    tests/purify/.arch-ids/README.id
+    tests/purify/.arch-ids/install.purify.id
+    tests/purify/.arch-ids/purify.fvwm2rc.id
+    tests/purify/.arch-ids/purify.read.id
+    tests/purify/.arch-ids/test.png.id
+    tests/purify/.arch-ids/test1.xpm.id
+    tests/purify/.arch-ids/test2.xpm.id
+    tests/purify/.arch-ids/test3.xpm.id
+    tests/purify/.arch-ids/windowshade.pl.id
+    tests/purify/.arch-ids/xtrek_fed_e.xbm.id
+    tests/purify/README tests/purify/install.purify
+    tests/purify/purify.fvwm2rc tests/purify/purify.read
+    tests/purify/test.png tests/purify/test1.xpm
+    tests/purify/test2.xpm tests/purify/test3.xpm
+    tests/purify/windowshade.pl
+    tests/purify/xtrek_fed_e.xbm tests/random/.arch-ids/=id
+    tests/random/.arch-ids/README.id
+    tests/random/.arch-ids/mkrandomcfg.zsh.id
+    tests/random/README tests/random/mkrandomcfg.zsh
+    utils/.arch-ids/make_fvwmdist.sh.id
+    utils/make_fvwmdist.sh
+New-directories: tests/FvwmButtons
+    tests/FvwmButtons/.arch-ids tests/menus
+    tests/menus/.arch-ids tests/purify
+    tests/purify/.arch-ids tests/random
+    tests/random/.arch-ids
+Modified-files: configure configure.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-51
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-49
+   Manually finish sync with CVS version
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-44
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-44
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-44
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:45:22 CDT 2005
+Standard-date: 2005-07-08 05:45:22 GMT
+Modified-files: modules/FvwmScript/FvwmScript.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-44
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-42
+   * FvwmScript/FvwmScript.1.in
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-23
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-23
@@ -0,0 +1,23 @@
+Revision: fvwm--autotools--2.5--patch-23
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:22:45 CDT 2005
+Standard-date: 2005-07-08 05:22:45 GMT
+New-files: tests/perl/.arch-ids/=id
+    tests/perl/.arch-ids/module-gtkwinlist.id
+    tests/perl/module-gtkwinlist
+New-directories: tests/perl tests/perl/.arch-ids
+Modified-files: docs/ChangeLog docs/FAQ modules/ChangeLog
+    modules/FvwmDebug/FvwmDebug.in tests/ChangeLog
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-23
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-21
+   * FAQ (1.7)
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-8
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-8
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-8
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:07:51 CDT 2005
+Standard-date: 2005-07-08 01:07:51 GMT
+Modified-files: modules/FvwmCommand/FvwmCommand.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-8
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-6
+   * Fixed compiling FvwmCommand.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-13
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-13
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-13
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:18:41 CDT 2005
+Standard-date: 2005-07-08 01:18:41 GMT
+Modified-files: ChangeLog fvwm/conditional.c fvwm/focus.c
+    fvwm/icons.c fvwm/stack.c fvwm/style.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-13
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-11
+   * Fixed endless loop in DeIconify().
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-40
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-40
@@ -0,0 +1,19 @@
+Revision: fvwm--autotools--2.5--patch-40
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:42:35 CDT 2005
+Standard-date: 2005-07-08 05:42:35 GMT
+Modified-files: modules/ChangeLog
+    modules/FvwmProxy/FvwmProxy.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-40
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-38
+   * FvwmProxy/FvwmProxy.1.in: Use new variable syntax.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-41
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-41
@@ -0,0 +1,22 @@
+Revision: fvwm--autotools--2.5--patch-41
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:43:26 CDT 2005
+Standard-date: 2005-07-08 05:43:26 GMT
+Modified-files: ChangeLog fvwm/style.c libs/Event.c
+    libs/FGettext.c libs/FRenderInit.c libs/FScreen.h
+    libs/Fft.h libs/Graphics.c libs/Parse.c
+    libs/PictureUtils.c libs/fsm.c libs/fvwmlib.h
+    libs/setpgrp.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-41
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-39
+   * A little clean-up.
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-1
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-1
@@ -0,0 +1,17 @@
+Revision: fvwm--autotools--2.5--patch-1
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 19:16:44 CDT 2005
+Standard-date: 2005-07-08 00:16:44 GMT
+New-patches: srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+    srivasta@debian.org--etch/fvwm--autotools--2.5--patch-1
+Summary: Synch with upstream
+Keywords: 
+
+Synch with upstream
+
+Patches applied:
+
+ * srivasta@debian.org--2003-primary/fvwm--upstream--2.5--version-0
+   fvwm--upstream is frozen for Sarge, look at srivasta@debian.org--etch/fvwm--upstream
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-31
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-31
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-31
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Fri Jul  8 00:31:44 CDT 2005
+Standard-date: 2005-07-08 05:31:44 GMT
+Modified-files: AUTHORS ChangeLog fvwm/fvwm.1.in
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-31
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-29
+   ...
+
--- fvwm-2.5.18.orig/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-5
+++ fvwm-2.5.18/{arch}/fvwm/fvwm--autotools/fvwm--autotools--2.5/srivasta@debian.org--etch/patch-log/patch-5
@@ -0,0 +1,18 @@
+Revision: fvwm--autotools--2.5--patch-5
+Archive: srivasta@debian.org--etch
+Creator: Manoj Srivastava <srivasta@debian.org>
+Date: Thu Jul  7 20:02:41 CDT 2005
+Standard-date: 2005-07-08 01:02:41 GMT
+Modified-files: ChangeLog libs/Parse.c
+New-patches: srivasta@debian.org--etch/fvwm--autotools--2.5--patch-5
+    srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Summary: Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+Keywords: 
+
+Synch with srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+
+Patches applied:
+
+ * srivasta@debian.org--etch/fvwm--upstream--2.5--patch-3
+   * Allow whitespace before commas in WindowList options.  May affect other
+
--- fvwm-2.5.18.orig/{arch}/++default-version
+++ fvwm-2.5.18/{arch}/++default-version
@@ -0,0 +1 @@
+srivasta@debian.org--etch/fvwm--devo--2.5.18
--- fvwm-2.5.18.orig/{arch}/=tagging-method
+++ fvwm-2.5.18/{arch}/=tagging-method
@@ -0,0 +1,165 @@
+# id tagging method
+#
+# This determines how "inventory ids", strings conveying
+# logical file identity, are computed for each file, directory
+# and symbolic link.
+#
+# The choices are:
+#
+# tagline: inventory ids may be set using add-id, or omitted
+#          (though tree-lint warns about omitted ids), or in
+#          text files, set in a comment line near the top or
+#          bottom of the file of a form like "<PUNCT> arch-tag: <STRING>".
+#          Renames of files with no id are treated as a combined
+#          add and delete (e.g., local changes can be lost).
+#
+# explicit: ids must be set using add-id.  Files passing the naming
+#          conventions for source, but lacking add-id ids, are treated
+#          as unrecognized files (see below).
+#
+# names: ids are not used.  All renames are treated as add+delete
+#
+# implicit: similar to tagline, but in addition, the id comment
+#          may be of the form "<PUNCT> <BASENAME> - <STRING>", where
+#          <BASENAME> is the basename of the file.   This method
+#          is not recommended, but is retained for backwards
+#          compatability.
+#
+
+explicit
+
+# disposition of untagged source files
+#
+# (NOTE: this option must follow the tagline/explicit/names/implicit
+# directive.)
+#
+# By default, the explicit method treats untagged files matching the naming
+# conventions for source files as unrecognized and the implicit and tagline
+# methods treat such untagged files as source.
+#
+# You can override those default treatments of untagged files by specifying
+# which inventory category (see below) should be used for files whose names
+# suggest they are source but which lack ids.
+#
+# This feature may be especially convenient when importing sources that do
+# not use file naming conventions that can be conveniently described with
+# the regexps below.
+#
+# Uncomment one of these lines as appropriate to override the default:
+#
+# untagged-source source
+# untagged-source precious
+# untagged-source backup
+# untagged-source junk
+# untagged-source unrecognized
+#
+
+# naming convention regexps
+#
+# For various commands, arch traverses your project trees, categorizing
+# the files found there.  For example, when importing a project for
+# the first time, this traversal determines which files are included
+# in the import.
+#
+# The categories of greatest importance are defined in terms of three
+# questions:
+#
+# 1) If arch makes a local copy of this tree, should this file be included
+#    in the copy?
+#
+# 2) Is it generally safe to remove this file based only on how it is named?
+#    For example, can it be safely clobbered by a new file of the same name?
+#
+# 3) Should this file be archived along with the project?  For example,
+#    should it be included when importing the project for the first time?
+#
+# The primary categories are:
+#
+# category:      copy locally?       safe to clobber?      archive?
+#
+# junk           no                  yes                   no
+# backup         no                  no                    no
+# precious       yes                 no                    no
+# source         yes                 no                    yes
+#
+# There are two additional categories, unrelated to those questions:
+#
+# excluded -- during a traversal by srcfind (aka inventory), this file (and,
+#             if a directory, its contents) are simply ignored unless the
+#             --all flag is specified.   This category is usually used to
+#             omit arch's own control files from a listing.
+#
+# unrecognized -- a category for files whose name fits no other pattern.
+#             Usually, the presence of unrecognized files is treated as an
+#             error.   You can use the naming conventions to define certain
+#             names as "deliberately unrecognized" -- i.e., filenames whose
+#             presence in a source tree you _want_ to be treated as an error
+#
+# The traveral algorithm is described here, along with lines you can edit to
+# customize the naming conventions.
+#
+# Starting at "." within a project tree (usually at the root of the
+# project tree) consider each filename in that directory.
+#
+# The files "." and ".." are simply ignored.
+#
+# Files containing "illegal characters" are characterized as unrecognized.
+# If they are directories, traversal does _not_ descend into those directories.
+# Currently, the illegal characters are *, ?, [, ], \, space, and tab.
+# (The set of illegal characters may shrink in future releases.)
+#
+# In an interactive call to srcfind (aka inventory) _without_ the --all flag,
+# names are next compared to the exclude regexp defined here.  Those that
+# are ignored and not descended below.  (Most arch operations performing
+# traversals internally, e.g. imprev (aka import), do not use this pattern
+# and skip this step of the algorithm.
+#
+
+exclude ^(.arch-ids|\{arch\})$
+
+# If the file has a name that begins with "++", it is categorized as
+# _precious_.  Names of this form are hard-wired and reserved for use by arch
+# itself.  Traversal does not descend into precious directories, but when a
+# precious directory is copied, its contents are recursively copied.
+#
+# Files and directories that reach this stage and which arch recognizes as its
+# own control files are classified at this step as source.   Traversal _does_
+# descend into source directories.
+#
+# If the file has a name that begins with ",,", it is categorized as _junk_.
+# Names of this form are hard-wired and reserved for use by arch and other tools,
+# and arch may clobber such files without warning.  In a project tree, when no 
+# arch commands are running, it is safe for users to delete any ",," files. 
+# Although the general rule for junk files is that arch is free to clobber them,
+# in fact, arch will only ever clobber files starting with ",,".
+#
+# Traversal does not descend into junk directories.
+#
+# For your convenience, at this step of the traversal, you can classify
+# additional files as junk or precious:
+#
+
+junk ^(,.*)$
+
+precious ^(\+.*|\.gdbinit|\.#ckpts-lock|=build\.*|=install\.*|CVS|CVS\.adm|RCS|RCSLOG|SCCS|TAGS)$
+
+# Files matching the following regexp are classified as backup files, and
+# traversal does not descend into backup directories:
+#
+
+backup ^.*(~|\.~[0-9]+~|\.bak|\.orig|\.rej|\.original|\.modified|\.reject)$
+
+# If you want to force certain filenames to be treated as errors when present,
+# you can add them to the regexp for deliberately unrecognized files.  Traversal
+# does not descend into unrecognized directories.
+
+unrecognized ^(.*\.(o|a|so|core|so(\.[[:digit:]]+)*)|core)$
+
+# Files which match the following pattern are treated as source files.
+# Traversal _does_ descend into source directories:
+
+source ^([_=a-zA-Z0-9].*|.*.sample)$
+
+# Any files not classified by the above rules are classified as unrecognized.
+# Traversal does not descend into unrecognized directories.
+
--- fvwm-2.5.18.orig/configure.ac
+++ fvwm-2.5.18/configure.ac
@@ -1433,8 +1433,6 @@
 	perllib/FVWM/Module.pm
 	rpm/Makefile
 	rpm/fvwm.spec
-	debian/Makefile
-	debian/control
 	docs/fvwm.lsm
 	docs/Makefile
 	sample.fvwmrc/Makefile
--- fvwm-2.5.18.orig/aclocal.m4
+++ fvwm-2.5.18/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,55 +11,32 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.5])])
-
-# AM_AUX_DIR_EXPAND
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -106,26 +83,16 @@
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 7
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -145,30 +112,19 @@
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# serial 7						-*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -177,7 +133,6 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
@@ -317,26 +272,16 @@
 AC_SUBST([AMDEPBACKSLASH])
 ])
 
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-#serial 2
+#serial 3
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -355,27 +300,21 @@
   else
     continue
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -401,54 +340,31 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
 AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+# Do all the work for Automake.                             -*- Autoconf -*-
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
 
-# serial 11
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
@@ -506,7 +422,6 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -515,7 +430,9 @@
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
                   [_AM_DEPENDENCIES(CC)],
@@ -549,51 +466,27 @@
 done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
@@ -608,26 +501,15 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -671,27 +553,16 @@
 rm -f confinc confmf
 ])
 
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -717,27 +588,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -758,13 +618,21 @@
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
 [if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -783,26 +651,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -827,28 +684,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -891,25 +736,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -930,4 +764,100 @@
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
 m4_include([acinclude.m4])
--- fvwm-2.5.18.orig/debian/watch
+++ fvwm-2.5.18/debian/watch
@@ -0,0 +1,5 @@
+# format version number, currently 2; this line is compulsory!
+version=2
+
+ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-(.*)\.tar\.gz debian
+
--- fvwm-2.5.18.orig/debian/Fvwm.desktop
+++ fvwm-2.5.18/debian/Fvwm.desktop
@@ -0,0 +1,15 @@
+## /etc/dm/Sessions/Fvwm.desktop ##
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Fvwm
+Comment=Fvwm
+Exec=fvwm
+Terminal=False
+TryExec=fvwm
+Type=Application
+
+[Window Manager]
+SessionManaged=true
+
+##
\ No newline at end of file
--- fvwm-2.5.18.orig/debian/menu-method
+++ fvwm-2.5.18/debian/menu-method
@@ -0,0 +1,56 @@
+#!/usr/bin/install-menu
+#I need menu-1.4!
+# arch-tag: 73ccd6e4-fcf8-4b3f-8672-f61ae101cab5
+
+compat="menu-1"
+
+!include menu.h
+!include lang.h
+
+outputencoding="LOCALE"
+
+function start($var,$com)=\
+            "+ \"" escfirst(esc(title(),"\\\""),$hotkey,"&") \
+            cond_surr(icon(),"%","%") "\" " $var " " $com "\n"
+
+supported 
+  fvwmmodule=  start("Module", $command)
+  fvwmother=   start("",       $command)
+  wm=          start("Restart",$command)
+  x11fvwm2=    start("Exec exec",   $command)
+  x11fvwm=     start("Exec exec",   $command)
+  x11=         start("Exec exec",   $command)
+  text=        start("Exec exec",   term())
+endsupported
+
+# Usage:
+#   Read /etc/X11/fvwm/menudefs.hook
+#   Popup /Debian
+
+# Ok, "startmenu" is a little wacky, and comes in 4 parts:
+# 1. If this is running for a user, then we do a DestroyMenu to clear
+#    out the system one. Furthermore, if we're dealing with the
+#    top-level /Debian menu, then add a title for it (normally done in
+#    system.fvwm2rc).  Of course, none of this happens if we're
+#    running as root to produce the system-wide menudef.hook file.
+# 2. We spit out an "AddToMenu /Foo/Bar/Baz" to start this menu.
+# 3. We add a trailing newline to the lot.
+
+startmenu=   "DestroyMenu \"" replacewith($section," ","_") "\"\n" \
+             "AddToMenu   \"" replacewith($section," ","_") "\" \"" \
+                 title() "\" Title Top\n"
+endmenu=     "\n"
+
+submenutitle= "+ \"" escfirst(title(),$hotkey,"&") \
+           cond_surr(icon(),"%","%") "\" Popup \"" \
+           replacewith($section," ","_") "\"\n"
+genmenu=   "menudefs.hook"
+rootprefix="/etc/X11/fvwm/"
+
+#Technical note: For historical reason, userprefix treat path starting
+#with 2 / as absolute and with 0 or one / as relative to $HOME. This
+#is why I added a / before the $
+#userprefix="/.fvwm/"
+userprefix=shell("echo -n /${FVWM_USERDIR-.fvwm}")
+treewalk="c(m)"
+mainmenutitle = "Debian Menu"
--- fvwm-2.5.18.orig/debian/postinst
+++ fvwm-2.5.18/debian/postinst
@@ -1,10 +1,49 @@
 #! /bin/sh
-# postinst script for fvwm
+#                         -*- Mode: Sh -*- 
+# postinst --- 
+# Author           : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) 
+# Created On       : Fri Nov 14 11:25:07 2003
+# Created On Node  : glaurung.green-gryphon.com
+# Last Modified By : Manoj Srivastava
+# Last Modified On : Mon Aug  8 20:48:26 2005
+# Last Machine Used: glaurung.internal.golden-gryphon.com
+# Update Count     : 31
+# Status           : Unknown, Use with caution!
+# HISTORY          : 
+# Description      : 
+# 
+# arch-tag: 5401e9ef-39cc-4aee-96a4-61dfb8f32cf7
+#  
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-# see: dh_installdeb(1)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# 
 
+# Abort if any command returns an error value
 set -e
 
+package_name=fvwm
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+# This script is called as the last step of the installation of the
+# package.  All the package's files are in place, dpkg has already done
+# its automatic conffile handling, and all the packages we depend of
+# are already fully installed and configured.
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -23,32 +62,218 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+# The following idempotent stuff doesn't generally need protecting
+# against being run in the abort-* cases.
+
+# Install info files into the dir file
+##: install-info --quiet --section "section pattern" "Section Title" \
+##:              --description="Name of the document" /usr/info/${package_name}.info
+
+# Create stub directories under /usr/local
+##: if test ! -d /usr/local/lib/${package_name}; then
+##:   if test ! -d /usr/local/lib; then
+##:     if mkdir /usr/local/lib; then
+##:       chown root.staff /usr/local/lib || true
+##:       chmod 2775 /usr/local/lib || true
+##:     fi
+##:   fi
+##:   if mkdir /usr/local/lib/${package_name}; then
+##:     chown root.staff /usr/local/lib/${package_name} || true
+##:     chmod 2775 /usr/local/lib/${package_name} || true
+##:   fi
+##: fi
+
+if [ -e /etc/menu-methods/fvwm ] && [ ! -x /etc/menu-methods/fvwm ]; then
+    chmod a+x /etc/menu-methods/fvwm 
+fi
+
+# Ensure the menu system is updated
+[ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus
+
+
+## Deprecated
+##if test -x /usr/sbin/wm-menu-config; then wm-menu-config fvwm on; fi
+
+
+# Arrange for a daemon to be started at system boot time
+##: update-rc.d ${package_name} default >/dev/null
+
+
+
+# This package uses debconf to ask a question, so source the debconf
+# confmodule as early as possible. However, it does not depend on debconf,
+# so debconf may not be installed.
+if [ -e /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+        db_capb
+fi
+
+
 case "$1" in
-	configure)
-		if [ -x /usr/sbin/update-alternatives ]; then
-			update-alternatives --install \
-				/usr/bin/x-window-manager x-window-manager \
-				/usr/bin/fvwm 50 --slave \
-				/usr/share/man/man1/x-window-manager.1.gz \
-				x-window-manager.1.gz \
-				/usr/share/man/man1/fvwm.1.gz
-			update-alternatives --set \
-				x-window-manager /usr/bin/fvwm
-		fi
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-		;;
+  configure)
+    # Configure this package.  If the package must prompt the user for
+    # information, do it here.
+    # Install emacs lisp files
+    ##:if [ -x  /usr/lib/emacsen-common/emacs-package-install ]; then
+    ##:    /usr/lib/emacsen-common/emacs-package-install $package_name
+    ##:fi
+
+
+    # Activate menu-methods script
+    chmod a+x /etc/menu-methods/${package_name}
+
+    # Update ld.so cache
+    ##: ldconfig
+
+    # Make our version of a program available
+    update-alternatives                                                        \
+           --install /usr/bin/fvwm fvwm /usr/bin/fvwm2 200                     \
+           --slave   /usr/share/man/man1/fvwm.1.gz fvwm.1.gz                     \
+                     /usr/share/man/man1/fvwm2.1.gz
+    update-alternatives                                                        \
+        --install /usr/bin/x-window-manager x-window-manager /usr/bin/fvwm2 50 \
+        --slave   /usr/share/man/man1/x-window-manager.1.gz                     \
+ 	         x-window-manager.1.gz /usr/share/man/man1/fvwm2.1.gz
+
+    # Tell ucf that the file in /usr/share/foo is the latest
+    # maintainer version, and let it handle how to manage the real
+    # confuguration file in /etc. This is how a static configuration
+    # file can be handled:
+    ##:if which ucf >/dev/null 2>&1; then
+    ##:  ucf /usr/share/${package_name}/configuration /etc/${package_name}.conf
+    ##:fi
+
+    ### We could also do this on the fly. The following is from Tore
+    ### Anderson:
+    
+    #. /usr/share/debconf/confmodule
+
+    ### find out what the user answered.
+    #  db_get foo/run_on_boot
+    #  run_on_boot=$RET
+    #  db_stop
+
+    ### safely create a temporary file to generate our suggested
+    ### configuration file.
+    #    tempfile=`tempfile`
+    #    cat << _eof > $tempfile
+    ### Configuration file for Foo.
+
+    ### this was answered by you, the user in a debconf dialogue
+    #  RUNONBOOT=$run_on_boot
+
+    ### this was not, as it has a sane default value.
+    #  COLOUROFSKY=blue
+
+    #_eof
+
+    ### Note that some versions of debconf do not release stdin, so
+    ### the following invocation of ucf may not work, since the stdin
+    ### is never coneected to ucfr.
+
+    ### now, invoke ucf, which will take care of the rest, and ask
+    ### the user if he wants to update his file, if it is modified.
+    #ucf $tempfile /etc/foo.conf
+
+    ### done! now we'll just clear up our cruft.
+    #rm -f $tempfile
+
+
+
+    # There are three sub-cases:
+    if test "${2+set}" != set; then
+      # We're being installed by an ancient dpkg which doesn't remember
+      # which version was most recently configured, or even whether
+      # there is a most recently configured version.
+      for i in system.fvwm2rc init-restart.hook; do
+	  if [ -f /etc/X11/fvwm/$i ]; then
+	      if [ ! -L /etc/X11/fvwm/$i ]; then
+		  mv -f /etc/X11/fvwm/$i /etc/X11/fvwm/${i}.dpkg-old	  
+	      fi
+	  fi
+      done
+
+    elif test -z "$2" || test "$2" = "<unknown>"; then
+      # The package has not ever been configured on this system, or was
+      # purged since it was last configured.
+      :
+
+    else
+      # Version $2 is the most recently configured version of this
+      # package.
+      if dpkg --compare-versions "$2" lt "2.5.8" ; then
+	  for i in system.fvwm2rc init-restart.hook; do
+	      if [ -f /etc/X11/fvwm/$i ]; then
+		  if [ ! -L /etc/X11/fvwm/$i ]; then
+		      mv -f /etc/X11/fvwm/$i /etc/X11/fvwm/${i}.dpkg-old	  
+		  fi
+	      fi
+	  done
+      fi
+    fi 
+    ;;
+  abort-upgrade)
+    # Back out of an attempt to upgrade this package FROM THIS VERSION
+    # to version $2.  Undo the effects of "prerm upgrade $2".
+    ##:
+
+    ;;
+  abort-remove)
+    if test "$2" != in-favour; then
+      echo "$0: undocumented call to \`postinst $*'" 1>&2
+      exit 0
+    fi
+    # Back out of an attempt to remove this package, which was due to
+    # a conflict with package $3 (version $4).  Undo the effects of
+    # "prerm remove in-favour $3 $4".
+    ##:
+
+    ;;
+  abort-deconfigure)
+    if test "$2" != in-favour || test "$5" != removing; then
+      echo "$0: undocumented call to \`postinst $*'" 1>&2
+      exit 0
+    fi
+    # Back out of an attempt to deconfigure this package, which was
+    # due to package $6 (version $7) which we depend on being removed
+    # to make way for package $3 (version $4).  Undo the effects of
+    # "prerm deconfigure in-favour $3 $4 removing $6 $7".
+    ##:
+
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+# Install doc base documentation
+##:if which install-docs >/dev/null 2>&1; then
+##:  if [ -e /usr/share/doc-base/${package_name} ]; then
+##:    install-docs -i /usr/share/doc-base/${package_name}
+##:  fi
+##:fi
+
+if [ -L /etc/alternatives/fvwm ]; then
+    BROKEN_FVWM_ALTERNATIVE=`readlink /etc/alternatives/fvwm`
+    if [ x$BROKEN_FVWM_ALTERNATIVE = x/usr/X11R6/bin/fvwm2 ]; then
+        update-alternatives --remove fvwm /usr/X11R6/bin/fvwm2
+        update-alternatives --auto fvwm
+    elif [ x$BROKEN_FVWM_ALTERNATIVE = x/usr/bin/X11/fvwm2 ]; then
+        update-alternatives --remove fvwm /usr/bin/X11/fvwm2
+        update-alternatives --auto fvwm
+    fi    
+fi
+
+if [ -L /etc/alternatives/x-window-manager ]; then
+    BROKEN_X_WM_ALTERNATIVE=`readlink /etc/alternatives/x-window-manager`
+    if [ x$BROKEN_X_WM_ALTERNATIVE = x/usr/X11R6/bin/fvwm2 ]; then
+        update-alternatives --remove x-window-manager /usr/X11R6/bin/fvwm2
+        update-alternatives --auto x-window-manager
+    elif [ x$BROKEN_X_WM_ALTERNATIVE = x/usr/bin/X11/fvwm2 ]; then
+        update-alternatives --remove x-window-manager /usr/bin/X11/fvwm2
+        update-alternatives --auto x-window-manager
+    fi
+fi
+
 
-#DEBHELPER#
 
 exit 0
--- fvwm-2.5.18.orig/debian/NEWS.Debian
+++ fvwm-2.5.18/debian/NEWS.Debian
@@ -0,0 +1,52 @@
+fvwm (2.5.10-6) unstable; urgency=low
+
+  * Previous versions of the FVWM package provided a Debian-specific default
+    configuration setup which was suboptimal in some respects. Starting with
+    2.5.10, the Debian packages rely on FVWM's own default configuration
+    mechanisms. Thus, if you start without a ~/.fvwm/ directory and no
+    ~/.fvwm2rc file, FVWM will provide a menu that sets up a basic
+    configuration for you.
+  * If you are upgrading from a previous version of the FVWM package and you
+    would like to populate your home directory with the old Debian-specific
+    default configuration, you may be able to do so by using the following
+    commands:
+     mkdir ~/.fvwm
+     for i in /etc/X11/fvwm/*.hook.dpkg-old; do
+       cp "$i" "~/.fvwm/$(basename "$i" .dpkg-old)"
+     done
+  * Even though it's possible for you to use the old Debian-specific
+    configuration files, this is not recommended. Aside from FVWM's own
+    default configuration, this Debian package includes a full set of examples
+    in /usr/share/doc/fvwm/sample.fvwmrc/, and http://www.fvwm.org/ has many
+    additional resources.
+
+ -- Manoj Srivastava <srivasta@debian.org>  Fri,  7 May 2004 00:59:50 -0500
+
+fvwm (2.5.8-0.3) experimental; urgency=low
+
+  * There are new conditions, conditional statements, styles, commands,
+    command options, transparency support, EWMH support (allows
+    integration into KDE and GNOME environments), finer grained
+    customization of decorations, themes support, finer grained binding of
+    commands to portions of the window border, anti-aliased text rendering
+    support, embedded perl library for creating modules in Perl, better
+    placement algorithms, improved performance, new graphical debugger
+    module, and many other changes.
+  * There are new utilities to help customize fvwm if there is no fvwmrc
+    file available.  Because of this, the package removes the default
+    system-wide fvwmrc file, since that shadowed the nice configuration
+    utilities. 
+  * The Debian menu is available from the file /etc/X11/fvwm/DebianMenu
+    (the old file /etc/X11/fvwm/menudefs.hook shall be retained as a
+    synlink for a bit). This would require a change in existing user
+    configuration files.
+  * In the postinst we now move old conffiles out of the way (.dpkg-old),
+    since they interfere with the new configuration generation tools; but
+    we do not delete the files, so preserving user changes. We only do
+    this if the user is upgrading from a pre 2.5.8 version. On purge, we
+    remove all these preserved files as well.
+  * As a passing note, this package under the control of arch
+    arch-tag: ec98d578-705b-4b9e-80bb-4d998c2d377c
+
+
+ -- Manoj Srivastava <srivasta@debian.org>  Wed, 26 Nov 2003 09:41:16 -0600
--- fvwm-2.5.18.orig/debian/copyright
+++ fvwm-2.5.18/debian/copyright
@@ -1,19 +1,52 @@
-The automatic deb package creation procedure is created by fvwm
-developers with help of Andrei Mitrofanow <smilebef@web.de>.
+This package was debianized by Alexander Kotelnikov <sacha@debian.org> on
+Thu, 14 Dec 2000 14:30:25 +0300.
 
-Upstream Authors:
-	See AUTHORS file.
+It was downloaded from <http://www.fvwm.org/download.html>
 
-Copyright:
-	The entire fvwm distribution is subject to the GNU General Public
-	Licence version 2 or later (see /usr/share/common-licenses/GPL-2).
-
-	Additional copyrights of the fvwm main module:
-
-fvwm is copyright 1988 by Evans and Sutherland Computer
-Corporation, Salt Lake City, Utah, and 1989 by the Massachusetts
-Institute of Technology, Cambridge, Massachusetts, All rights
-reserved.  It is also copyright 1993 and 1994 by Robert Nation.
+Upstream Authors: read AUTHORS file
+
+License: GPL version 2 (see /usr/share/common-licenses/GPL-2) and
+additional copyrights of the fvwm main module:
+
+ Portions of fvwm are:
+  Copyright (C) 1988 by Evans and Sutherland Computer Corporation, Salt
+  Lake City, Utah,
+  Copyright (C) 1989 by the Massachusetts Institute of Technology,
+  Cambridge, Massachusetts, All rights reserved.
+  Copyright (C) 1992  Alan Richardson (mppa3@uk.ac.sussex.syma)
+  Copyright (C) 1993, 1994 by Robert Nation.
+  Copyright (C) 1994  Mark Boyns
+  Copyright (C) 1994  Mark Scott
+  Copyright (C) 1994  Mike Finger
+  Copyright (C) 1994  Nobutaka Suzuki
+  Copyright (C) 1995  Bo Yang
+  Copyright (C) 1995  Carsten Paeth
+  Copyright (C) 1995  Pekka Pietik{inen (pp@netppl.fi)
+  Copyright (C) 1995  Thomas Zuwei Feng
+  Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+  Copyright (C) 1996  Alfredo Kengi Kojima (kojima@inf.ufrgs.br)
+  Copyright (C) 1996  Alfredo Kojima
+  Copyright (C) 1996  Beat Christen.
+  Copyright (C) 1996  Caesar Crusius
+  Copyright (C) 1996  Frederic Cordier
+  Copyright (C) 1996  Jarl Totland
+  Copyright (C) 1996  Kaj Groner <kajg@mindspring.com>
+  Copyright (C) 1997  Frank Scheelen <scheelen@worldonline.nl>
+  Copyright (C) 1998  Albrecht Kadlec
+  Copyright (C) 1998  Dan Espen <dane@mk.bellcore.com>
+  Copyright (C) 1998  Toshi Isogai
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2002, 2003, 2004  Mikhael Goikhman
+  Copyright (C) 1999  Fabien Villard
+  Copyright (C) 1999  Matthias Clasen <clasen@mathematik.uni-freiburg.de>
+  Copyright (C) 1999  Sir Boris. sir_boris@bigfoot.com
+  Copyright (C) 1999, 2001, 2003  Dominik Vogt
+  Copyright (C) 1999, 2002 Joey Shutup.
+  Copyright (C) 2001  Dmitry Bolkhovityanov
+  Copyright (C) 2001, 2002, 2003, 2004 Olivier Chapuis
+  Copyright (C) 2002  Jason Weber
+  Copyright (C) 2002  Nadim Shaikli (arabeyes.org) 
+  Copyright (C) 2002, 2003, 2004, 2005, 2006 Scott Smedley ss@aao.gov.au
+  Copyright (C) 2003  Marcus Lundblad
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
@@ -32,3 +65,18 @@
 USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
+
+The Debian specific changes are Â© 2004, 2005, 2006, Manoj Srivastava
+<srivasta@debian.org>, and distributed under the terms of the GNU
+General Public License, version 2.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'. 
+
+    A copy of the GNU General Public License is also available at
+    <URL:http://www.gnu.org/copyleft/gpl.html>.  You may also obtain
+    it by writing to the Free Software Foundation, Inc., 51 Franklin
+    St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Manoj Srivastava <srivasta@debian.org>
+arch-tag: d4250e44-a0e0-4ee0-adb9-2bd74f6eeb27
--- fvwm-2.5.18.orig/debian/.arch-ids/templates.id
+++ fvwm-2.5.18/debian/.arch-ids/templates.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Apr  8 13:45:51 2004 7706.0
--- fvwm-2.5.18.orig/debian/.arch-ids/conffiles.id
+++ fvwm-2.5.18/debian/.arch-ids/conffiles.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 14:59:22 2003 1554.1
--- fvwm-2.5.18.orig/debian/.arch-ids/menuentry-fvwm-gnome.id
+++ fvwm-2.5.18/debian/.arch-ids/menuentry-fvwm-gnome.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Jun 25 16:42:34 2004 9493.0
--- fvwm-2.5.18.orig/debian/.arch-ids/watch.id
+++ fvwm-2.5.18/debian/.arch-ids/watch.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Oct  1 02:13:18 2004 28662.1
--- fvwm-2.5.18.orig/debian/.arch-ids/Fvwm.desktop.id
+++ fvwm-2.5.18/debian/.arch-ids/Fvwm.desktop.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.0
--- fvwm-2.5.18.orig/debian/.arch-ids/=id
+++ fvwm-2.5.18/debian/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:07:57 2004 16672.0
--- fvwm-2.5.18.orig/debian/.arch-ids/templates.master.id
+++ fvwm-2.5.18/debian/.arch-ids/templates.master.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Apr  8 12:22:09 2004 18199.0
--- fvwm-2.5.18.orig/debian/.arch-ids/control.id
+++ fvwm-2.5.18/debian/.arch-ids/control.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Nov 21 03:17:12 2003 26704.0
--- fvwm-2.5.18.orig/debian/.arch-ids/changelog.id
+++ fvwm-2.5.18/debian/.arch-ids/changelog.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 14:59:22 2003 1554.0
--- fvwm-2.5.18.orig/debian/.arch-ids/menuentry-fvwm.id
+++ fvwm-2.5.18/debian/.arch-ids/menuentry-fvwm.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Tue Nov 25 14:59:22 2003 1554.2
--- fvwm-2.5.18.orig/debian/templates.master
+++ fvwm-2.5.18/debian/templates.master
@@ -0,0 +1,26 @@
+Template: fvwm/upgrade/pre_2.5.8
+Type: boolean
+Default: false
+_Description: Are you sure you want to upgrade fvwm?
+ This version of FVWM, is a major upgrade from previous versions.
+ There have been extensive changes.  There is no longer a System
+ provided fvwmrc file. User config must be changed for this version of
+ FVWM. Please abort if you are not prepared for that, or if you need
+ time to contact all users of FVWM on this machine.
+ .
+ There are new utilities to help customize FVWM if there is no fvwmrc
+ file available.  Because of this, the package removes the default
+ system-wide fvwmrc file, since that shadowed the nice configuration
+ utilities. If there is no ~/.fvwmrc file available, FVWM shall present
+ a default menu that allows one to generate an initial .fvwm directory.
+ Please read /usr/share/doc/fvwm/News.Debian.gz for upgrade hints.
+ .
+ I repeat, FVWM 2.5.8 no longer has system wide configuration files.
+ In the postinst we now move old conffiles out of the way (.dpkg-old),
+ since they interfere with the new configuration generation
+ tools. Since the files are just moved, but not deleted, we preserve
+ user changes. We only do this if the user is upgrading from a pre
+ 2.5.8 version. On purge, we remove all these preserved files as well.
+ .
+ Please make sure you are prepared for these changes in FVWM before
+ continuing with its upgrade.
--- fvwm-2.5.18.orig/debian/po/POTFILES.in
+++ fvwm-2.5.18/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates.master
--- fvwm-2.5.18.orig/debian/po/nl.po
+++ fvwm-2.5.18/debian/po/nl.po
@@ -0,0 +1,94 @@
+# 
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm 2.5.10-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2004-08-01 14:50+0100\n"
+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Bent u zeker dat u fvwm wilt opwaarderen?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Deze versie van FVWM is een belangrijke opwaardering van vorige versies. Er "
+"zijn extensieve wijzigingen doorgevoerd. Er wordt niet langer een "
+"systeemwijd fvwmrc-bestand aangeboden. Gebruikersconfiguratie moet worden "
+"gewijzigd voor deze versie van FVWM. Breek af als u hierop niet voorbereid "
+"bent, of als u tijd nodig heeft om alle FVWM-gebruikers op deze machine te "
+"contacteren."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"Er zijn nieuwe hulpmiddelen om te helpen bij fvwm-customizatie als er geen "
+"fvwmrc-bestand aanwezig is. Hiervoor verwijdert het pakket het standaard "
+"systeemwijde fvwmrc-bestand omdat dat de leuke configuratiehulpmiddelen "
+"overschaduwt. Als er geen ~/.fvwm-bestand aanwezig is, dan zal fvwm een "
+"standaard menu presenteren dat toestaat om een initiële .fvwm-map aan te "
+"maken. Lees /usr/share/doc/fvwm/News.Debian voor hints bij de opwaardering."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Ter herhaling: FVWM 2.5.8 heeft geen systeemwijde configuratiebestanden "
+"meer. In de postinst worden oude conffiles opgeruimd (.dpkg-old) omdat ze "
+"interfereren met de nieuwe configuratiegeneratiehulpmiddelen. Omdat de "
+"bestanden enkel worden verplaatst, maar niet verwijderd, kunnen wijzigingen "
+"door gebruikers behouden blijven. Dit wordt enkel gedaan als de gebruiker "
+"aan het opwaarderen is van een pre-2.5.8-versie. Bij wissen (purge) worden "
+"ook al deze bestanden verwijderd."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Zorg dat u voorbereid bent op deze wijzigingen in FVWM alvorens verder te "
+"gaan met de opwaardering."
--- fvwm-2.5.18.orig/debian/po/templates.pot
+++ fvwm-2.5.18/debian/po/templates.pot
@@ -0,0 +1,74 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
--- fvwm-2.5.18.orig/debian/po/.arch-ids/nl.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/nl.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Wed Jun 23 13:45:15 2004 26161.2
--- fvwm-2.5.18.orig/debian/po/.arch-ids/templates.pot.id
+++ fvwm-2.5.18/debian/po/.arch-ids/templates.pot.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Apr  8 12:22:09 2004 18199.3
--- fvwm-2.5.18.orig/debian/po/.arch-ids/cs.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/cs.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Oct  1 02:13:18 2004 28662.0
--- fvwm-2.5.18.orig/debian/po/.arch-ids/ja.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/ja.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Nov 19 11:01:58 2004 24283.1
--- fvwm-2.5.18.orig/debian/po/.arch-ids/de.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/de.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Wed Jun 23 13:45:15 2004 26161.0
--- fvwm-2.5.18.orig/debian/po/.arch-ids/sv.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/sv.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Oct 20 12:35:42 2005 24613.0
--- fvwm-2.5.18.orig/debian/po/.arch-ids/POTFILES.in.id
+++ fvwm-2.5.18/debian/po/.arch-ids/POTFILES.in.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Apr  8 12:22:09 2004 18199.2
--- fvwm-2.5.18.orig/debian/po/.arch-ids/fr.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/fr.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Wed Jun 23 13:45:15 2004 26161.1
--- fvwm-2.5.18.orig/debian/po/.arch-ids/vi.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/vi.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Jul  8 15:16:58 2005 921.0
--- fvwm-2.5.18.orig/debian/po/.arch-ids/=id
+++ fvwm-2.5.18/debian/po/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Apr  8 12:22:09 2004 18199.1
--- fvwm-2.5.18.orig/debian/po/.arch-ids/pt_BR.po.id
+++ fvwm-2.5.18/debian/po/.arch-ids/pt_BR.po.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri Nov 19 11:01:58 2004 24283.0
--- fvwm-2.5.18.orig/debian/po/cs.po
+++ fvwm-2.5.18/debian/po/cs.po
@@ -0,0 +1,93 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2004-09-26 18:53+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <provoz@debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Jste si jisti, ¾e chcete aktualizovat fvwm?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Tato verze FVWM pro¹la od pøedchozích verzí ohromným vývojem a obsahuje "
+"podstatné zmìny. Ji¾ zde neexistuje systémový konfiguraèní soubor a "
+"u¾ivatelské nastavení se musí poupravit. Pokud nejste na takovou zmìnu "
+"pøipraveni, nebo pokud potøebujete èas pro varování v¹ech va¹ich "
+"u¾ivatelù, ukonèete nyní instalaci."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"Proto¾e se nové nástroje pro pøizpùsobení FVWM spustí pouze v pøípadì, "
+"¾e neexistuje soubor fvwmrc, tak tento balík odstraní standardní "
+"systémový fvwmrc. Pokud se v domovském adresáøi u¾ivatele nebude nacházet "
+"soubor ~/.fvwmrc, FVWM zobrazí menu, které u¾ivateli pomù¾e vygenerovat "
+"základní adresáø .fvwm. Podrobnosti o aktualizaci na tuto verzi FVWM "
+"naleznete v souboru /usr/share/doc/fvwm/News.Debian.gz."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Opakuji, FVWM 2.5.8 ji¾ nepou¾ívá systémové konfiguraèní soubory. V "
+"poinstalaèních skriptech se tyto soubory pøejmenují (.dpkg-old), proto¾e "
+"kolidují s novými nástroji pro generování konfigurace. Proto¾e jsou "
+"soubory pouze pøejmenovány, zachovají se tak provedené zmìny, které pak "
+"mù¾ete zakomponovat do svého u¾ivatelského nastavení. Toto se dìje pouze "
+"pokud pøecházíte z verze men¹í ne¾ 2.5.8. Pøi odstranìní balíku ze systému "
+"se odstraní i tyto pøejmenované soubory."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Pøed aktualizací se prosím je¹tì jednou ujistìte, ¾e jste na tyto zmìny "
+"pøipraveni."
--- fvwm-2.5.18.orig/debian/po/sv.po
+++ fvwm-2.5.18/debian/po/sv.po
@@ -0,0 +1,92 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm 1:2.5.14-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2005-10-14 20:13+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Är du säker på att du vill uppgradera fvwm?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Denna version av FVWM är en stor uppgradering från tidigare versioner. Det "
+"har gjorts kraftiga ändringar.  Det finns inte längre ett systembred fvwmrc-"
+"fil. Användarnas konfiguration måste ändras för denna version av FVWM. "
+"Avbryt om du inte är förberedd för detta eller om du behöver tid att "
+"kontakta alla användare av FVWM på denna maskin."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"Det finns nya verktyg för att hjälpa till att definiera funktioner i FVWM om "
+"det inte finns någon fvwmrc-fil tillgänglig.  Därför har detta paketet tagit "
+"bort den systembreda standard fvwmrc-filen eftersom den mörkade de trevliga "
+"konfigurationsverktygen. Om det inte finns en ~/.fvwmrc tillgänglig kommer "
+"FVWM presentera en standardmeny som tillåter att man genererar en initial ."
+"fvwm-mapp. Läs mer i /usr/share/doc/fvwm/News.Debian.gz för "
+"uppgraderingstips."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Jag repeterar, FVWM 2.5.8 har inte längre en systembred konfigurationsfil. I "
+"efterinstallationen flyttar vi nu undan gamla konfigurationsfiler (.dpkg-"
+"old) eftersom de stör ut det nya verktyget för att generera konfigurationen. "
+"Eftersom dessa filer bara flyttas, inte tas bort, sparar vi användarnas "
+"ändringar. Vi gör bara detta om användaren uppgraderar från en version före "
+"2.5.8. Vid avinstallaton kommer vi även att ta bort alla dessa sparade filer."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Kontrollera att du är förberedd för dessa ändringar i FVWM före du "
+"fortsätter med denna uppgradering."
--- fvwm-2.5.18.orig/debian/po/pt_BR.po
+++ fvwm-2.5.18/debian/po/pt_BR.po
@@ -0,0 +1,99 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2004-11-02 20:02-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Você tem certeza que deseja atualizar o fvwm ?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Esta versão do FVWM é uma grande atualização em relação a versões "
+"anteriores. Houveram extensivas mudanças. Não existe mais um arquivo "
+"fvmwrc fornecido para todos os usuários do sistema. A configuração "
+"dos usuários deve ser modificada para esta versão do FVWM. Por favor, "
+"aborte caso você não esteja preparado para isso ou caso você precise "
+"de tempo para entrar em contato com todos os usuários do FVWM nesta "
+"máquina."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"Existem novos utilitários para auxiliar na personalização do FVWM caso "
+"não exista um arquivo fvwmrc disponível. Devido a isso, esse pacote agora "
+"remove o arquivo fvwmrc padrão válido para todo os usuários, devido ao "
+"mesmo roubar o foco dos bons utilitários de configuração. Caso não exista "
+"um arquivo ~/.fvwmrc disponível, o FVWM deverá apresentar um menu padrão "
+"que permitirá a geração de um diretório .fvwm inicial. Por favor, leia o "
+"arquivo /usr/share/doc/fvwm/News.Debian.gz para dicas relacionadas a "
+"atualização."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Novamente, o FVWM 2.5.8 não possui mais arquivos de configuração válidos "
+"para todos os usuários do sistema. No script de pós-instalação deste "
+"pacote os antigos arquivos de configuração são agora movidos (são salvos "
+"com a extensão .dpkg-old), uma vez que os mesmos interferem com as novas "
+"ferramentas de geração de configuração. Uma vez que esses arquivos são "
+"somente movidos, mas não apagados, as mudanças feitas pelos usuários "
+"são preservadas. Isso será feito somente caso o usuário esteja "
+"atualizando a partir de uma versão anterior a versão 2.5.8. Na remoção "
+"do pacote, todos esses arquivos preservados são também removidos."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Por favor, certifique-se de estar preparado para essas mudanças no "
+"FVWM antes de continuar com sua atualização."
--- fvwm-2.5.18.orig/debian/po/vi.po
+++ fvwm-2.5.18/debian/po/vi.po
@@ -0,0 +1,66 @@
+# Vietnamese Translation for fvwm.
+# Copyright Â© 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm 2.5.12-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2005-06-03 15:49+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Báº¡n cÃ³ cháº¯c muá»‘n nÃ¢ng cáº¥p fvwm khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr "PhiÃªn báº£n FVWM nÃ y nÃ¢ng cáº¥p lÃªn ráº¥t cao tá»« nhá»¯ng phiÃªn báº£n trÆ°á»›c. Ä�Ã£ thá»±c hiá»‡n nhiá»�u thay Ä‘á»•i quan trá»�ng. KhÃ´ng cÃ²n cÃ³ láº¡i má»™t táº­p tin fvwmrc do há»‡ thá»‘ng cung cáº¥p. Pháº£i thay Ä‘á»•i cáº¥u hÃ¬nh ngÆ°á»�i dÃ¹ng cho phiÃªn báº£n FVWM nÃ y. HÃ£y há»§y bá»� táº¡i Ä‘iá»ƒm nÃ y náº¿u báº¡n chÆ°a sáºµn sÃ ng Ä‘á»ƒ lÃ m nhÆ° tháº¿, hoáº·c náº¿u báº¡n cáº§n máº¥t thá»�i gian liÃªn há»‡ vá»›i má»�i ngÆ°á»�i dÃ¹ng FVWM trÃªn mÃ¡y nÃ y."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr "Náº¿u khÃ´ng cÃ³ táº­p tin fvwmrc thÃ¬ cÃ³ má»™t sá»‘ tiá»‡n Ã­ch má»›i Ä‘á»ƒ giÃºp Ä‘á»¡ báº¡n tÃ¹y chá»‰nh FVWM. Váº­y gÃ³i tin nÃ y sáº½ loáº¡i bá»� táº­p tin fvwmrc máº·c Ä‘á»‹nh cho toÃ n há»‡ thá»‘ng, vÃ¬ nÃ³ xung Ä‘á»™t vá»›i nhá»¯ng tiá»‡n Ã­ch cáº¥u hÃ¬nh há»¯u Ã­ch. Náº¿u khÃ´ng cÃ³ táº­p tin ~/.fvwmrc nÃ o, thÃ¬ FVWM sáº½ hiá»ƒn thá»‹ má»™t trÃ¬nh Ä‘Æ¡n máº·c Ä‘á»‹nh cho phÃ©p báº¡n táº¡o ra má»™t thÆ° má»¥c .fvwm ban Ä‘áº§u. HÃ£y Ä‘á»�c nhá»¯ng máº¹o nÃ¢ng cáº¥p trong /usr/share/.doc/fvwm/News.Debian.gz nhÃ©."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr "HÃ£y ghi nhá»›: â€¢ FVWM phiÃªn báº£n 2.5.8 khÃ´ng cÃ²n cÃ³ láº¡i táº­p tin cáº¥u hÃ¬nh cho toÃ n há»‡ thá»‘ng. â€¢\n"
+"Trong khi tiáº¿n trÃ¬nh cÃ i Ä‘áº·t cuá»‘i cÃ¹ng, phiÃªn báº£n má»›i sáº½ di chuyá»ƒn má»�i táº­p tin cáº¥u hÃ¬nh cÅ© (.dpkg-old) ra, vÃ¬ chÃºng xung Ä‘á»™t vá»›i nhá»¯ng cÃ´ng cá»¥ táº¡o ra cáº¥u hÃ¬nh má»›i. VÃ¬ Ä‘Ã£ chá»‰ di chuyá»ƒn nhá»¯ng táº­p tin nÃ y, khÃ´ng pháº£i xÃ³a bá»� chÃºng, thÃ¬ báº£o quan cÃ¡c thay Ä‘á»•i ngÆ°á»�i dÃ¹ng."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr "HÃ£y Ä‘áº£m báº£o báº¡n sáºµn sÃ ng quáº£n lÃ½ cÃ¡c thay Ä‘á»•i nÃ y, trÆ°á»›c khi tiáº¿p tá»¥c nÃ¢ng cáº¥p."
--- fvwm-2.5.18.orig/debian/po/de.po
+++ fvwm-2.5.18/debian/po/de.po
@@ -0,0 +1,97 @@
+# translation of fvwm_2.5.10-6_templates.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Erik Schanze <mail@erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm_2.5.10-10_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2004-07-31 23:18+0200\n"
+"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Wollen Sie FVWM wirklich aktualisieren?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Diese Version von FVWM ist eine weitreichende Aktualisierung der "
+"VorgÃ¤ngerversionen. Es gibt tiefgreifende Ã„nderungen.  Es gibt keine "
+"systemweite Datei fvwmrc mehr. Die Benutzereinstellungen mÃ¼ssen fÃ¼r diese "
+"Version von FVWM angepasst werden. Bitte brechen Sie jetzt ab, wenn Sie "
+"darauf nicht vorbereitet sind, denn Sie werden sich mit allen Benutzern von "
+"FVWM auf diesem Rechner in Verbindung setzen mÃ¼ssen."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"Es gibt neue Hilfsprogramme, die beim Einrichten von FVWM helfen, wenn noch "
+"keine Datei fvwmrc vorhanden ist.  Deshalb verschiebt das neue Paket die "
+"systemweite Datei fvwmrc, weil sonst diese Hilfsprogramme nicht "
+"funktionieren. Wenn keine Datei ~/.fvwm vorhanden ist, zeigt FVWM ein MenÃ¼ "
+"an , mit dem Sie ein Verzeichnis .fvwm erstellen kÃ¶nnen. Bitte lesen Sie "
+"dazu /usr/share/doc/fvwm/News.Debian.gz fÃ¼r Tipps zur Aktualisierung."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Noch einmal, FVWM 2.5.8 hat keine systemweite Konfigurationsdatei mehr. Am "
+"Ende der Installation werden die alten Konfigurationsdateien in *.dpkg-old "
+"umbenannt, weil sie die neuen Hilfsprogramme zum Erstellen einer "
+"Konfiguration behindern. Die Dateien werden aber nur verschoben und nicht "
+"gelÃ¶scht, um die Anpassungen zu erhalten. Das passiert nur, wenn Sie eine "
+"Version vor 2.5.8 aktualisieren. Wenn Sie dieses Paket restlos entfernen "
+"(purge), werden die verschobenen Dateien ebenfalls entfernt."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Bitte stellen Sie sicher, dass Sie auf diese VerÃ¤nderungen in FVWM "
+"vorbereitet sind, bevor Sie die Aktualisierung fortsetzen."
+
--- fvwm-2.5.18.orig/debian/po/ja.po
+++ fvwm-2.5.18/debian/po/ja.po
@@ -0,0 +1,93 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm 2.5.12-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2004-11-08 03:43+0900\n"
+"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "ËÜÅö¤Ë fvwm ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î FVWM ¤Ï¡¢°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é¤Î¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤¹¡£"
+"Âçµ¬ÌÏ¤ÊÊÑ¹¹¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£¥·¥¹¥Æ¥à¤¬Äó¶¡¤¹¤ë fvwmrc ¥Õ¥¡¥¤¥ë¤Ï¡¢¤â¤Ï¤ä¤¢"
+"¤ê¤Þ¤»¤ó¡£¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î FVWM ¤Î¥æ¡¼¥¶ÀßÄê¤Ï¡¢ÊÑ¹¹¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£½àÈ÷"
+"¤¬¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢¤³¤Î¥Þ¥·¥ó¾å¤Î¤¹¤Ù¤Æ¤Î FVWM ¥æ¡¼¥¶¤Ë³ÎÇ§¤¹¤ë»þ´Ö¤¬É¬Í×¤Ê¾ì"
+"¹ç¡¢¤³¤³¤ÇÃæÃÇ¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"fvwmrc ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤ËÍøÍÑ²ÄÇ½¤Ê¡¢FVWM ¤Î¥«¥¹¥¿¥Þ¥¤¥º¤ò»Ù±ç¤¹¤ë¿·"
+"¤·¤¤¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Ê£¿ôÂ¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤è¤Ã¤Æ¡¢¤³¤ì¤é¤ÎÁÇÅ¨¤Ê¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
+"¤òÌµÂÌ¤Ë¤·¤Ê¤¤¤¿¤á¤Ë¤â¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥·¥¹¥Æ¥àÁ´ÂÎ¤Î fvwmrc ¥Õ¥¡¥¤¥ë¤òºï½ü"
+"¤·¤Þ¤¹¡£»È¤¨¤ë ~/.fvwmrc ¥Õ¥¡¥¤¥ë¤¬Ìµ¤¤¾ì¹ç¡¢FVWM ¤Ï½é´ü¤Î .fvwm ¥Ç¥£¥ì¥¯¥È¥ê"
+"¤òÀ¸À®¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥á¥Ë¥å¡¼¤òÉ½¼¨¤·¤Þ¤¹¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¤Ä¤¤¤Æ¤Î¥Ò¥ó¥È"
+"¤Ï¡¢/usr/share/doc/fvwm/News.Debian.gz ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"·«¤êÊÖ¤·¤Þ¤¹¡£FVWM 2.5.8 ¤Ï¥·¥¹¥Æ¥àÁ´ÂÎ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ý¤¿¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
+"¿·¤·¤¤ÀßÄêÀ¸À®¥Ä¡¼¥ë¤Ë´³¾Ä¤·¤Æ¤·¤Þ¤¦¤Î¤Ç¡¢postinst ¥¹¥¯¥ê¥×¥ÈÃæ¤Ç°ÊÁ°¤ÎÀßÄê"
+"¥Õ¥¡¥¤¥ë¤ò°ÜÆ°¤·¤Þ¤¹ (.dpkg-old)¡£¥Õ¥¡¥¤¥ë¤ÏÃ±¤Ë°ÜÆ°¤µ¤ì¤Æ¤¤¤ë¤À¤±¤Çºï½ü¤Ï¤µ"
+"¤ì¤Æ¤Ê¤¤¤Î¤Ç¡¢¥æ¡¼¥¶¤ÎÊÑ¹¹¤ÏÊÝÂ¸¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢2.5.8 °ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó"
+"¤«¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¾ì¹ç¤Î¤ß¹Ô¤¤¤Þ¤¹¡£purge ¤ÎºÝ¤Ë¤Ï¡¢¤³¤ì¤é¤ÎÊÝÂ¸¤·¤¿¥Õ¥¡"
+"¥¤¥ë¤âºï½ü¤·¤Þ¤¹¡£"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"¥¢¥Ã¥×¥°¥ì¡¼¥É¤òÂ³¹Ô¤¹¤ëÁ°¤Ë¡¢FVWM ¤Ç¤Î¤³¤ì¤é¤ÎÊÑ¹¹¤Ë½àÈ÷¤¬¤Ç¤­¤Æ¤¤¤ë¤Î¤ò³ÎÇ§"
+"¤·¤Æ¤¯¤À¤µ¤¤¡£"
--- fvwm-2.5.18.orig/debian/po/fr.po
+++ fvwm-2.5.18/debian/po/fr.po
@@ -0,0 +1,96 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+#  <>, 2004.
+# Christian Perrier <bubulle@debian.org>, 2004.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm 2.5.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-20 14:28-0500\n"
+"PO-Revision-Date: 2005-10-28 18:59+0200\n"
+"Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid "Are you sure you want to upgrade fvwm?"
+msgstr "Êtes-vous sûr de vouloir mettre à niveau fvwm ?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"This version of FVWM, is a major upgrade from previous versions. There have "
+"been extensive changes.  There is no longer a System provided fvwmrc file. "
+"User config must be changed for this version of FVWM. Please abort if you "
+"are not prepared for that, or if you need time to contact all users of FVWM "
+"on this machine."
+msgstr ""
+"Cette version de fvwm constitue une mise à niveau majeure depuis les "
+"versions précédentes. De nombreux changements y prennent place. Le fichier "
+"général fvwmrc n'existe plus. Les configurations des utilisateurs doivent "
+"être adaptées pour cette version de fvwm. Veuillez refuser la mise à niveau "
+"si vous n'y êtes pas prêt ou si vous avez besoin de temps pour prendre "
+"contact avec tous les utilisateurs de fvwm travaillant sur cette machine."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"There are new utilities to help customize FVWM if there is no fvwmrc file "
+"available.  Because of this, the package removes the default system-wide "
+"fvwmrc file, since that shadowed the nice configuration utilities. If there "
+"is no ~/.fvwmrc file available, FVWM shall present a default menu that "
+"allows one to generate an initial .fvwm directory. Please read /usr/share/"
+"doc/fvwm/News.Debian.gz for upgrade hints."
+msgstr ""
+"De nouveaux utilitaires pour aider à la personnalisation de fvwm ont été "
+"réalisés pour remplacer le fichier fvwmrc. Pour cette raison, lors de son "
+"installation, ce paquet va supprimer le fichier fvwmrc destiné à l'ensemble "
+"du système car sa présence masque ces utilitaires. Si le fichier ~/.fvwmrc "
+"n'existe pas, fvwm affichera un menu par défaut qui permettra de créer un "
+"répertoire initial .fvwm. Veuillez consulter le fichier /usr/share/doc/fvwm/"
+"News.Debian.gz pour plus de détails concernant la procédure de mise à niveau."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"I repeat, FVWM 2.5.8 no longer has system wide configuration files. In the "
+"postinst we now move old conffiles out of the way (.dpkg-old), since they "
+"interfere with the new configuration generation tools. Since the files are "
+"just moved, but not deleted, we preserve user changes. We only do this if "
+"the user is upgrading from a pre 2.5.8 version. On purge, we remove all "
+"these preserved files as well."
+msgstr ""
+"Encore une fois, fvwm 2.5.8 n'a plus de fichier de configuration pour "
+"l'ensemble du système. Lors de l'exécution du script de post-installation "
+"(« postinst ») les anciens fichiers de configurations seront renommés (par "
+"ajout de l'extension « .dpkg-old ») de façon à ne pas interférer avec les "
+"nouveaux outils de configuration. Ces fichiers n'étant que renommés et non "
+"détruits, les modifications qu'auraient pu faire les utilisateurs seront "
+"préservées. Ceci ne sera effectué que si la mise à niveau en cours se fait "
+"depuis une version antérieure à la version 2.5.8. Lors de la purge du "
+"paquet, ces anciens fichiers seront supprimés."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:4
+msgid ""
+"Please make sure you are prepared for these changes in FVWM before "
+"continuing with its upgrade."
+msgstr ""
+"Veuillez vous assurer d'être préparé à ces changements avant de poursuivre "
+"la mise à niveau de fvwm."
--- fvwm-2.5.18.orig/debian/templates
+++ fvwm-2.5.18/debian/templates
@@ -0,0 +1,236 @@
+Template: fvwm/upgrade/pre_2.5.8
+Type: boolean
+Default: false
+Description: Are you sure you want to upgrade fvwm?
+ This version of FVWM, is a major upgrade from previous versions.
+ There have been extensive changes.  There is no longer a System
+ provided fvwmrc file. User config must be changed for this version of
+ FVWM. Please abort if you are not prepared for that, or if you need
+ time to contact all users of FVWM on this machine.
+ .
+ There are new utilities to help customize FVWM if there is no fvwmrc
+ file available.  Because of this, the package removes the default
+ system-wide fvwmrc file, since that shadowed the nice configuration
+ utilities. If there is no ~/.fvwmrc file available, FVWM shall present
+ a default menu that allows one to generate an initial .fvwm directory.
+ Please read /usr/share/doc/fvwm/News.Debian.gz for upgrade hints.
+ .
+ I repeat, FVWM 2.5.8 no longer has system wide configuration files.
+ In the postinst we now move old conffiles out of the way (.dpkg-old),
+ since they interfere with the new configuration generation
+ tools. Since the files are just moved, but not deleted, we preserve
+ user changes. We only do this if the user is upgrading from a pre
+ 2.5.8 version. On purge, we remove all these preserved files as well.
+ .
+ Please make sure you are prepared for these changes in FVWM before
+ continuing with its upgrade.
+Description-cs: Jste si jisti, ¾e chcete aktualizovat fvwm?
+ Tato verze FVWM pro¹la od pøedchozích verzí ohromným vývojem a obsahuje
+ podstatné zmìny. Ji¾ zde neexistuje systémový konfiguraèní soubor a
+ u¾ivatelské nastavení se musí poupravit. Pokud nejste na takovou zmìnu
+ pøipraveni, nebo pokud potøebujete èas pro varování v¹ech va¹ich
+ u¾ivatelù, ukonèete nyní instalaci.
+ .
+ Proto¾e se nové nástroje pro pøizpùsobení FVWM spustí pouze v pøípadì, ¾e
+ neexistuje soubor fvwmrc, tak tento balík odstraní standardní systémový
+ fvwmrc. Pokud se v domovském adresáøi u¾ivatele nebude nacházet soubor
+ ~/.fvwmrc, FVWM zobrazí menu, které u¾ivateli pomù¾e vygenerovat základní
+ adresáø .fvwm. Podrobnosti o aktualizaci na tuto verzi FVWM naleznete v
+ souboru /usr/share/doc/fvwm/News.Debian.gz.
+ .
+ Opakuji, FVWM 2.5.8 ji¾ nepou¾ívá systémové konfiguraèní soubory. V
+ poinstalaèních skriptech se tyto soubory pøejmenují (.dpkg-old), proto¾e
+ kolidují s novými nástroji pro generování konfigurace. Proto¾e jsou
+ soubory pouze pøejmenovány, zachovají se tak provedené zmìny, které pak
+ mù¾ete zakomponovat do svého u¾ivatelského nastavení. Toto se dìje pouze
+ pokud pøecházíte z verze men¹í ne¾ 2.5.8. Pøi odstranìní balíku ze systému
+ se odstraní i tyto pøejmenované soubory.
+ .
+ Pøed aktualizací se prosím je¹tì jednou ujistìte, ¾e jste na tyto zmìny
+ pøipraveni.
+Description-de: Wollen Sie FVWM wirklich aktualisieren?
+ Diese Version von FVWM ist eine weitreichende Aktualisierung der
+ Vorgängerversionen. Es gibt tiefgreifende Änderungen.  Es gibt keine
+ systemweite Datei fvwmrc mehr. Die Benutzereinstellungen müssen für diese
+ Version von FVWM angepasst werden. Bitte brechen Sie jetzt ab, wenn Sie
+ darauf nicht vorbereitet sind, denn Sie werden sich mit allen Benutzern
+ von FVWM auf diesem Rechner in Verbindung setzen müssen.
+ .
+ Es gibt neue Hilfsprogramme, die beim Einrichten von FVWM helfen, wenn
+ noch keine Datei fvwmrc vorhanden ist.  Deshalb verschiebt das neue Paket
+ die systemweite Datei fvwmrc, weil sonst diese Hilfsprogramme nicht
+ funktionieren. Wenn keine Datei ~/.fvwm vorhanden ist, zeigt FVWM ein Menü
+ an , mit dem Sie ein Verzeichnis .fvwm erstellen können. Bitte lesen Sie
+ dazu /usr/share/doc/fvwm/News.Debian.gz für Tipps zur Aktualisierung.
+ .
+ Noch einmal, FVWM 2.5.8 hat keine systemweite Konfigurationsdatei mehr. Am
+ Ende der Installation werden die alten Konfigurationsdateien in *.dpkg-old
+ umbenannt, weil sie die neuen Hilfsprogramme zum Erstellen einer
+ Konfiguration behindern. Die Dateien werden aber nur verschoben und nicht
+ gelöscht, um die Anpassungen zu erhalten. Das passiert nur, wenn Sie eine
+ Version vor 2.5.8 aktualisieren. Wenn Sie dieses Paket restlos entfernen
+ (purge), werden die verschobenen Dateien ebenfalls entfernt.
+ .
+ Bitte stellen Sie sicher, dass Sie auf diese Veränderungen in FVWM
+ vorbereitet sind, bevor Sie die Aktualisierung fortsetzen.
+Description-fr: Êtes-vous sûr de vouloir mettre à niveau fvwm ?
+ Cette version de fvwm constitue une mise à niveau majeure depuis les
+ versions précédentes. De nombreux changements y prennent place. Le fichier
+ général fvwmrc n'existe plus. Les configurations des utilisateurs doivent
+ être adaptées pour cette version de fvwm. Veuillez refuser la mise à
+ niveau si vous n'y êtes pas prêt ou si vous avez besoin de temps pour
+ prendre contact avec tous les utilisateurs de fvwm travaillant sur cette
+ machine.
+ .
+ De nouveaux utilitaires pour aider à la personnalisation de fvwm ont été
+ réalisés pour remplacer le fichier fvwmrc. Pour cette raison, lors de son
+ installation, ce paquet va supprimer le fichier fvwmrc destiné à
+ l'ensemble du système car sa présence masque ces utilitaires. Si le
+ fichier ~/.fvwmrc n'existe pas, fvwm affichera un menu par défaut qui
+ permettra de créer un répertoire initial .fvwm. Veuillez consulter le
+ fichier /usr/share/doc/fvwm/News.Debian.gz pour plus de détails concernant
+ la procédure de mise à niveau.
+ .
+ Encore une fois, fvwm 2.5.8 n'a plus de fichier de configuration pour
+ l'ensemble du système. Lors de l'exécution du script de post-installation
+ (« postinst ») les anciens fichiers de configurations seront renommés (par
+ ajout de l'extension « .dpkg-old ») de façon à ne pas interférer avec les
+ nouveaux outils de configuration. Ces fichiers n'étant que renommés et non
+ détruits, les modifications qu'auraient pu faire les utilisateurs seront
+ préservées. Ceci ne sera effectué que si la mise à niveau en cours se fait
+ depuis une version antérieure à la version 2.5.8. Lors de la purge du
+ paquet, ces anciens fichiers seront supprimés.
+ .
+ Veuillez vous assurer d'être préparé à ces changements avant de poursuivre
+ la mise à niveau de fvwm.
+Description-ja: ËÜÅö¤Ë fvwm ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¤«?
+ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î FVWM
+ ¤Ï¡¢°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é¤Î¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤¹¡£Âçµ¬ÌÏ¤ÊÊÑ¹¹¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£¥·¥¹¥Æ¥à¤¬Äó¶¡¤¹¤ë
+ fvwmrc ¥Õ¥¡¥¤¥ë¤Ï¡¢¤â¤Ï¤ä¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î FVWM
+ ¤Î¥æ¡¼¥¶ÀßÄê¤Ï¡¢ÊÑ¹¹¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£½àÈ÷¤¬¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢¤³¤Î¥Þ¥·¥ó¾å¤Î¤¹¤Ù¤Æ¤Î
+ FVWM ¥æ¡¼¥¶¤Ë³ÎÇ§¤¹¤ë»þ´Ö¤¬É¬Í×¤Ê¾ì¹ç¡¢¤³¤³¤ÇÃæÃÇ¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£
+ .
+ fvwmrc ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤ËÍøÍÑ²ÄÇ½¤Ê¡¢FVWM
+ ¤Î¥«¥¹¥¿¥Þ¥¤¥º¤ò»Ù±ç¤¹¤ë¿·¤·¤¤¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Ê£¿ôÂ¸ºß¤·¤Æ¤¤¤Þ¤¹¡£¤è¤Ã¤Æ¡¢¤³¤ì¤é¤ÎÁÇÅ¨¤Ê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òÌµÂÌ¤Ë¤·¤Ê¤¤¤¿¤á¤Ë¤â¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥·¥¹¥Æ¥àÁ´ÂÎ¤Î
+ fvwmrc ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£»È¤¨¤ë ~/.fvwmrc ¥Õ¥¡¥¤¥ë¤¬Ìµ¤¤¾ì¹ç¡¢FVWM
+ ¤Ï½é´ü¤Î .fvwm
+ ¥Ç¥£¥ì¥¯¥È¥ê¤òÀ¸À®¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥á¥Ë¥å¡¼¤òÉ½¼¨¤·¤Þ¤¹¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¤Ä¤¤¤Æ¤Î¥Ò¥ó¥È¤Ï¡¢/usr/share/doc/fvwm/News.Debian.gz
+ ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+ .
+ ·«¤êÊÖ¤·¤Þ¤¹¡£FVWM 2.5.8
+ ¤Ï¥·¥¹¥Æ¥àÁ´ÂÎ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ý¤¿¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¿·¤·¤¤ÀßÄêÀ¸À®¥Ä¡¼¥ë¤Ë´³¾Ä¤·¤Æ¤·¤Þ¤¦¤Î¤Ç¡¢postinst
+ ¥¹¥¯¥ê¥×¥ÈÃæ¤Ç°ÊÁ°¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò°ÜÆ°¤·¤Þ¤¹
+ (.dpkg-old)¡£¥Õ¥¡¥¤¥ë¤ÏÃ±¤Ë°ÜÆ°¤µ¤ì¤Æ¤¤¤ë¤À¤±¤Çºï½ü¤Ï¤µ¤ì¤Æ¤Ê¤¤¤Î¤Ç¡¢¥æ¡¼¥¶¤ÎÊÑ¹¹¤ÏÊÝÂ¸¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢2.5.8
+ °ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¾ì¹ç¤Î¤ß¹Ô¤¤¤Þ¤¹¡£purge
+ ¤ÎºÝ¤Ë¤Ï¡¢¤³¤ì¤é¤ÎÊÝÂ¸¤·¤¿¥Õ¥¡¥¤¥ë¤âºï½ü¤·¤Þ¤¹¡£
+ .
+ ¥¢¥Ã¥×¥°¥ì¡¼¥É¤òÂ³¹Ô¤¹¤ëÁ°¤Ë¡¢FVWM
+ ¤Ç¤Î¤³¤ì¤é¤ÎÊÑ¹¹¤Ë½àÈ÷¤¬¤Ç¤­¤Æ¤¤¤ë¤Î¤ò³ÎÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£
+Description-nl: Bent u zeker dat u fvwm wilt opwaarderen?
+ Deze versie van FVWM is een belangrijke opwaardering van vorige versies.
+ Er zijn extensieve wijzigingen doorgevoerd. Er wordt niet langer een
+ systeemwijd fvwmrc-bestand aangeboden. Gebruikersconfiguratie moet worden
+ gewijzigd voor deze versie van FVWM. Breek af als u hierop niet voorbereid
+ bent, of als u tijd nodig heeft om alle FVWM-gebruikers op deze machine te
+ contacteren.
+ .
+ Er zijn nieuwe hulpmiddelen om te helpen bij fvwm-customizatie als er geen
+ fvwmrc-bestand aanwezig is. Hiervoor verwijdert het pakket het standaard
+ systeemwijde fvwmrc-bestand omdat dat de leuke configuratiehulpmiddelen
+ overschaduwt. Als er geen ~/.fvwm-bestand aanwezig is, dan zal fvwm een
+ standaard menu presenteren dat toestaat om een initiële .fvwm-map aan te
+ maken. Lees /usr/share/doc/fvwm/News.Debian voor hints bij de
+ opwaardering.
+ .
+ Ter herhaling: FVWM 2.5.8 heeft geen systeemwijde configuratiebestanden
+ meer. In de postinst worden oude conffiles opgeruimd (.dpkg-old) omdat ze
+ interfereren met de nieuwe configuratiegeneratiehulpmiddelen. Omdat de
+ bestanden enkel worden verplaatst, maar niet verwijderd, kunnen
+ wijzigingen door gebruikers behouden blijven. Dit wordt enkel gedaan als
+ de gebruiker aan het opwaarderen is van een pre-2.5.8-versie. Bij wissen
+ (purge) worden ook al deze bestanden verwijderd.
+ .
+ Zorg dat u voorbereid bent op deze wijzigingen in FVWM alvorens verder te
+ gaan met de opwaardering.
+Description-pt_BR: Você tem certeza que deseja atualizar o fvwm ?
+ Esta versão do FVWM é uma grande atualização em relação a versões
+ anteriores. Houveram extensivas mudanças. Não existe mais um arquivo
+ fvmwrc fornecido para todos os usuários do sistema. A configuração dos
+ usuários deve ser modificada para esta versão do FVWM. Por favor, aborte
+ caso você não esteja preparado para isso ou caso você precise de tempo
+ para entrar em contato com todos os usuários do FVWM nesta máquina.
+ .
+ Existem novos utilitários para auxiliar na personalização do FVWM caso não
+ exista um arquivo fvwmrc disponível. Devido a isso, esse pacote agora
+ remove o arquivo fvwmrc padrão válido para todo os usuários, devido ao
+ mesmo roubar o foco dos bons utilitários de configuração. Caso não exista
+ um arquivo ~/.fvwmrc disponível, o FVWM deverá apresentar um menu padrão
+ que permitirá a geração de um diretório .fvwm inicial. Por favor, leia o
+ arquivo /usr/share/doc/fvwm/News.Debian.gz para dicas relacionadas a
+ atualização.
+ .
+ Novamente, o FVWM 2.5.8 não possui mais arquivos de configuração válidos
+ para todos os usuários do sistema. No script de pós-instalação deste
+ pacote os antigos arquivos de configuração são agora movidos (são salvos
+ com a extensão .dpkg-old), uma vez que os mesmos interferem com as novas
+ ferramentas de geração de configuração. Uma vez que esses arquivos são
+ somente movidos, mas não apagados, as mudanças feitas pelos usuários são
+ preservadas. Isso será feito somente caso o usuário esteja atualizando a
+ partir de uma versão anterior a versão 2.5.8. Na remoção do pacote, todos
+ esses arquivos preservados são também removidos.
+ .
+ Por favor, certifique-se de estar preparado para essas mudanças no FVWM
+ antes de continuar com sua atualização.
+Description-sv: Är du säker på att du vill uppgradera fvwm?
+ Denna version av FVWM är en stor uppgradering från tidigare versioner. Det
+ har gjorts kraftiga ändringar.  Det finns inte längre ett systembred
+ fvwmrc-fil. Användarnas konfiguration måste ändras för denna version av
+ FVWM. Avbryt om du inte är förberedd för detta eller om du behöver tid att
+ kontakta alla användare av FVWM på denna maskin.
+ .
+ Det finns nya verktyg för att hjälpa till att definiera funktioner i FVWM
+ om det inte finns någon fvwmrc-fil tillgänglig.  Därför har detta paketet
+ tagit bort den systembreda standard fvwmrc-filen eftersom den mörkade de
+ trevliga konfigurationsverktygen. Om det inte finns en ~/.fvwmrc
+ tillgänglig kommer FVWM presentera en standardmeny som tillåter att man
+ genererar en initial .fvwm-mapp. Läs mer i
+ /usr/share/doc/fvwm/News.Debian.gz för uppgraderingstips.
+ .
+ Jag repeterar, FVWM 2.5.8 har inte längre en systembred konfigurationsfil.
+ I efterinstallationen flyttar vi nu undan gamla konfigurationsfiler
+ (.dpkg-old) eftersom de stör ut det nya verktyget för att generera
+ konfigurationen. Eftersom dessa filer bara flyttas, inte tas bort, sparar
+ vi användarnas ändringar. Vi gör bara detta om användaren uppgraderar från
+ en version före 2.5.8. Vid avinstallaton kommer vi även att ta bort alla
+ dessa sparade filer.
+ .
+ Kontrollera att du är förberedd för dessa ändringar i FVWM före du
+ fortsätter med denna uppgradering.
+Description-vi: Báº¡n cÃ³ cháº¯c muá»‘n nÃ¢ng cáº¥p fvwm khÃ´ng?
+ PhiÃªn báº£n FVWM nÃ y nÃ¢ng cáº¥p lÃªn ráº¥t cao tá»« nhá»¯ng phiÃªn
+ báº£n trÆ°á»›c. Ä�Ã£ thá»±c hiá»‡n nhiá»�u thay Ä‘á»•i quan trá»�ng.
+ KhÃ´ng cÃ²n cÃ³ láº¡i má»™t táº­p tin fvwmrc do há»‡ thá»‘ng cung cáº¥p.
+ Pháº£i thay Ä‘á»•i cáº¥u hÃ¬nh ngÆ°á»�i dÃ¹ng cho phiÃªn báº£n FVWM nÃ y.
+ HÃ£y há»§y bá»� táº¡i Ä‘iá»ƒm nÃ y náº¿u báº¡n chÆ°a sáºµn sÃ ng Ä‘á»ƒ
+ lÃ m nhÆ° tháº¿, hoáº·c náº¿u báº¡n cáº§n máº¥t thá»�i gian liÃªn há»‡
+ vá»›i má»�i ngÆ°á»�i dÃ¹ng FVWM trÃªn mÃ¡y nÃ y.
+ .
+ Náº¿u khÃ´ng cÃ³ táº­p tin fvwmrc thÃ¬ cÃ³ má»™t sá»‘ tiá»‡n Ã­ch má»›i
+ Ä‘á»ƒ giÃºp Ä‘á»¡ báº¡n tÃ¹y chá»‰nh FVWM. Váº­y gÃ³i tin nÃ y sáº½ loáº¡i
+ bá»� táº­p tin fvwmrc máº·c Ä‘á»‹nh cho toÃ n há»‡ thá»‘ng, vÃ¬ nÃ³ xung
+ Ä‘á»™t vá»›i nhá»¯ng tiá»‡n Ã­ch cáº¥u hÃ¬nh há»¯u Ã­ch. Náº¿u khÃ´ng cÃ³
+ táº­p tin ~/.fvwmrc nÃ o, thÃ¬ FVWM sáº½ hiá»ƒn thá»‹ má»™t trÃ¬nh Ä‘Æ¡n
+ máº·c Ä‘á»‹nh cho phÃ©p báº¡n táº¡o ra má»™t thÆ° má»¥c .fvwm ban Ä‘áº§u.
+ HÃ£y Ä‘á»�c nhá»¯ng máº¹o nÃ¢ng cáº¥p trong
+ /usr/share/.doc/fvwm/News.Debian.gz nhÃ©.
+ .
+ HÃ£y ghi nhá»›: â€¢ FVWM phiÃªn báº£n 2.5.8 khÃ´ng cÃ²n cÃ³ láº¡i táº­p
+ tin cáº¥u hÃ¬nh cho toÃ n há»‡ thá»‘ng. â€¢
+ Trong khi tiáº¿n trÃ¬nh cÃ i Ä‘áº·t cuá»‘i cÃ¹ng, phiÃªn báº£n má»›i sáº½
+ di chuyá»ƒn má»�i táº­p tin cáº¥u hÃ¬nh cÅ© (.dpkg-old) ra, vÃ¬ chÃºng
+ xung Ä‘á»™t vá»›i nhá»¯ng cÃ´ng cá»¥ táº¡o ra cáº¥u hÃ¬nh má»›i. VÃ¬ Ä‘Ã£
+ chá»‰ di chuyá»ƒn nhá»¯ng táº­p tin nÃ y, khÃ´ng pháº£i xÃ³a bá»� chÃºng,
+ thÃ¬ báº£o quan cÃ¡c thay Ä‘á»•i ngÆ°á»�i dÃ¹ng.
+ .
+ HÃ£y Ä‘áº£m báº£o báº¡n sáºµn sÃ ng quáº£n lÃ½ cÃ¡c thay Ä‘á»•i nÃ y,
+ trÆ°á»›c khi tiáº¿p tá»¥c nÃ¢ng cáº¥p.
--- fvwm-2.5.18.orig/debian/stamp/.arch-ids/=id
+++ fvwm-2.5.18/debian/stamp/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Thu Jan  5 15:08:01 2006 23452.0
--- fvwm-2.5.18.orig/debian/preinst
+++ fvwm-2.5.18/debian/preinst
@@ -0,0 +1,152 @@
+#! /bin/sh
+#                               -*- Mode: Sh -*- 
+# preinst --- 
+# Author           : Manoj Srivastava ( srivasta@glaurung.green-gryphon.com ) 
+# Created On       : Fri Nov 14 12:12:04 2003
+# Created On Node  : glaurung.green-gryphon.com
+# Last Modified By : Manoj Srivastava
+# Last Modified On : Thu Apr  8 13:42:31 2004
+# Last Machine Used: glaurung.internal.golden-gryphon.com
+# Update Count     : 10
+# Status           : Unknown, Use with caution!
+# HISTORY          : 
+# Description      : 
+# 
+# arch-tag: d6a3672d-acb3-4f6c-9984-bad17d8ce0aa
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# 
+
+
+# Abort if any command returns an error value
+set -e
+
+package_name=fvwm
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+
+
+# This script is called before this version of this package is installed.
+# When this script is called, the package's files have not been unpacked
+# yet.
+
+# This package uses debconf to ask a question, so source the debconf
+# confmodule as early as possible. However, it does not depend on debconf,
+# so debconf may not be installed.
+if [ -e /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+        db_capb
+fi
+
+ask_upgrade () {
+    if [ -e /usr/share/debconf/confmodule ]; then
+        db_fget fvwm/upgrade/pre_2.5.8 seen
+        if [ "$RET" = true ]; then
+                  # The user saw and answered the question using debconf.
+            db_get fvwm/upgrade/pre_2.5.8
+            if [ "$RET" = "false" ]; then
+                        # Allow the same question to be displayed again on
+                        # another upgrade run.
+                db_fset fvwm/upgrade/pre_2.5.8 seen false || true
+                exit 1
+            fi
+        else
+                  # Debconf did not display the question to the user.
+            :
+        fi
+    else
+          # Debconf is not available so ask the upgrade question by hand. 
+	cat <<EOF
+ This version of FVWM, is a major upgrade from previous versions.
+ There have been extensive changes.  There is no longer an System
+ provided fvwmrc file. User config must be changed for this version of
+ FVWM. Please abort if you are not prepared for that, or if you need
+ time to contact al users of FVWM on this machine.
+
+ There are new utilities to help customize fvwm if there is no fvwmrc
+ file available.  Because of this, the package removes the default
+ system-wide fvwmrc file, since that shadowed the nice configuration
+ utilities.
+
+ Please make sure you are prepared for these changes in FVWM before
+ continuing with its upgrade.
+EOF
+        answer=""
+        echo -n "Are you sure you wish to proceed?[y/N]: "
+        read answer
+        case $answer in
+            [Yy]*) nop= ;;
+                 *) exit 1 ;;
+         esac
+    fi
+}
+
+case "$1" in
+  install)
+    # About to install this package.
+    ##:
+
+    # Add a diversion.  This is one of the few things which may be done
+    # before installing any files from the package.
+    ##: dpkg-divert --package foo --add --rename \
+    ##:             --divert /usr/bin/other.real /usr/bin/other
+
+    # There are two sub-cases:
+    if test "${2+set}" = set; then
+      # The configuration files from version $2 of this package are
+      # still on the system.
+      :
+
+      if dpkg --compare-versions $2 lt 2.5.8; then
+	  ask_upgrade
+      fi
+
+    else
+
+      # There is no existing configuration; install from scratch.
+      :
+
+    fi ;;
+  upgrade)
+    # About to upgrade this package from version $2 TO THIS VERSION.
+    # "prerm upgrade" has already been called for the old version of
+    # this package.
+    ##:
+    if dpkg --compare-versions "$2" lt 2.5.8; then
+            ask_upgrade
+    fi
+    if test $(echo $2 | sed -n 's/-.*//p') = "2.4.0"; then
+	if test -L /etc/X11/fvwm/system.fvwm2rc; then 
+	    rm -f /etc/X11/fvwm/system.fvwm2rc; 
+	fi 
+    fi
+ 
+    ;;
+  abort-upgrade)
+    # Back out of an attempt to upgrade this package FROM THIS VERSION to
+    # version $2.  Undo the effects of "postrm upgrade $2".
+    ##:
+
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
--- fvwm-2.5.18.orig/debian/manoj/FvwmModules.hook
+++ fvwm-2.5.18/debian/manoj/FvwmModules.hook
@@ -0,0 +1,395 @@
+#_____________________________________________________  E.2 No Clutter 
+# E.2 No Clutter 
+# I only wrote NoClutter as a simple test case, but maybe some big
+# sites like universities really have usage problems (too many open
+# windows).... Time delays are in seconds.
+*FvwmNoClutter 3600 Iconify 1
+*FvwmNoClutter 86400 Delete
+*FvwmNoCLutter 172800 Destroy
+#_____________________________________________________  E.3 Window-Id 
+# Window-Identifier 
+# Just choose colors and a fonts
+
+#_____________________________________________________  E.4 Pager 
+# E.4 Pager 
+
+# At some point, this shall give the pager transparency
+#*FvwmPager: Colorset * 5
+
+#*FvwmPager: Colorset 0 14
+#*FvwmPager: Colorset 1 10
+#*FvwmPager: HilightColorset 0 15
+#*FvwmPager: HilightColorset 1 11
+#*FvwmPager: BalloonColorset * 16
+#*FvwmPager: WindowColorsets 1 2
+
+
+*FvwmPager: Pixmap none 
+
+# Tells  FvwmPager  to  not show the windows that are using the WindowListSkip style.
+*FvwmPager: UseSkipList
+
+*FvwmPager: Window3DBorders
+*FvwmPager: Balloons
+*FvwmPager:  SloppyFocus
+
+*FvwmPagerGeometry x78-83-1
+*FvwmPager: MiniIcons
+
+#_____________________________________________________  E.5 FvwmWinList
+# E.5 FvwmWinList
+*FvwmWinList: FocusColorset 18
+*FvwmWinList: Colorset 17
+*FvwmWinList: IconColorset 19
+
+*FvwmWinListAction Click1 Iconify -1,Focus
+*FvwmWinListAction Click2 Iconify
+*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
+*FvwmWinListUseSkipList
+*FvwmWinListGeometry +0-1
+*FvwmWinListUseIconNames
+#_____________________________________________________  E.6 IconBox
+# E.6 FvwmIconBox
+# Make no icon to be shown in root window
+#    by spcifying in your .fvwmrc
+# (1) "SuppressIcons" if PRUNE is defined in configure.h, or
+# This gets rid of the icon's above the titles.
+# If you uncomment this, and make sure that the WindowList is bound to
+# something, it works pretty much like an icon manager.
+##SuppressIcons
+#Style     "*"  NoIcon
+                 
+
+#*FvwmIconBox: Colorset             12
+#*FvwmIconBox: IconColorset        19
+#*FvwmIconBox: IconHiColorset      20
+
+
+*FvwmIconBoxGeometry    5x1+0+0
+*FvwmIconBoxMaxIconSize 64x38
+*FvwmIconBoxSortIcons
+*FvwmIconBoxPadding     4
+*FvwmIconBoxLines       10
+*FvwmIconBoxPlacement   Left Top
+*FvwmIconBoxPixmap      fvwm.xpm
+#*FvwmIconBoxHideSC Horizontal
+#
+# mouse bindings
+#
+*FvwmIconBoxMouse       1       Click           RaiseLower
+*FvwmIconBoxMouse       1       DoubleClick     Iconify
+*FvwmIconBoxMouse       2       Click           Iconify -1, Focus
+*FvwmIconBoxMouse       3       Click           Module "FvwmIdent" FvwmIdent
+#
+# Key bindings
+#
+*FvwmIconBoxKey         r       RaiseLower
+*FvwmIconBoxKey         space   Iconify
+*FvwmIconBoxKey         d       Close
+#
+# FvwmIconBox built-in functions
+#
+*FvwmIconBoxKey         n       Next
+*FvwmIconBoxKey         p       Prev
+*FvwmIconBoxKey         h       Left
+*FvwmIconBoxKey         j       Down
+*FvwmIconBoxKey         k       Up
+*FvwmIconBoxKey         l       Right
+#
+# Icon file spcifications
+#
+*FvwmIconBox            "*"             unknown1.xpm
+*FvwmIconBox            "Fvwm*"         -
+*FvwmIconBox            "FvwmFileMgr"   folder2.xpm
+*FvwmIconBox            "rxvt"          term.xpm
+*FvwmIconBox            "xterm"         xterm.xpm
+*FvwmIconBox            "editres"       editres.xpm
+*FvwmIconBox            "xman"          xman.xpm
+*FvwmIconBox            "xbiff"         mail1.xpm
+*FvwmIconBox            "xmh"           mail1.xpm
+*FvwmIconBox            "xcalc"         xcalc.xpm
+*FvwmIconBox            "FvwmButtons"     toolbox.xpm
+                
+#_____________________________________________________  E.7 Backer
+# E.7 FvwmBacker -- Set Up Backgrounds for different desktops.
+# FvwmBacker can change wallpaper as you change desks or pages, or execute commands.
+DestroyModuleConfig FvwmBacker: *
+
+# *FvwmBacker: Command (Page 2 *) -solid steelblue
+# *FvwmBacker: Command (Desk 0, Page 0 0) Exec xpmroot $[HOME]/bg2.xpm
+# *FvwmBacker: Command (Desk 0, Page 0 1) -solid midnightblue
+# *FvwmBacker: Command (Desk 0, Page 1 *) -solid yellow
+# *FvwmBacker: Command (Desk 1, Page * 0) -solid navy
+# *FvwmBacker: Command (Desk 1, Page * 1) Colorset 5
+
+*FvwmBacker: Command (Desk 0) Exec fvwm-root -r $[fvwm_wallpaper0]
+*FvwmBacker: Command (Desk 1) Exec fvwm-root -r $[fvwm_wallpaper1]
+
+#*FvwmBacker: Command (Desk 0) Exec xsetbg -fullscreen $[fvwm_wallpaper0]
+#*FvwmBacker: Command (Desk 1) Exec xsetbg -fullscreen $[fvwm_wallpaper1]
+
+#*FvwmBacker: Command (Desk 0) -solid Black
+#*FvwmBacker: Command (Desk 1) -solid midnightblue
+
+#maybe this works?	 
+#*FvwmWinListDesk 0 -solid steelblue
+#*FvwmWinListDesk 1 -solid midnightblue
+#*FvwmWinListDesk 2 -solid navy
+#*FvwmWinListDesk 3 -solid lightslateblue
+
+# One other quick comment/question. I got quite sick of using the backer
+# because the colors of the desktop didn't show up in the pager. so i set up
+# a bunch of symbolic links (FvwmButtons to PagerButtons and FvwmPager to
+# IncPager*). then i set the background colors of each one to be the same as
+# the FvwmBacker colors.... now i could simply swallow all the IncPagers
+# into a FvwmButtons (PagerButtons under the symlink) and it looks just like
+# FvwmPager, but has colors. Here is the relevant code:
+
+# *IncPager0Back #266294
+# *IncPager1Back #AA0000
+# *IncPager2Back #FFCC00
+# *IncPager3Back #888800
+
+# *PagerButtons -     whatever    SwallowModule "IncPager0" IncPager0 0 0
+# *PagerButtons -     whatever    SwallowModule "IncPager1" IncPager1 1 1
+# *PagerButtons -     whatever    SwallowModule "IncPager2" IncPager2 2 2
+# *PagerButtons -     whatever    SwallowModule "IncPager3" IncPager3 3 3
+
+#_____________________________________________________  E.8 Audio
+# E.8 FvwmAudio -- Set Up Sounds.
+
+*FvwmAudioPlayCmd /usr/local/bin/AF/aplay
+*FvwmAudioDir /usr/local/share/sound_files/fvwm
+
+*FvwmAudio startup                 hi.snd
+*FvwmAudio shutdown                Goodbye.au
+*FvwmAudio new_page                Oomph.au
+*FvwmAudio res_class               beep_metal.au
+*FvwmAudio focus_change            thrust.au
+*FvwmAudio add_window              drip.au
+*FvwmAudio destroy_window          flush.au
+*FvwmAudio deiconify               ploop.au
+*FvwmAudio unknown                 doh.au
+*FvwmAudio iconify                 beep_pure_saw.au
+*FvwmAudio icon_name               beep_robotic.au
+*FvwmAudio window_name             beep_fm.au
+*FvwmAudio new_desk                Teeswing.au
+*FvwmAudio raise_window            arrp.au
+*FvwmAudio lower_window            tap3.au
+*FvwmAudio configure_window        dadan.au
+*FvwmAudio res_name                Cork.au
+*FvwmAudio end_windowlist          hasta_la_vista.au
+*FvwmAudio toggle_paging           ST_laser.au        
+
+#_____________________________________________________  E.9 new_pager
+#E.9 .new_pager
+#KillModule FvwmPager
+#*FvwmPagerBack pink
+#*FvwmPagerFore green
+#*FvwmPagerHilight red
+#FvwmPager 0 3
+ 
+#_____________________________________________________  E.A old_pager
+#E.A .old_pager
+#KillModule FvwmPager
+#*FvwmPagerBack #908090
+#*FvwmPagerFore #484048
+#*FvwmPagerHilight #cab3ca
+#FvwmPager 0 3
+
+#_____________________________________________________  E.B FvwmForm
+# E.B FvwmForm
+# The FvwmForm module already has the capability of calling it as
+# FvwmForm, but telling it to use the settings for some other name, like
+# so:
+# 
+# +                       "Form - Rlogin"      Module FvwmForm Rlogin
+# +                       "Form - QuitVerify"  Module FvwmForm QuitVerify
+
+# I didn't like having all of those symbolic links either...
+#
+# Section: post.hook
+#
+# Use post.hook to force things that may have been changed earlier, for
+# example, key bindinds.
+#
+
+*FvwmScript: DefaultColorset 35
+
+*FvwmFormDefault: Colorset 35
+
+*FvwmFormDefault: ItemColorset 36
+
+*FvwmTaskBar: Colorset 17
+*FvwmTaskBar: FocusColorset 18
+*FvwmTaskBar: IconColorset 19
+*FvwmTaskBar: TipsColorset 16
+
+*FvwmTaskBar: Geometry +0-0
+
+
+*FvwmTaskBar: Action Click1 DeiconifyRaiseAndFocus
+*FvwmTaskBar: Action Click2 Iconify On
+*FvwmTaskBar: Action Click3 Lower
+
+*FvwmTaskBar: UseSkipList
+*FvwmTaskBar: UseIconNames
+*FvwmTaskBar: AutoStick
+*FvwmTaskBar: AutoHide
+*FvwmTaskBar: ShowTips
+*FvwmTaskBar: NoIconAction SendToModule FvwmAnimate animate
+*FvwmTaskBar: WindowButtonsLeftMargin 8
+
+# Animations are controlled by this module
+# You could also use Frame, Lines, Flip, Turn, Twist, Random and None.
+DestroyModuleConfig FvwmAnimate: *
+*FvwmAnimate: Effect Flip
+*FvwmAnimate: Delay 0
+*FvwmAnimate: Iterations 30
+#*FvwmAnimate: Twist 1
+*FvwmAnimate: Width 2
+
+#####
+# Hit Alt+Esc to toggle FvwmProxy, which allows you to see all windows on your
+# desktop, even if they've been obscured..really cool.
+##################
+DestroyModuleConfig FvwmProxy: *
+*FvwmProxy: ProxyMove true
+
+Key Escape  A   M   SendToModule FvwmProxy ShowToggle
+
+
+
+# FvwmIconMan is a highly configurable module for managing running tasks.
+# This one is configured to look like a TaskBar.
+Style FvwmIconMan sticky, parentalrelativity, handlewidth 0, borderwidth
+DestroyModuleConfig FvwmIconMan: *
+*FvwmIconMan: ManagerGeometry 1x1
+*FvwmIconMan: ButtonGeometry 24x23
+*FvwmIconMan: FocusAndSelectButton down
+*FvwmIconMan: FocusButton down
+*FvwmIconMan: IconButton down
+*FvwmIconMan: PlainButton down
+*FvwmIconMan: SelectButton down
+*FvwmIconMan: Action Mouse 2 N sendcommand Thumbnail
+*FvwmIconMan: Action Mouse 1 N sendcommand RaiseLower, sendcommand FlipFocus
+*FvwmIconMan: ReliefThickness 1
+*FvwmIconMan: Resolution Page
+*FvwmIconMan: DrawIcons Always
+*FvwmIconMan: FollowFocus True
+*FvwmIconMan: UseWinList True
+*FvwmIconMan: ShowOnlyIcons False
+*FvwmIconMan: Format "%c: %i"
+*FvwmIconMan: Title ""
+*FvwmIconMan: Sort id
+
+# FvwmScroll swallows applications into smaller containers, sometimes handy.
+DestroyModuleConfig FvwmScroll: *
+*FvwmScroll: Back #f6f6f6
+*FvwmScroll: Fore #f6f6f6
+
+# FvwmEvent can bind Commands to Events
+DestroyModuleConfig FvwmEvent: *
+*FvwmEvent: PassID
+*FvwmEvent: Delay 5
+*FvwmEvent: StartDelay 10
+
+# ============================================================================
+# IV. Start/Stop Functions:
+# ============================================================================
+
+# These functions are executed when you enter (Start) and when you leave
+# (Stop) this component. For example, in colors@blackbox they are used to
+# set/unset a good window "transparency" style ParentalRelativity/Opacity;
+# in colors@cde and colors@luthien these functions are used for more things.
+
+# DestroyFunc FuncFvwmStartColors
+# AddToFunc   FuncFvwmStartColors
+
+# DestroyFunc FuncFvwmStopColors
+# AddToFunc   FuncFvwmStopColors
+
+# ============================================================================
+# V. Module Configurations (under modules/)
+# ============================================================================
+
+# The actual module configuration commands, including their colorset
+# settings may be found in the theme directory modules/ in files named
+# main:FvwmModule and main:FvwmModule-SubName.
+# 
+# Examples:
+# 
+# *FvwmPager-Single: Colorset * 14
+# *FvwmPager-Single: HilightColorset * 15
+# *FvwmPager-Single: WindowColorsets 1 2
+# *FvwmPager-Single: BalloonColorset * 16
+# 
+# *FvwmPager-Desker: Colorset * 14
+# *FvwmPager-Desker: HilightColorset * 15
+# *FvwmPager-Desker: WindowColorsets 1 2
+# *FvwmPager-Desker: BalloonColorset * 16
+# 
+# *FvwmIconMan: *colorset         12
+# *FvwmIconMan: *iconcolorset     19
+# *FvwmIconMan: *plaincolorset    17
+# *FvwmIconMan: *selectcolorset   20
+# *FvwmIconMan: *focuscolorset    18
+# *FvwmIconMan: *focusandselectcolorset 20
+# 
+# *FvwmButtons: Colorset 10
+# 
+# *FvwmTaskBar: Colorset 17
+# *FvwmTaskBar: FocusColorset 18
+# *FvwmTaskBar: IconColorset 19
+# *FvwmTaskBar: TipsColorset 16
+# 
+# *FvwmWinList: Colorset 17
+# *FvwmWinList: FocusColorset 18
+# *FvwmWinList: IconColorset 19
+# 
+# *FvwmIconBox: Colorset   12
+# *FvwmIconBox: IconColorset 17
+# *FvwmIconBox: IconHiColorset 18
+
+# ============================================================================
+# VI. Miscellaneous Configurations
+# ============================================================================
+
+# Application colorsets are used in menus@default and menus-programs@default,
+# functions@default, functions-appbind@default and other components.
+# 
+# Examples:
+# 
+# Module FvwmConsole -fg $[fg.cs22] -bg $[bg.cs22]
+# Exec exec xterm -fg $[fg.cs30] -bg $[bg.cs30]
+# Exec exec xterm -fg $[fg.cs31] -bg $[bg.cs31] -e su -l
+# Exec exec xterm -fg $[fg.cs32] -bg $[bg.cs32] -T "Remote" -e rsh tiger
+# Exec exec xterm -fg $[fg.cs33] -bg $[bg.cs33] -T "File Viewer" -e less "$0"
+# FvwmScript FvwmScript-ThemesCenter --text-colorset 36 --viewer-colorset 33
+# FvwmScript FvwmScript-IconBrowser --text-colorset 36 --icon-colorset 10
+
+# Module FvwmGtk
+# *FvwmGtk: Destroy gnome-all
+# *FvwmGtk: Menu gnome-all
+# *FvwmGtk: Title "Gnome Menus"
+# *FvwmGtk: Separator
+# *FvwmGtk: Destroy gnome-sys
+# *FvwmGtk: Submenu "System" gnome-sys
+# *FvwmGtk: Destroy gnome-user
+# *FvwmGtk: Submenu "User" gnome-user
+# *FvwmGtk: Destroy gnome-redhat
+# *FvwmGtk: Submenu "RedHat" gnome-redhat
+# 
+# PipeRead 'fvwm-menu-desktop --type gtk --enable-mini-icons --icon-folder :re --icon-app :re --icon-title :re --icon-toptitle :re'
+# PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-user --enable-mini-icons'
+# PipeRead 'fvwm-menu-desktop --type gtk --desktop gnome-redhat --enable-mini-icons'
+
+DestroyModuleConfig GridButtons
+#*GridButtons: geometry 144x96
+*GridButtons: columns 2
+*GridButtons: rows 2
+*GridButtons: (Title "0",  Action "MoveLastWindowToPage 0 0")
+*GridButtons: (Title "2",  Action "MoveLastWindowToPage 1 0")
+*GridButtons: (Title "1",  Action "MoveLastWindowToPage 0 1")
+*GridButtons: (Title "3",  Action "MoveLastWindowToPage 1 1")
+
--- fvwm-2.5.18.orig/debian/manoj/FvwmButtons.hook
+++ fvwm-2.5.18/debian/manoj/FvwmButtons.hook
@@ -0,0 +1,118 @@
+
+#=====================================================  E. modules
+#_____________________________________________________  E.1 FvwmButtons
+# E.1 FvwmButtons
+KillModule FvwmButtons
+
+*FvwmButtonsBoxSize smart
+*FvwmButtonsRows 5
+
+*FvwmButtonsPadding 1 2
+*FvwmButtonsGeometry -1+1
+
+# We could set a geomettry as well:
+# *FvwmButtonsGeometry 1280x32+0-0
+# forbid resizing
+# *FvwmButtonsBoxSize  fixed
+
+# Define the buttons to use.....
+
+*FvwmButtons(Container(Rows 5, Frame 3, Padding 1 2))
+
+# The leftmost 4 buttons (next,prev,lower,raise)
+*FvwmButtons(4x4,Container(Colorset 23, \
+                           Rows 4,Frame 3, Padding 2 4))
+*FvwmButtons(1x2,Title Next,     Icon  arrow.xpm    Action "Desk  1 0")
+*FvwmButtons(1x2,Title Prev,     Icon  arrowb.xpm   Action "Desk -1 0")
+*FvwmButtons(1x2,Title Lower,    Icon Down,         Action Lower)
+*FvwmButtons(1x2,Title Raise,    Icon Up,           Action Raise)
+*FvwmButtons(End)
+
+# Add in the pager ....
+*FvwmButtons(8x4,Container(Rows 4,Frame -3, Padding 2 4))
+*FvwmButtons(8x4, Swallow(UseOld) "FvwmPager" `FvwmPager 0 1` Frame -3)
+*FvwmButtons(End)
+
+*FvwmButtons(18x4,Container(Colorset 23,Rows 4, Frame -4, Padding 2 4))
+*FvwmButtons(18x1,Frame -4, Swallow(UseOld,NoKill) "xticktalk" \
+  `Exec nice -15 xticktalk -before -approximate -fg $[fg.cs13] -bg $[bg.cs13] \
+       -fn '-adobe-times-bold-r-*-*-20-*-*-*-*-*-*-*' -geometry -1500-1500&`)
+
+
+*FvwmButtons(6x3,Container(Colorset 23, \
+                           Rows 3,Frame 2, Padding 2 4))
+*FvwmButtons(3x3,Title Wth,Swallow(UseOld,NoKill) "wmWeather" \
+   `Exec nice -15 wmWeather -s KBNA &`)
+*FvwmButtons(3x3,Title Mon,Swallow(UseOld,NoKill) "wmmon" \
+    `Exec nice -19 wmmon &`)
+*FvwmButtons(End)
+
+*FvwmButtons(12x3,Container(Colorset 23,Rows 3))
+*FvwmButtons(12x1,Frame -4, Swallow(UseOld,NoKill) "xclock" \
+   `Exec nice xclock -digital -padding 0 -bg $[bg.cs13] -update 5  \
+       -fn '-adobe-times-bold-r-*-*-20-*-*-*-*-*-*-*' -geometry -1500-1500&`)
+
+
+*FvwmButtons(6x2,Frame -4, Swallow(UseOld,NoKill) "xload" \
+ `Exec nice -15 xload -label $HOSTDISPLAY -fg $[fg.cs13] \
+    -bg $[bg.cs13] -geometry -1500-1500 -fn '-adobe-courier-*-r-normal--12-120-75-75-m-0-iso8859-1' &`)
+*FvwmButtons(2x2,Frame -4, Swallow(UseOld,NoKill) "oclock" \
+  `Exec nice oclock -jewel DarkBlue -minute $[fg.cs13] \
+		-hour $[fg.cs13] -geometry -1500-1500 -bg $[bg.cs13] &`)
+
+*FvwmButtons(3x2,Swallow(UseOld,NoKill,Respawn) "wmifs" \
+   `Exec nice wmifs -w  `)
+*FvwmButtons(2x2,Fore $[fg.cs13],Frame 3,Title Root, Icon supermn1.xpm, \
+             Action  `Exec "Root" exec uxterm -fg $[fg.cs31] -bg $[bg.cs31] \
+                         -T Root -e /bin/su -c '/bin/bash  -rcfile \
+             "~srivasta/.rootrc" -i' root&`)
+
+*FvwmButtons(End)
+
+*FvwmButtons(End)
+
+# Now come the bottom row buttons:
+*FvwmButtons(30x1,Container(Colorset 23, Rows 1))
+*FvwmButtons(4x1, Title Utils,         Action "Popup Utilities")
+*FvwmButtons(4x1, Title Window,        Action "Popup  WinOps" )
+*FvwmButtons(4x1, Title Misc,          Action "Function general_ops_func")
+*FvwmButtons(18x1,Size 395 20,Swallow(UseOld,NoKill,Respawn) "xbuffy" \
+    `Exec xbuffy -geometry 388x20 -bg $[bg.cs12] -fg $[fg.cs12] -fill -center -horiz -boxfile ~/etc/xbuffy -fn '-adobe-courier-*-r-normal--12-120-75-75-m-0-iso8859-1' &`)
+*FvwmButtons(End)
+
+
+*FvwmButtons(End)
+
+##########*FvwmButtons(2x3,Title CPU,Swallow(UseOld,NoKill) "wmMoonClock" \
+##########    `Exec nice -19 wmMoonClock -lat 30.45 -lon 88.18 &`)
+########   `Exec nice dctrl -iconic -control-window &`)
+#####*FvwmButtons(16x1,Size 378 20,Swallow(UseOld,NoKill,Respawn) "xmultibiff" \
+#####    `Exec xmultibiff -geometry 370x20 -bg Gray17 -fg CornSilk
+#####    -mail
+#####    ~/var/spool/mail/{important,admin,gcif,gcifcases,digital,debian.spool,consult,bcast}
+#####    &`) 
+######*FvwmButtons(2x2,Swallow(UseOld,NoKill,Respawn) "dctrlIcon" \
+######   `Exec ~/bin/getdctrl `)
+
+
+########## PANEL
+#*FvwmButtonsPanel WinOps
+#*FvwmButtonsBack bisque2
+#*FvwmButtonsGeometry -3-3
+#*FvwmButtonsColumns 1
+
+#*FvwmButtons(Title Resize ,Icon resize.xpm ,Action Resize)
+#*FvwmButtons(Title Move   ,Icon arrows2.xpm,Action Move  )
+#*FvwmButtons(Title Lower  ,Icon Down       ,Action Lower )
+#*FvwmButtons(Title Raise  ,Icon Up         ,Action Raise )
+#*FvwmButtons(Title Iconify,Icon Iconify    ,Action Iconify)
+#*FvwmButtons(Title Stick  ,Icon Stick      ,Action Stick )
+
+########## PANEL
+#*FvwmButtonsPanel Tools
+#*FvwmButtonsBack bisque2
+#*FvwmButtonsGeometry -1-1
+#*FvwmButtonsColumns 1
+
+#*FvwmButtons(Title Kill  ,Icon bomb.xpm   ,Action Destroy)
+#*FvwmButtons(Title Kill  ,Icon bomb.xpm   ,Action Destroy)
--- fvwm-2.5.18.orig/debian/manoj/post_menu.hook
+++ fvwm-2.5.18/debian/manoj/post_menu.hook
@@ -0,0 +1,22 @@
+# This menu will fire up some very common utilities
+DestroyMenu Utilities
+AddToMenu "Utilities" "Utilities" Title
+Read main-menu.hook
+
+
+#========================================================
+# One more complex function - couldn't be defined earlier because it used 
+# pop-up menus
+#
+# This creates a motif-ish sticky menu for the title-bar window-ops
+# pop-up
+# Menu acts like normal twm menu if you just hold the button down,
+# but if you click instead, the menu stays up, motif style
+AddToFunc "window_ops_func" "C" PopUp Window-Ops2
++              "M" PopUp Window-Ops2
+
+
+AddToFunc "general_ops_func" "M" PopUp General
++              "C" PopUp General
++              "D" PopUp General
+
--- fvwm-2.5.18.orig/debian/manoj/FvwmForm-Setup
+++ fvwm-2.5.18/debian/manoj/FvwmForm-Setup
@@ -0,0 +1,67 @@
+# FvwmForm-Setup - Setup Text for fvwm
+# Caution, during install, this file goes thru sed, a trailing newline
+# is required.
+DestroyModuleConfig  FvwmForm-Setup: *
+*FvwmForm-Setup: WarpPointer
+# Layout
+*FvwmForm-Setup: Line    center
+*FvwmForm-Setup: Text    "fvwm - Create Configuration"
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    " "
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: PadVText 0
+*FvwmForm-Setup: Text    "Use this form to create your fvwm2rc configuration file."
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    "The file created is ~/.fvwm/.fvwm2rc or $FVWM_USERDIR/.fvwm2rc."
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    ""
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    "After creation, the fvwm2rc file can then be changed with any"
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    "editor to suit your own needs."
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    ""
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Selection meth multiple
+*FvwmForm-Setup: Choice  BASIC BASIC on "Create a starting .fvwm2rc file"
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    ""
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    "These files are optional.  Select the modules you want to customize."
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    "You can always copy them later."
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Text    ""
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Selection meth multiple
+*FvwmForm-Setup: Choice  BAK BAK off "FvwmBacker   "
+*FvwmForm-Setup: Choice  BUT BUT off "FvwmButtons  "
+*FvwmForm-Setup: Choice  BOX BOX off "FvwmIconBox  "
+*FvwmForm-Setup: Choice  MAN MAN off "FvwmIconMan  "
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Selection meth multiple
+*FvwmForm-Setup: Choice  IDN IDN off "FvwmIdent    "
+*FvwmForm-Setup: Choice  PAG PAG off "FvwmPager    "
+*FvwmForm-Setup: Choice  SCR SCR off "FvwmScroll   "
+*FvwmForm-Setup: Choice  TSK TSK off "FvwmTaskBar  "
+*FvwmForm-Setup: Line    left
+*FvwmForm-Setup: Selection meth multiple
+*FvwmForm-Setup: Choice  WIN WIN off "FvwmWinList  "
+
+# Buttons
+*FvwmForm-Setup: Line    center
+*FvwmForm-Setup: Button  quit    "Return - Dismiss" ^M
+*FvwmForm-Setup: Command   Nop
+*FvwmForm-Setup: Button  continue    "F2 - Copy Config File(s)" F2
+*FvwmForm-Setup: Command   $(BASIC?!/bin/cp /usr/share/fvwm/ConfigFvwmSetup ${FVWM_USERDIR}/.fvwm2rc)
+*FvwmForm-Setup: Command   $(BAK?!/bin/cp /usr/share/fvwm/ConfigFvwmBacker  ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(BUT?!/bin/cp /usr/share/fvwm/ConfigFvwmButtons ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(BOX?!/bin/cp /usr/share/fvwm/ConfigFvwmIconBox ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(MAN?!/bin/cp /usr/share/fvwm/ConfigFvwmIconMan ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(IDN?!/bin/cp /usr/share/fvwm/ConfigFvwmIdent   ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(PAG?!/bin/cp /usr/share/fvwm/ConfigFvwmPager   ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(SCR?!/bin/cp /usr/share/fvwm/ConfigFvwmScroll  ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(TSK?!/bin/cp /usr/share/fvwm/ConfigFvwmTaskBar ${FVWM_USERDIR})
+*FvwmForm-Setup: Command   $(WIN?!/bin/cp /usr/share/fvwm/ConfigFvwmWinList ${FVWM_USERDIR})
+*FvwmForm-Setup: Button  quit    "F3 - Restart fvwm"
+*FvwmForm-Setup: Command   Restart
--- fvwm-2.5.18.orig/debian/manoj/icons
+++ fvwm-2.5.18/debian/manoj/icons
@@ -0,0 +1,510 @@
+###
+#  Known applications
+###
+
+# Setting window style icons; style is defined by window name/resource/class.
+# Note, todo can be replaced by unknown or empty, but since it is beta yet,
+# todo is a notice to do something about an icon for this application.
+
+Style "Kazaa*"         IconOverride, Icon norm/file-manager.xpm
+Style "wine"           IconOverride, Icon norm/file-manager.xpm
+Style "*"              Icon norm/unknown.xpm,MiniIcon mini/unknown.xpm
+Style "NoResource"     Icon norm/unknown.xpm,MiniIcon mini/unknown.xpm
+
+# Terminals
+Style "Eterm*"         Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "rxvt"           Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "XTerm"          Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+
+# These are not all mine, most of globs must be removed.
+Style "DDD*"   Icon norm/developement.xpm,MiniIcon mini/developement.xpm
+Style "GRASP*" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "HyTeX*"      Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "ImageMagic*" Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "KDisk*"      Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "LyX"         Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "MathSpad*"   Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "MuPAD*"      Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "StarOffice*" Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm
+Style "SystemInfo*" Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "Tk man"      Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "Visual Tcl"  Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "Information"         Icon norm/information.xpm,MiniIcon mini/information.xpm
+
+Style "amaya*"           Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "AcroRead"         Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "Appointment"      Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "asWedit*"         Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "bitmap*"          Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "?calc"            Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm
+Style "?clock"           Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "cooledit"         Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "control*"         Icon norm/home.xpm,MiniIcon mini/home.xpm
+Style "Dayview"          Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "Dialogue"         Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "Display"          Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "dosemu*"          Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "Image Viewer*"    Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "emacs"            Icon norm/gnu.xpm,MiniIcon mini/gnu.xpm
+Style "Explorer"         Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "Fractine"         Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "fr"               Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "freeamp"          Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "File Viewer*"     Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "Fvwm*"            Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "ghostview"        Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm
+Style "ghostscript"      Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm
+Style "gifview"          Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "GNUplot"          Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "GV"               Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm
+Style "Help_popup"       Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "ixset"            Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "Lynx"             Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "Manual Page*"     Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "matlab"           Icon norm/science.xpm,MiniIcon mini/science.xpm
+# too general
+Style "Midnight-Commander" Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "mgv*"             Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm
+Style "moxfm*"           Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "mtools*"          Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "mxaudio"          Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "NEdit*"           Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "nedit*"           Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "Netscape"         Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm
+Style "Mozilla-bin"      Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm
+Style "Download"         Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Mail"             Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "Composition"      Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "NcFtp"            Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "nscal*"           Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "News"             Icon norm/news.xpm,MiniIcon mini/news.xpm
+Style "panel"            Icon norm/home.xpm,MiniIcon mini/home.xpm
+Style "pine"             Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "pixmap*"          Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "qps*"             Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "sxpm"             Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "Tail File*"       Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "textedit"         Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "thot*"            Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "THX-1138"         Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm
+Style "timidity"         Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "Top"              Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "usernet"          Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "VIM"              Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "VI"               Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "vppp*"            Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "conx"             Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "vmware"           Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "wmCalClock"       Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "workman"          Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm
+Style "X11Amp"           Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "X3270xad"         Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "xanim"            Icon norm/multimedia.xpm,MiniIcon mini/multimedia.xpm
+Style "xapm"             Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "xbiff"            Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "xbm*"             Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "XbmBrowser"       Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "xclipboard"       Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xcolorsel"        Icon norm/colors.xpm,MiniIcon mini/colors.xpm
+Style "xconsole"         Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "xdaliclock"       Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "xdiskinfo*"       Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "xditview"         Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "XDos*"            Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "xedit"            Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "xephem*"          Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "xfig*"            Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "xfontsel"         Icon norm/font.xpm,MiniIcon mini/font.xpm
+Style "xgraph"           Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "xkey*"            Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm
+Style "xli"              Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "xload"            Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+# -- [ xman resources --
+Style "Xman"             Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "topBox"           Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "manualBrowser"    Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "help"             Icon norm/information.xpm,MiniIcon mini/information.xpm
+# -- xman resources ] --
+Style "xmag"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "Xmessage"         Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xosview"          Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+# -- [ xpaint resources --
+Style "XPaint"           Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "Canvas"           Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "fatbits"          Icon norm/todo.xpm,MiniIcon mini/todo.xpm
+Style "filebrowser"      Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+# -- xpaint resources ] --
+Style "xmh"              Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "xmixer"           Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "xmms"             Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "xpdf"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "xplaycd"          Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm
+Style "xscreensaver"     Icon norm/lock.xpm,MiniIcon mini/lock.xpm
+Style "xsysinfo*"        Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xtar*"            Icon norm/file.xpm,MiniIcon mini/file.xpm
+Style "XTel"             Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm
+Style "XTide"            Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "xv"               Icon norm/xv.xpm,MiniIcon mini/xv.xpm
+Style "xvgr"             Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "xvmount"          Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "xwp"              Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm
+Style "xwpe"             Icon norm/developement.xpm,MiniIcon mini/developement.xpm
+Style "xxgdb"            Icon norm/developement.xpm,MiniIcon mini/developement.xpm
+
+# Open File dialog
+Style "Browse * Select a File" Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "File Directory"   Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "fileSelector*"    Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "fileSelection_popup" Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Open document"    Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Save as"          Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Select a file to open"  Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Select a file to load"  Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "selFile"          Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Open File..."     Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "xgetfile"         Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+
+# Too general
+Style "*_applet"         Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "help*"    Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "*icq"             Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+Style "*irc"             Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+Style "*info"    Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "info*"    Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "Information" Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "_o_*"     Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "About"    Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "about_popup" Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "about"    Icon norm/information.xpm,MiniIcon mini/information.xpm
+
+# FVWM / FVWM Themes
+Style "Fvwm*"          Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "FvwmConsole" Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm
+Style "FVWM Themes*"   Icon norm/themes.xpm,MiniIcon mini/themes.xpm
+Style "FVWM Themes Config*" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "FVWM Themes Doc*"   Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "FVWM Themes Menu*"  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "Color Selector"     Icon norm/colors.xpm,MiniIcon mini/colors.xpm
+Style "Font Selector"      Icon norm/font.xpm,MiniIcon mini/font.xpm
+Style "Icon Browser" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "Image Browser" Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "FvwmForm-ThemeSettings" Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "FvwmForm-Restart"       Icon norm/restart.xpm,MiniIcon mini/restart.xpm
+Style "FormFvwmAnimate"        Icon norm/window-iconify.xpm,MiniIcon mini/window-iconify.xpm
+Style "FvwmForm-Form"          Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "FvwmForm-RootCursor"    Icon norm/display.xpm,MiniIcon mini/display.xpm
+Style "FvwmScript-BellSetup"   Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "FvwmScript-Keyboard"    Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm
+Style "FvwmScript-ScreenSetup" Icon norm/display.xpm,MiniIcon mini/display.xpm
+Style "FvwmScript-PointerSetup" Icon norm/mouse.xpm,MiniIcon mini/mouse.xpm
+
+# GNOME/Gtk Apps
+Style "AbiWord*"               Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm
+Style "bug-buddy"              Icon norm/developement.xpm,MiniIcon mini/developement.xpm
+Style "Dia"                    Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "eog"                    Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "Galeon-bin"             Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "galeon*"                Icon norm/www.xpm,MiniIcon mini/www.xpm
+Style "gcharmap"               Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm
+Style "gcolorsel"              Icon norm/colors.xpm,MiniIcon mini/colors.xpm
+Style "gdict"                  Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "gdiskfree"              Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "gEdit"                  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "gedit"                  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "gfontsel"               Icon norm/font.xpm,MiniIcon mini/font.xpm
+Style "gfloppy"                Icon norm/disk-floppy.xpm,MiniIcon mini/disk-floppy.xpm
+Style "ghex"                   Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "ghostview"              Icon norm/ghostview.xpm,MiniIcon mini/ghostview.xpm
+Style "Gimp"                   Icon norm/gimp.xpm,MiniIcon mini/gimp.xpm
+Style "gaim*"                  Icon norm/chat.xpm
+Style "eDonkey*"               Icon norm/monitoring.xpm
+Style "*GVIM"                  Icon norm/editor.xpm
+Style "gless"                  Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "gmix"                   Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "gmailman"               Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "gmc"                    Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "gmenu"                  Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "gnome-help-browser"     Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "GnomeHelpBrowser"       Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "gnome-hint"             Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "gnome-ppp"              Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "gnome-run"              Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "gnome-sync"             Icon norm/folder.xpm,MiniIcon mini/folder.xpm
+Style "Gnome-linuxconf"        Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "gnomecal"               Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "GnomeCard"              Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "gnomecard"              Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "gnomecc"                Icon norm/home.xpm,MiniIcon mini/home.xpm
+Style "GnomeTerminal"          Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "gnumeric"               Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm
+Style "gnp"                    Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "gnp+"                   Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "GQview"                 Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "grecord"                Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "grip"                   Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm
+Style "gsearchtool"            Icon norm/file.xpm,MiniIcon mini/file.xpm
+Style "gtalk"                  Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+Style "gtcd"                   Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm
+Style "gtk-shell"              Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "gtkicq"                 Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+Style "gtop"                   Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "gtt"                    Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "guname"                 Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "gw"                     Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "gxedit"                 Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "helix-update"           Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "idetool"                Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "logview"                Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "pan"                    Icon norm/news.xpm,MiniIcon mini/news.xpm
+Style "vumeter"                Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "X-Chat"                 Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+
+# XFCE Apps
+Style "xfclock"                Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "xftree"                 Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+
+# KDE Apps
+# -- [ Abbrowser --
+Style "kcontrol"               Icon norm/kde.xpm,MiniIcon mini/kde.xpm
+Style "abbrowser"              Icon norm/information.xpm,MiniIcon mini/information.xpm
+# -- Abbrowser ] --
+Style "aktion"                 Icon norm/video.xpm,MiniIcon mini/video.xpm
+Style "ark"                    Icon norm/file.xpm,MiniIcon mini/file.xpm
+# -- [ kviewshell --
+Style "kviewshell"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "DVI Viewer"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "Fax Viewer"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+# -- kviewshell ] --
+Style "kab"                    Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "kaiman"                 Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "karm"                   Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "kcharselect"            Icon norm/keyboard.xpm,MiniIcon mini/keyboard.xpm
+Style "kchart"                 Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "kcron"                  Icon norm/system.xpm,MiniIcon mini/system.xpm
+Style "kdehelp"                Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "kdepasswd"              Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm
+Style "kdevelop"               Icon norm/developement.xpm,MiniIcon mini/developement.xpm
+Style "kdesu"                  Icon norm/terminal-special.xpm,MiniIcon mini/terminal-special.xpm
+Style "kdf"                    Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "kdvi"                   Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "kedit"                  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "keystone"               Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "kfind"                  Icon norm/file.xpm,MiniIcon mini/file.xpm
+Style "kfloppy"                Icon norm/disk-floppy.xpm,MiniIcon mini/disk-floppy.xpm
+Style "kfm"                    Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "kfract"                 Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "khexedit"               Icon norm/file.xpm,MiniIcon mini/file.xpm
+Style "kiconedit"              Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "kit"                    Icon norm/chat.xpm,MiniIcon mini/chat.xpm
+Style "killustrator"           Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "kjots"                  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "klpq"                   Icon norm/printing.xpm,MiniIcon mini/printing.xpm
+Style "kljettool"              Icon norm/printing.xpm,MiniIcon mini/printing.xpm
+Style "knode"                  Icon norm/news.xpm,MiniIcon mini/news.xpm
+Style "knews"                  Icon norm/news.xpm,MiniIcon mini/news.xpm
+Style "kmail*"                 Icon norm/mail.xpm,MiniIcon mini/mail.xpm
+Style "kmidi"                  Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "kmid"                   Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "kmix"                   Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "artsbuilder"            Icon norm/music.xpm,MiniIcon mini/music.xpm
+Style "artscontrol"            Icon norm/sound.xpm,MiniIcon mini/sound.xpm
+Style "kmoon"                  Icon norm/science.xpm,MiniIcon mini/science.xpm
+Style "kodo"                   Icon norm/mouse.xpm,MiniIcon mini/mouse.xpm
+Style "kpackage"               Icon norm/program.xpm,MiniIcon mini/program.xpm
+Style "kppp"                   Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "kppplogview"            Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "kghostview"             Icon norm/viewer.xpm,MiniIcon mini/viewer.xpm
+Style "konqueror"              Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "korganizer"             Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "konsole"                Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "koshell"                Icon norm/home.xpm,MiniIcon mini/home.xpm
+Style "kpixmap2bitmap"         Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "kpm"                    Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "kpresenter"             Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm
+Style "krule"                  Icon norm/utility.xpm,MiniIcon mini/utility.xpm
+Style "kscd"                   Icon norm/cd-player.xpm,MiniIcon mini/cd-player.xpm
+Style "ksnapshot"              Icon norm/window.xpm,MiniIcon mini/window.xpm
+Style "kspread"                Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm
+Style "ksysguard"              Icon norm/monitoring.xpm,MiniIcon mini/monitoring.xpm
+Style "ksysv"                  Icon norm/system.xpm,MiniIcon mini/system.xpm
+Style "kteatime"               Icon norm/amusement.xpm,MiniIcon mini/amusement.xpm
+Style "ktip"                   Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "kuser"                  Icon norm/system.xpm,MiniIcon mini/system.xpm
+Style "kview"                  Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+Style "kvt"                    Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "kwikdisk"               Icon norm/disk.xpm,MiniIcon mini/disk.xpm
+Style "kword"                  Icon norm/word-processor.xpm,MiniIcon mini/word-processor.xpm
+Style "kworldwatch"            Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "kwrite"                 Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "kwuftpd"                Icon norm/network.xpm,MiniIcon mini/network.xpm
+Style "noatun"                 Icon norm/multimedia.xpm,MiniIcon mini/multimedia.xpm
+Style "pixie"                  Icon norm/image-viewer.xpm,MiniIcon mini/image-viewer.xpm
+
+# CDE Apps
+Style "Dterm"                  Icon norm/terminal.xpm,MiniIcon mini/terminal.xpm
+Style "Dtfile"                 Icon norm/file-manager.xpm,MiniIcon mini/file-manager.xpm
+Style "Dtpad"                  Icon norm/editor.xpm,MiniIcon mini/editor.xpm
+Style "Dthelp*"                Icon norm/help.xpm,MiniIcon mini/help.xpm
+Style "Dtcm*"                  Icon norm/clock.xpm,MiniIcon mini/clock.xpm
+Style "Dtcalc"                 Icon norm/calculator.xpm,MiniIcon mini/calculator.xpm
+Style "Dticon*"                Icon norm/image-processor.xpm,MiniIcon mini/image-processor.xpm
+Style "Dtprint*"               Icon norm/printing.xpm,MiniIcon mini/printing.xpm
+Style "Dtstyle*"               Icon norm/configuration.xpm,MiniIcon mini/configuration.xpm
+Style "Applications Manager"   Icon norm/program.xpm,MiniIcon mini/program.xpm
+Style "Trash Can"              Icon norm/file.xpm,MiniIcon mini/file.xpm
+
+# Games
+Style "SDL_App"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "*angband"               Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "gcfclient"              Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "Maelstrom"              Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "MirrorMagic"            Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "PySol"                  Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "Rocks'n'Diamonds"       Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "XGammon"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "XGammon-Buttons"        Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xgoban"                 Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "comment"                Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xmahjongg"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "*tetris"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "xtrojka"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "xemeraldia"             Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "XGalaga"                Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "xeyes"                  Icon norm/amusement.xpm,MiniIcon mini/amusement.xpm
+
+# 11 xpuzzles
+Style "xcubes"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xdino"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xhexagons"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xmball"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xmlink"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xoct"                   Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xpanex"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xpyraminx"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xrubik"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xskewb"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xtriangles"             Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+
+Style "High score*"            Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "Statistics"             Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "xboard"                 Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm
+Style "xevil"                  Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "xsok*"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "xbomb"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "*Scavenger"             Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "Freeciv*"               Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "XPat"                   Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "dontspace"              Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "klondike"               Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "spider"                 Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "X-Mame*"                Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "xlin-city*"             Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "xchomp"                 Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+
+# GNOME Games
+Style "freecell"               Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "gataxx"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "glines"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gnibbles"               Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "gnobots"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gnobots2"               Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gnome-chess"            Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm
+Style "gnome-stones"           Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "gnome-xbill"            Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "gnomine"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gnotski"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gtali"                  Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm
+Style "gnotravex"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gturing"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "iagno"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "mahjongg"               Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "same-gnome"             Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "sol"                    Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+
+Style "gtkballs"               Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "gfpoken"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+
+# KDE Games  # these ones have own 16x16 & 32x32 xpm's included with kdebase
+Style "Jezzball"               Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "lskat"                  Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "kabalone"               Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kasteroids"             Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "katomic"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kbackgammon"            Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm
+Style "kblackbox"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kfouleggs"              Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "kjumpingcube"           Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kmahjongg"              Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kmines"                 Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "konquest"               Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "kpat"                   Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "kpoker"                 Icon norm/game-cards.xpm,MiniIcon mini/game-cards.xpm
+Style "kreversi"               Icon norm/game-board.xpm,MiniIcon mini/game-board.xpm
+Style "ksame"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kshisen"                Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "ksirtet"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "ksmiletris"             Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "ksnake"                 Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "ksokoban"               Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm
+Style "kspaceduel"             Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "ktron"                  Icon norm/game-action.xpm,MiniIcon mini/game-action.xpm
+Style "ktetris"                Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "ktuberling"             Icon norm/game.xpm,MiniIcon mini/game.xpm
+Style "kwin4"                  Icon norm/game-logic.xpm,MiniIcon mini/game-logic.xpm       
+
+
+Style "FvwmButtons"         Icon toolbox.xpm
+Style "Mosaic"              Icon norm/netscape.xpm,MiniIcon mini/netscape.xpm
+Style "Root"                Icon supermn1.xpm,MiniIcon mini/terminal.xpm
+Style "root*"               Icon supermn1.xpm,MiniIcon mini/terminal.xpm
+Style "VM"                  Icon mail_edit.xpm,MiniIcon mini/mail.xpm
+Style "Work2"               Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "work2"               Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "XArchie"             Icon xarchie.xpm,MiniIcon mini/network.xpm
+Style "XGopher"             Icon xgopher.xpm,MiniIcon mini/network.xpm
+Style "XGrab"               Icon xgrab.xpm,MiniIcon mini/image-processor.xpm
+Style "XRn"                 Icon xrn.xpm,MiniIcon mini/news.xpm
+Style "postit"              Icon postit.xpm,MiniIcon mini/information.xpm
+Style "xcb"                 Icon clipboard.xpm,MiniIcon mini/information.xpm
+Style "xcd"                 Icon cdrom1.xpm,MiniIcon mini/cd-player.xpm
+Style "xman"                Icon xman.xpm,MiniIcon mini/information.xpm
+Style "xmanSearch"          Icon ctwm/xman.xpm,MiniIcon mini/information.xpm
+Style "xterm"               Icon xterm.xpm,MiniIcon mini/terminal.xpm
+
+Style "xinfo"               Icon cl-32/gnuinfo.xpm,MiniIcon mini/information.xpm
+Style "XInfo"               Icon cl-32/gnuinfo.xpm,MiniIcon mini/information.xpm
+
+Style "pgp-pixie"           Icon hobbes-icons-xpm3/l/lock1.xpm,MiniIcon mini/lock.xpm
+Style "xdvi"                Icon /usr/local/share/graphics/texicons/xpm/dvi.xpm,MiniIcon mini/viewer.xpm
+Style "xmoondial"           Icon hobbes-icons-xpm3/m/moonb.xpm,MiniIcon mini/clock.xpm
+Style "xmultibiff"          Icon hobbes-icons-xpm3/m/mailbox.xpm,MiniIcon mini/mail.xpm
+Style "Work1"               Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "work1"               Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+
+Style "XClock"              Icon hobbes-icons-xpm3/s/sysclock.xpm,MiniIcon mini/clock.xpm
+Style "XPbiff"              Icon ctwm/mail0.xpm,MiniIcon mini/mail.xpm
+Style "XRlogin"             Icon cl-32/rlogin.xpm,MiniIcon mini/terminal.xpm
+Style "xvtdl"               Icon cl-32/check_list.xpm,MiniIcon mini/information.xpm
+Style "Xvtdl"               Icon cl-32/check_list.xpm,MiniIcon mini/information.xpm
+Style "faces"               Icon cl-32/face.xpm
+Style "sunclock"            Icon hobbes-icons-xpm3/s/sundial.xpm,MiniIcon mini/clock.xpm
+Style "timex"               Icon hobbes-icons-xpm3/t/timer2.xpm,MiniIcon mini/clock.xpm
+Style "window info"         Icon norm/information.xpm,MiniIcon mini/information.xpm
+Style "*PostScript File"    Icon desktop/document/postscript.xpm,MiniIcon mini/ghostview.xpm
+Style "*belthil*"           Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*camelot*"           Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*dhaka*"             Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*diamond*"           Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "*ikenga*"            Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*jade*"              Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "*mashad*"            Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*onyx*"              Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "*pearl*"             Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "*plymouth*"          Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*rome*"              Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*seoul*"             Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*sylhet*"            Icon hobbes-icons-xpm3/t/terminl2.xpm,MiniIcon mini/terminal.xpm
+Style "*topaz*"             Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+Style "*zircon*"            Icon hpterm.xpm,MiniIcon mini/terminal.xpm
+
+
--- fvwm-2.5.18.orig/debian/manoj/FvwmAnimate.hook
+++ fvwm-2.5.18/debian/manoj/FvwmAnimate.hook
@@ -0,0 +1 @@
+# This file created by FvwmAnimate
--- fvwm-2.5.18.orig/debian/manoj/m4menus.hook
+++ fvwm-2.5.18/debian/manoj/m4menus.hook
@@ -0,0 +1,52 @@
+#=====================================================  1. M4 macros
+#  1. M4 macros
+
+undefine('include')
+changequote({[,]})
+define(stripquote, {[substr(substr($1,1), 0, index(substr($1,1),'))]})
+define(XSIZE, ifelse(CLIENTHOST, `calidity', 12, CLIENTHOST, `glaurung', 16, 16))dnl
+define(YSIZE, ifelse(CLIENTHOST, `calidity',  9, CLIENTHOST, `glaurung', 12, 12))dnl
+
+define(XPIX,  eval(stripquote(WIDTH) / XSIZE))dnl
+define(YPIX,  eval(stripquote(HEIGHT) / YSIZE))dnl
+
+define(xsize, {[eval((1000 * $1 / stripquote(WIDTH) + 5) / 10)]})
+AddToMenu "m4-Settings" "M4 Settings for fvwm FVWM_VERSION" Title
++              "{[TWM_TYPE=]}TWM_TYPE" Nop
++              "{[FVWM_VERSION=]}FVWM_VERSION" Nop
++              "{[FVWMDIR=]}FVWMDIR" Nop
++              "{[CMD_OPTIONS=]}CMD_OPTIONS" Nop
++              "{[FVWM_MODULEDIR=]}FVWM_MODULEDIR" Nop
++              "{[FVWM_USERDIR=]}FVWM_USERDIR" Nop
++              "Hosts Info" Title
++              "{[SERVERHOST=]}SERVERHOST" Nop
++              "{[CLIENTHOST=]}CLIENTHOST" Nop
++              "{[HOSTNAME=]}HOSTNAME" Nop
++              "{[OSTYPE=]}OSTYPE" Nop
++              "{[SESSION_MANAGER=]}SESSION_MANAGER" Nop
++              "User Info" Title
++              "{[USER=]}USER" Nop
++              "{[HOME=]}HOME" Nop
++              "Vendor Info" Title
++              "{[VENDOR=]}VENDOR" Nop
++              "{[VERSION=]}VERSION" Nop
++              "{[RELEASE=]}RELEASE" Nop
++              "{[REVISION=]}REVISION" Nop
++              "{[OPTIONS=]}OPTIONS" Nop
++              "Screen Size and resolution" Title
++              "{[WIDTH=]}WIDTH" Nop
++              "{[HEIGHT=]}HEIGHT" Nop
++              "{[X_RESOLUTION=]}X_RESOLUTION" Nop
++              "{[Y_RESOLUTION=]}Y_RESOLUTION" Nop
++              "{[XSIZE=]}XSIZE" Nop
++              "{[YSIZE=]}YSIZE" Nop
++              "{[XPIX=]}XPIX" Nop
++              "{[YPIX=]}YPIX" Nop
++              "Color and stuff" Title
++              "{[CLASS=]}CLASS" Nop
++              "{[COLOR=]}COLOR" Nop
++              "{[PLANES=]}PLANES" Nop
++              "{[BITS_PER_RGB=]}BITS_PER_RGB" Nop
+
+
+
--- fvwm-2.5.18.orig/debian/manoj/menudefs.hook
+++ fvwm-2.5.18/debian/manoj/menudefs.hook
@@ -0,0 +1,195 @@
+#=====================================================  A. menus
+#  A. menus - defer bindings until later
+# Delete
+#  Fvwm checks to see if the window understands the "Delete"
+#  protocol. Not all windows do. If it understands "Delete", fvwm sends
+#  the delete message to the window. If the program operating the window
+#  is working well, it will remove itself sometime in the relatively
+#  near future. (May not be immediate, the application may pop-up a
+#  confirm box, may save its state, whatever). As far as fvwm is
+#  concerned, the "Delete" action is done when the message is sent, even
+#  if the window still exists.
+# Close
+#  Similar to delete, but if the window doesn't understand "Delete", the
+#  window is destroyed. At this point, you have either sent two delete
+#  messages, or have beeped and destroyed the window. When destroying a
+#  window, Fvwm actually removes the window, and the program usually,
+#  but not always, crashes.
+# Destroy
+#  This will make fvwm actually destroy the window. Chances are, this
+#  will happen before any of the "Delete" messages are handled by the
+#  application.
+# 
+#  The correct thing to put in your menu, is a simple "Close" this will
+#  correctly remove all windows, except those that understand "Delete"
+#  and are misbehaving (crashing, poorly written, whatever). To handle
+#  the case of a misbehaving window, have a separate item "Destroy"
+#  which you invoke only if the window doesn't respond to "Close"
+
+# This menu is invoked as a sub-menu - it allows you to quit,
+# restart, or switch to another WM.
+DestroyMenu Quit-Verify
+AddToMenu "Quit-Verify" "Really Quit Fvwm?" Title
++              "&Yes, Really Quit%mini.exit.xpm%" Quit
++              "&Restart fvwm2%mini.calc.xpm%" Restart /usr/bin/X11/fvwm2
++              "&No, Don't Quit%mini.checkmark.xpm%" Nop
+
+
+
+DestroyMenu Bell
+AddToMenu Bell  "Loud"  Exec xset b 100
++               "Quiet" Exec xset b 30
++               "Off"   Exec xset b 0
+
+DestroyMenu Keyclick
+AddToMenu Keyclick      "Loud"  Exec xset c 100
++                       "Quiet" Exec xset c 13
++                       "Off"   Exec xset c 0
+
+DestroyMenu Paging
+AddToMenu "Paging" "Paging Functions" Title
++              "Paging OFF"     		EdgeScroll 0 0
++              "Paging ON"     			EdgeScroll 100 100
++              "Horizontal Paging Only"     	EdgeScroll 100 0
++              "Vertical Paging Only"     	EdgeScroll 0 100
++              "Partial Paging"     		EdgeScroll 50 50
+
+
+##+              "Neon Pager"     		Read .new_pager
+##+              "Default Pager"  		Read .old_pager
+
+
+# AddToFunc StartTin      "I"     Desk 0 0
+# +       "I"     GotoPage 0 1
+# +       "I"     Exec xterm -geometry 98x64+0+0 -ls -e /usr/bin/tin &
+# This should move to desk 0, then to the second page down on the left,
+# then start up an xterm running tin.  Seems to work from any initial
+# desk. or xterm -geometry +0+`expr $SCREENHEIGHT`
+
+# Build a menu of all .jpg files in $HOME/lib/public_html/images
+#AddToMenu ImageMenu foo title
+#+ DynamicPopupAction Function MakeImageMenu
+
+AddToFunc MakeImageMenu
++ I DestroyMenu recreate ImageMenu
++ I AddToMenu ImageMenu Pictures Title
++ I PipeRead 'for i in $HOME/public_html/images/*.jpg  \
+                       $HOME/public_html/images/*.gif  \
+                       $HOME/public_html/images/*.png; \
+  do echo AddToMenu ImageMenu "`basename $i`" Exec display $i; done'
+
+
+DestroyMenu Forms
+AddToMenu Forms "&Q. QuitVerify" Module FvwmForm FvwmForm-QuitVerify
+AddToMenu Forms "&C. Capture"    Module FvwmForm FvwmForm-Capture
+AddToMenu Forms "&R. Rlogin"     Module FvwmForm FvwmForm-Rlogin
+AddToMenu Forms "&T. Talk"       Module FvwmForm FvwmForm-Talk
+AddToMenu Forms "&F. FORM"       Module FvwmForm FvwmForm-Form
+AddToMenu Forms "&O. RootCursor" Module FvwmForm FvwmForm-RootCursor
+
+DestroyFunc RaiseOnTop
+AddToFunc RaiseOnTop
+	+ I Layer 0 4
+	+ I Raise 
+# cyclicly change a window layer 4 -> 10 -> 5 -> 9 -> 4
+
+DestroyFunc ActuallyDoLayer
+AddToFunc   ActuallyDoLayer
+ThisWindow (Layer  4) + Layer 10
+ThisWindow (Layer  5) + Layer  9
+ThisWindow (Layer  9) + Layer  4
+ThisWindow (Layer 10) + Layer  5
+ActuallyDoLayer
+
+# AddToFunc ChangeRootHourly
+#   + I Exec exec cgbg
+#   + I Schedule 3600000 ChangeRootHourly
+
+DestroyFunc ChangeRootHourly
+AddToFunc   ChangeRootHourly
++ I PipeRead `dump-2-config-lines-for-colorset-51-and-52`
++ I Schedule 3600000 ChangeRootHourly
+
+#AddToFunc StartFunction
+#+ I ChangeRootHourly
+#+ I FvwmBacker
+
+#*FvwmBacker: Command (Desk 0) Colorset 51
+#*FvwmBacker: Command (Desk 1) Colorset 52
+
+#The script should dump 2 lines, something like:
+#  Colorset 51 Pixmap bg7.png
+#  Colorset 52 Pixmap bg4.png
+
+
+#AddtoFunc move_noresist
+#  + I EdgeResistance 10000 100
+#  + I Move
+#  + I EdgeResistance 10000 10000
+
+DestroyFunc FuncFvwmMaximizeFullScreen
+AddToFunc   FuncFvwmMaximizeFullScreen
+    + I ThisWindow (Maximized) Style $n Title, BorderWidth 4, HandleWidth 4
+    + I KeepRc TestRc (NoMatch) Style $n NoTitle, BorderWidth 16, HandleWidth 16
+    + I KeepRc TestRc (NoMatch) Raise
+    + I KeepRc TestRc (NoMatch) UpdateStyles
+    + I Maximize
+
+
+#
+# Some Example Menus
+#
+#
+
+DestroyMenu "Remote-Popup"
+AddToMenu "Remote-Popup" "somewhere"    exec xterm -sl 1024 -cr white -fg white -bg \#114433 -T Oneway -e ssh -l me somewhere.com
++              "generic" FvwmForm Ssh
+
+DestroyMenu "Graphics-Popup"
+AddToMenu "Graphics-Popup" "The GIMP" Exec xterm -fg \#30d030 -bg black -T gimpit -geometry 80x5+602+787 -e /usr/bin/gimp
++              "Tgif" Exec tgif
++              "Xpaint" Exec xpaint
++              "Xmag" Exec xmag
++              "XView" Exec xv
++              "Image Magick" Exec display
+
+DestroyMenu "Development-Popup"
+AddToMenu "Development-Popup"  "X-gdb" Exec xxgdb
++              "ddd" Exec ddd
++              "X-man" Exec xman
+
+DestroyMenu "Accessories-Popup"
+AddToMenu "Accessories-Popup" "Calculator" Exec xcalc
++              "Seyon" Exec seyon -modems /dev/cuaa1
++              "Nedit" Exec nedit
++              "Lock" Exec xlock -mode swarm
+
+DestroyMenu "Games-Popup"
+AddToMenu "Games-Popup" "X-kobo" Exec xkobo
++              "X-boing" Exec xboing
++              "Mahjong" Exec xmj
++              "Minesweeper" Exec xmine
++              "X-Emeraldia" Exec xemeraldia -noscore
++              "Solitaire" Exec tksol
+
+DestroyMenu "Sound-Popup"
+AddToMenu "Sound-Popup" "X-Mixer" Exec xmmix
++              "Xm-CD Player" Exec xmcd
+
+
+DestroyMenu MiscUtilities
+AddToMenu MiscUtilities
++	"Paging"	Popup Paging
++	"Forms"	Popup Forms
++	"Graphics-Popup"	Popup "Graphics-Popup"
++	"Development-Popup"	Popup "Development-Popup"
++	"Accessories-Popup"	Popup "Accessories-Popup"
++	"Games-Popup"	Popup "Games-Popup"
++	"Sound-Popup"	Popup "Sound-Popup"
++       "Move Mehtods"  Popup FvwmMoveMethods
++ DynamicPopupAction Function MakeImageMenu
++ "Images" Popup ImageMenu
++ DynamicPopupAction Function WallpaperBrowser
++ "WallPaper Browser" Popup WallpaperBrowserMenu
++ MissingSubmenuFunction FuncFvwmMenuDirectory
++ "WallPapers" Popup $[fvwm_image_path]/wallpaper/
--- fvwm-2.5.18.orig/debian/manoj/restart.hook
+++ fvwm-2.5.18/debian/manoj/restart.hook
@@ -0,0 +1,2 @@
+# Stuff to be done when we re-start fvwm
+
--- fvwm-2.5.18.orig/debian/manoj/README
+++ fvwm-2.5.18/debian/manoj/README
@@ -0,0 +1,12 @@
+This is complete working setup that I use (it may not be as pretty as
+some, but it demonstrates most of the common techniques used in fvwm,
+and has a working themable colorset setup.
+
+The wall paper was taken from the GPL's enlightment theme found at
+http://download.freshmeat.net/themes/darkalloy/, and the icons are
+mostly from the package wm-icons.
+
+Manoj Srivastava <srivasta@debian.org> 
+
+Copyright (c) 2004 Manoj Srivastava, and distributed under the terms
+of the GNU General Public License, version 2.
--- fvwm-2.5.18.orig/debian/manoj/FvwmForm-Talk
+++ fvwm-2.5.18/debian/manoj/FvwmForm-Talk
@@ -0,0 +1,22 @@
+# FvwmForm-Talk - Basic replacement for FvwmTalk
+DestroyModuleConfig  FvwmForm-Talk: *
+*FvwmForm-Talk: WarpPointer
+# Layout
+*FvwmForm-Talk: Line         center
+*FvwmForm-Talk: Text         "Talk to Fvwm"
+*FvwmForm-Talk: Line         left
+*FvwmForm-Talk: Text         "Command:"
+*FvwmForm-Talk: Input        Command 80 ""
+*FvwmForm-Talk: Line         left
+*FvwmForm-Talk: Text         "Msg:"
+*FvwmForm-Talk: Message
+*FvwmForm-Talk: Line         center
+# Buttons
+*FvwmForm-Talk: Button       restart    "Return - Execute"         ^M
+*FvwmForm-Talk: Command        $(Command)
+*FvwmForm-Talk: Button       continue    "F1 - Help" F1
+*FvwmForm-Talk: Command        Module FvwmForm FvwmForm-TalkHelp
+*FvwmForm-Talk: Button       restart     "F3 - Reset input" F3
+*FvwmForm-Talk: Command        Nop
+*FvwmForm-Talk: Button       quit        "F4 - Dismiss"  F4
+*FvwmForm-Talk: Command        Nop
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-Form.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-Form.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.6
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/style.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/style.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.30
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/main-menu.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/main-menu.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.23
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-QuitVerify.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-QuitVerify.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.7
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/post.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/post.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.25
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/README.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/README.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.14
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/functions.def.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/functions.def.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.17
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-RootCursor.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-RootCursor.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.9
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/buttons.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/buttons.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.15
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/m4menus.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/m4menus.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.22
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-Talk.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-Talk.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.11
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/headlines.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/headlines.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.18
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmModules.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmModules.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.13
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/post_menu.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/post_menu.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.26
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/init-restart.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/init-restart.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.20
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/icons.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/icons.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.19
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/screendiffs.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/screendiffs.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.29
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/restart.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/restart.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.28
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmButtons.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmButtons.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.4
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/.FvwmAnimate.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/.FvwmAnimate.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Wed Sep 22 19:35:23 2004 8189.0
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmAnimate.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmAnimate.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.2
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/.fvwm2rc.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/.fvwm2rc.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:10:53 2004 17297.0
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmAuto.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmAuto.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.3
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-Rlogin.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-Rlogin.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.8
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/colorsets.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/colorsets.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.16
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/=id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/=id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.1
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/menudefs.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/menudefs.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.24
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/pre.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/pre.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.27
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/binding.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/binding.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:25 2004 16690.0
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-TalkHelp.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-TalkHelp.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.12
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-Setup.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-Setup.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.10
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/FvwmForm-Capture.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/FvwmForm-Capture.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.5
--- fvwm-2.5.18.orig/debian/manoj/.arch-ids/init.hook.id
+++ fvwm-2.5.18/debian/manoj/.arch-ids/init.hook.id
@@ -0,0 +1 @@
+Manoj Srivastava <srivasta@debian.org> Fri May  7 01:08:52 2004 16707.21
--- fvwm-2.5.18.orig/debian/manoj/main-menu.hook
+++ fvwm-2.5.18/debian/manoj/main-menu.hook
@@ -0,0 +1,123 @@
+# Sub menu for Utilities
+AddToMenu "System-Edits" "System Edits" Title
++              "Edit .fvwmrc" Exec emacs_once .fvwmrc &
++              "Edit .xsession" Exec emacs_once .xsession &
++              "Edit .Xresources" Exec emacs_once .Xresources &
++              "Source .Xresources" Exec xrdb -merge .Xresources &
++              "Restart fvwm2" Restart fvwm2
+
+PipeRead 'fvwm-menu-desktop --desktop kde-sys'
+#PipeRead 'fvwm-menu-xlock --name MenuSSaver --title "Screensaver" \
+#  --icon-item mini-bball.xpm --special-first -- -nice 19 -nolock'
+#PipeRead 'fvwm-menu-xlock --name MenuSLock --title "Lock Screen" \
+#  --icon-item mini-rball.xpm --special-first -- -nice 19 -nolock'
+
+
+AddToMenu "Utilities" 
+# This menu will fire up some very common utilities
++ "&Apps" Popup /Debian/Apps
++ "&Games" Popup /Debian/Games
++ "&Help" Popup /Debian/Help
++ "&Screen" Popup /Debian/Screen
++ "&WindowManagers" Popup /Debian/WindowManagers
++ "KDE System Menu" Popup kde-sys
++ "Misc" Popup MiscUtilities
++ "Headlines" Popup MenuFvwmHeadlines
++ "&XShells" Popup /Debian/XShells
++ "&Mozilla" Function Warp-or-Run-Browser
++ "Manpage: fvwm%32x32.help.xpm%"       Exec exec xterm -g 68x45-0-5 -fn \
+        9x15 -fb 9x15bold -T "Manpage: fvwm2" -n "fvwm2" -e mcview \
+       /usr/share/man/man1/fvwm2.1.gz
++              "" Nop
++              "Refresh Screen"   Refresh
++              "System Edits" Popup System-Edits
++              ""              Nop
+#+ "Screensaver%mini-monitor.xpm%" Popup MenuSSaver
+#+ "Screenlock%mini-lock.xpm%"     Popup MenuSLock
++ "E&xit Fvwm%mini.exit.xpm%" 	Popup Quit-Verify
+
+
+AddToMenu Misc-Ops "Misc Config Opts" Title
++                  "Sloppy Focus"        ChangeDefaultFocus SloppyFocus
++                  "Click To Focus"      ChangeDefaultFocus ClickToFocus
++                  "Focus Follows Mouse" ChangeDefaultFocus FocusFollowsMouse
++                  "" Nop
++                  "Colormap Follows Mouse" ColormapFocus FollowsMouse
++                  "Colormap Follows Focus" ColormapFocus FollowsFocus
++                  "" Nop
++                  "Full Paging ON"         EdgeScroll 100 100
++                  "All Paging OFF"         EdgeScroll 0 0
++                  "Horizontal Paging Only" EdgeScroll 100 0
++                  "Vertical Paging Only"   EdgeScroll 0 100
++                  "Partial Paging"         EdgeScroll 50 50
++                  "Full Paging && Edge Wrap" EdgeScroll 100000 100000
+
+
+DestroyMenu Window-Ops
+AddToMenu "Window-Ops" "Windows"       Title
++    "work&2%mini.xterm.xpm%" 	  Exec exec uxterm -fg $[fg.cs30] -bg $[bg.cs30] -ut -T Work2 -e /bin/bash &
++    "work&3%mini.xterm.xpm%" 	  Exec exec uxterm -fg $[fg.cs32] -bg $[bg.cs32]  -ut -T Work3 -e /bin/bash &
++    "&Root%mini.xterm.xpm%" 	  Exec exec uxterm -fg $[fg.cs33] -bg $[bg.cs33] -T Root -e /bin/su -c '/bin/bash -rcfile "~srivasta/.rootrc" -i' root&
++    "Hidden Console"                 Function StartHiddenConsole
++    "Window Operations" 		  Title
++    "&Move%mini.move.xpm%" 	  Function Move-or-Raise
++    "Re&size%mini.resize.xpm%" 	  Function Resize-or-Raise
++    "Raise%mini.raise.xpm%" 	  Raise
++    "Lower%mini.lower.xpm%" 	  Lower
++    "(De)&Iconify%mini.iconify.xpm%" Iconify
++    "(Un)&Stick%mini.stick.xpm%" 	Stick
++    "(Un)Maximize%mini.resize.xpm%" Function max_vert_func
++    "" 				Nop
++    "Destroy%mini.destroy.xpm%" 	Destroy
++    "Close%mini.bomb.xpm%" 	Close
++    "" 				Nop
++    "ScrollBar"                    Module FvwmScroll 2 2
++    "Re&fresh Screen" 		Refresh
++    "Refresh Window"                RefreshWindow
++    "Print"                        PrintFunction
++    "Print Reverse"                PrintReverseFunction
+
+#    "work&2%mini.xterm.xpm%" 		Exec exec mlterm -f $[fg.cs30] -b $[bg.cs30] -t -T Work2 -e /bin/bash &
+#    "work&3%mini.xterm.xpm%" 		Exec exec mlterm -f $[fg.cs32] -b $[bg.cs32]  -t -T Work3 -e /bin/bash &
+#    "&Root%mini.xterm.xpm%" 		Exec exec mlterm -f $[fg.cs33] -b $[bg.cs33] -t -T Root -e /bin/su -c '/bin/bash -rcfile "~srivasta/.rootrc" -i' root&
+
+
+# A trimmed down version of "Window-Ops", good for binding to decorations
+DestroyMenu Window-Ops2
+AddToMenu "Window-Ops2" "Window" Title
++              "&Move%mini.move.xpm%" Function Move-or-Raise
++              "&Resize%mini.resize.xpm%" Function Resize-or-Raise
++              "Raise%mini.raise.xpm%" Raise
++              "&Lower%mini.lower.xpm%" Lower
++              "&Iconify%mini.iconify.xpm" Iconify
++              "(Un)&Stick%mini.stick.xpm%" Stick
++              "Select" Function SelectWindow
++              "Iconify With Thumbnail"   Function Thumbnail
++              "Send to &Page..."	         SendWindowTopage
++              "" Nop
++              "Destroy%mini.destroy.xpm%" Destroy
++              "Close%mini.bomb.xpm%" Close
++              "" Nop
++              "ScrollBar" Module FvwmScroll 2 2
+
+DestroyMenu General
+AddToMenu "General" "Generic Functions" Title
++              "&Stick" 		Stick
++              "&All windows" 		WindowList 0
++              "&Local windows" 	WindowList 2
++              "&Refresh" 		Refresh
++              "&Next Desk" 		Desk 1
++              "Circulate&Up" 		CirculateUp
++              "Circulate&Down" 	CirculateDown
++              "Previous Focus"         Prev (AcceptsFocus) Focus
++ 	       "Next Focus"             Next (AcceptsFocus) Focus
++ 	       ""                       Nop
++              "m4-Settings" 		Popup m4-Settings
++	       "Bell"                  	Popup Bell
++              "Keyclick"              	Popup Keyclick
++              "Toggle Paging"		Toggle-Page
++              "Paging Functions" 	Popup Paging		
++              "Recapture screen"       Recapture
++              "&Forms"                 Popup Forms
++              "Reset X defaults"       Exec xrdb -load $HOME/.Xresources
+
--- fvwm-2.5.18.orig/debian/manoj/FvwmForm-Rlogin
+++ fvwm-2.5.18/debian/manoj/FvwmForm-Rlogin
@@ -0,0 +1,30 @@
+DestroyModuleConfig  FvwmForm-Rlogin: *
+*FvwmForm-Rlogin: WarpPointer
+*FvwmForm-Rlogin: Line         center
+*FvwmForm-Rlogin: Text         "Login to Remote Host"
+*FvwmForm-Rlogin: Line         center
+*FvwmForm-Rlogin: Text         "Host:"
+*FvwmForm-Rlogin: Input        HostName        20      ""
+*FvwmForm-Rlogin: Line         center
+*FvwmForm-Rlogin: Selection    UserSel single
+*FvwmForm-Rlogin: Choice       Default Default on      "same user"
+*FvwmForm-Rlogin: Choice       Custom  Custom  off     "user:"
+*FvwmForm-Rlogin: Input        UserName        10      ""
+*FvwmForm-Rlogin: Line         expand
+*FvwmForm-Rlogin: Button       quit    "Login"         ^M
+*FvwmForm-Rlogin: Command      Exec exec ssh $(Custom?-l $(UserName)) $(HostName) xterm -T $(UserName)@$(HostName) -display $HOSTDISPLAY &
+# Before saving the data, remove any previously saved data:
+*FvwmForm-Rlogin: Command DestroyModuleConfig FvwmForm-RloginDefault: *
+# The "Login" button causes a login and a saving of the current data:
+*FvwmForm-Rlogin: Command !(                                      /bin/echo \
+  "# This file last created by FvwmForm-Rlogin on: `/bin/date`."; /bin/echo \
+  '*FvwmForm-RloginDefault: HostName $(HostName)'               ; /bin/echo \
+  '*FvwmForm-RloginDefault: UserName $(UserName)'               ; /bin/echo \
+  '*FvwmForm-RloginDefault: Default $(Default?on)'              ; /bin/echo \
+  '*FvwmForm-RloginDefault: Custom $(Custom?on)' \
+) > ${FVWM_USERDIR}/.FvwmForm-Rlogin
+*FvwmForm-Rlogin: Button       restart "Reset"
+*FvwmForm-Rlogin: Button       quit    "Cancel"        ^[
+*FvwmForm-Rlogin: Command      Nop
+# Tell FvwmForm to read vars from the .FvwmForm-RloginDefault file:
+*FvwmForm-Rlogin: UseData .FvwmForm-Rlogin *FvwmForm-RloginDefault
--- fvwm-2.5.18.orig/debian/manoj/post.hook
+++ fvwm-2.5.18/debian/manoj/post.hook
@@ -0,0 +1,2 @@
+# 
+
--- fvwm-2.5.18.orig/debian/manoj/style.hook
+++ fvwm-2.5.18/debian/manoj/style.hook
@@ -0,0 +1,379 @@
+
+#
+# Section: Styles, colors, fonts, and related things
+#
+# This section defines the looks, behavior, and other attributes of windows.
+# These are also quite personal.  Modify them in post.hook.
+#
+#
+# The following sets window colors.  This is highly personal,
+# of course.
+#
+
+#=====================================================  6. styles
+# 6. Set the decoration styles and window options
+# Order is important!!!!
+# If compatible styles are set for a single window in multiple Style
+# commands, then the styles are ORed together. If conflicting styles
+# are set, the last one specified is used.
+
+# These commands should command before any menus or functions are
+# defined, and before the internal pager is started.
+
+# I think I made a discovery - I asked a day ago about starting
+# applications on another desk *without* having fvwm switch back and
+# forth between desks when the application(s) are starting.
+
+# When browsing the source (style.c and placement.c) I noticed a style
+# called SkipMapping.  I added the SkipMapping style to the apps I
+# didnt want to map when starting in my .fvwmrc and lo and behold - IT
+# WORKED!
+
+# Is the SkipMapping an - OHH I LOVE THIS - and UNDOCUMENTED feature???
+# I couldnt find any ref to it in the man pages..
+
+
+########################      FOCUS STUFF     ##############################
+# Set windows to auto-raise after 750 milliseconds if you like it.
+# Autoraise can sometimes obscure pop-up windows. Performance is now
+# similar to olvwm's auto-raise feature.
+#AutoRaise 750
+
+# Normally, we'll be in focus-follows mouse mode, but uncomment this 
+# for mwm-style click-to-focus
+#ClickToFocus
+
+# or, you might like SloppyFocus, which is like focus-follow (the default
+# mode), but the focus won't be removed until you go into another window
+Style "*" SloppyFocus
+
+
+# BorderStyle
+#
+# This sets how the border of windows will be displayed.
+# Format:  BorderStyle [state] [style] [ -- [!flag] ... ]
+# State is either Active or Inactive
+# The commands below set the borders to solid colors
+# NoInset HiddenHandles
+#BorderStyle -- Flat, Noinset
+BorderStyle Active -- Raised
+BorderStyle Inactive -- Sunk
+
+# Style * TitleAtRight
+# Style * RightTitleRotatedCCW    # CCW = counter-clock-wise, default: CW
+# Style * !UseTitleDecorRotation  # don't rotate titlebar pixmaps/gradients
+
+# this is used for non-selected windows, menus, and the panner
+##Style "*"          	    IconBox -240 540 -1 675
+Style "*"            	    IconBox -160 800 -1 1000
+Style "Emacs"        	    IconBox -160 400 -1 795
+Style "XTerm"        	    IconBox -160 180 -1 395
+
+Style *                        IconTitleRelief 0
+Style *                        IconBackgroundRelief 0
+Style *                        IconBackgroundPadding 0
+Style *                        IndexedIconName
+
+Style "*"            	    BorderWidth 5, HandleWidth 5
+Style "*"            	    Icon unknown1.xpm
+Style *                     ResizeOpaque
+
+########################      WINDOW PLACEMENT     #######################
+# RandomPlacement prevents user interaction while placing windows:
+# RandomPlacement
+
+# SmartPlacement makes new windows pop-up in blank regions of screen 
+# if possible, or falls back to random or interactive placement.
+#Style "*"            	    RandomPlacement, SmartPlacement, CleverPlacement
+Style "*"            	    MinOverlapPercentPlacement
+
+
+Style *  WindowShadeSteps 20, ResizeOpaque
+
+Style FvwmButtons ParentalRelativity
+Style Fvwm* ParentalRelativity
+
+# With SmartPlacement, windows will normally place themselves over icons. 
+# Uncomment this to change that.
+#! StubbornPlacement
+
+# NoPPosition instructs fvwm to ignore the PPosition field in window 
+# geometry hints. Emacs annoyingly sets PPosition to (0,0)!
+Style "*" NoPPosition
+
+########################      DECORATIONS     #######################
+# If you want decorated transient windows, uncomment this:
+Style "*"            	    DecorateTransient
+
+
+########################      MWM EMULATION     #######################
+#
+# My feeling is that everyone should use MWMDecorHints and MWMFunctionHints,
+# since some applications depend on having the window manager respect them
+
+# MWMFunction hints parses the function information in the MOTIF_WM_HINTS
+# property, and prohibits use of these functions on the window. Appropriate
+# portions of the window decorations are removed.
+Style "*" MWMFunctions
+
+# MWM is kinda picky about what can be done to transients, and it was keeping
+# me from iconifying some windows that I like to iconify, so here's an
+# over-ride that will allow me to do the operation, even tough the menu
+# item is shaded out.
+Style "*" HintOverride
+
+# MWMDecor hints parses the decoration information in the MOTIF_WM_HINTS
+# property, and removes these decoratons from the window. This does not affect
+# the functions that can be performed via the menus.
+Style "*" MWMDecor
+
+# These are affect minor aspects for the look-and-feel.
+# Sub-menus placement mwm-style?
+#MWMMenus
+# mwm-style border reliefs (less deep than default fvwm) ?
+Style "*" MWMBorder
+# Maximize button does mwm-inversion thingy
+Style "*" MWMButtons
+######################################################################
+
+
+# Leave a band on the right alone?
+#EwmhBaseStruts 0 0 0 25
+#EWMHPlacementUseWorkingArea ?
+
+# I want to lower the main window but leave the small status window visible
+Style * !LowerTransient, RaiseTransient, !StackTransientParent
+
+
+######
+# Menu Settings.
+#
+#   * PopupOffset allows you to control where submenus will appear, and
+#       whether they should overlap or not.
+#   * This menu uses a translucent Colorset
+#   * The Menu will look flat, with a 2 pixel border.
+#   * I changed the default ItemFormat to be a little more spacious.
+MenuStyle * MenuFace
+MenuStyle * ActiveFore, HilightBack
+MenuStyle "*" PopupDelayed, PopupDelay 100, PopdownDelayed, PopdownDelay 200
+MenuStyle * Hilight3DThin, PopupOffset 0 100
+MenuStyle * PopupActiveArea 100
+MenuStyle * BorderWidth 2, TitleUnderlines1, SeparatorsLong, TrianglesSolid, Animation
+MenuStyle * ItemFormat "%.2|%.5i%.5l%.5i%2.3>%2|"
+MenuStyle * AutomaticHotKeys
+
+
+#####
+# Application specific Style settings
+#
+# You might be interested in the IconOverride style, which will allow you to specify
+# an Icon for an application even if it has set its own previously, This can be very
+# useful for applications that insist on setting their own icons even if it doesnt
+# fit in with your theme :)
+#
+# You can change most settings for specific applications, based on Name,
+# Class or Resource. you can also use wildcards, eg Style "Fvwm*" NoTitle.
+#################
+
+Style "Fvwm*"        NoTitle,NoHandles,Sticky,CirculateSkip
+Style "Fvwm*"        BorderWidth 0, WindowListSkip
+Style  FvwmCo*       Slippery
+Style  FvwmIdent*    Layer 6, WindowListHit ,NoButton 1,NoButton 2, NoButton 4, Title
+
+#Style  FvwmPager*    Layer 6 , NoButton 1 , NoButton 2 , TitleAtRight
+Style "FvwmPager"   WindowListSkip, BorderWidth 0, HandleWidth 0, ParentalRelativity, TitleAtRight
+
+Style "FvwmBanner"       StaysOnTop, FocusFollowsMouse, NoTitle,  Sticky, WindowListSkip
+Style "FvwmButtons"      BorderWidth 5
+Style "FvwmButtons"      WindowListSkip,MouseFocus,NoTitle,Sticky
+Style "FvwmButtonsPanel" NoTitle, FocusFollowsMouse, NoTitle,  Sticky, WindowListSkip
+Style  FvwmButton*       NoButton 1 , NoButton 2 , TitleAtRight
+Style FvwmTabs           Title
+
+Style FvwmButtons NeverFocus
+Style fvwm_menu ParentalRelativity
+
+Style FvwmShelf   NoTitle, StaysOnBottom, Sticky, WindowListSkip, CirculateSkipIcon, CirculateSkip
+Style FvwmShelf   HandleWidth 2, NeverFocus
+Style DeskControl NoTitle, NeverFocus, CirculateSkip, WindowListSkip, Sticky, StaysOnTop, Layer 7
+Style FvwmBar     NoTitle, WindowListSkip, CirculateSkip, Sticky, BorderWidth 1, NoHandles, StaysOnBottom
+Style FvwmBar     NeverFocus
+
+
+Style OpenOffice* GNOMEIgnoreHints
+Style OpenOffice* EWMHIgnoreStackingOrderHints
+Style OpenOffice* EWMHIgnoreStateHints
+Style OpenOffice* EWMHIgnoreStrutHints
+Style OpenOffice* NoPPosition
+Style OpenOffice* NoUsposition 
+Style OpenOffice* FixedPPosition
+
+Style  "Xwall"       	    NoIcon
+Style "*BBDB*"       	    NoIcon
+Style "*Calendar*"   	    NoIcon
+Style "*Compilation*"	    NoIcon
+Style "*Fancy Diary*"	    NoIcon
+Style "*Help*"       	    NoIcon
+Style "*Holidays*"   	    NoIcon
+Style "*PostScript File"        NoTitle
+Style "*TeX Shell*"  	    NoIcon
+Style "*compilation*"	    NoIcon
+Style "*grep*"       	    NoIcon
+Style "*lock"        	    CirculateSkip
+Style "*lock"        	    NoTitle, NoHandles, Sticky, WindowListSkip
+Style "*x-face*"     	    NoTitle,NoHandles,WindowListSkip
+Style "*xfaces*"     	    NoTitle,NoHandles,WindowListSkip
+Style "*xbiff"       	    CirculateSkip
+Style "*xbiff"       	    NoTitle,NoHandles,Sticky,WindowListSkip
+Style "-(Tek)"       	    NoIcon
+Style "Appointment"  	    NoButton 2, NoButton 4
+Style "Dali Clock"   	    NoTitle,Sticky,WindowListSkip,NoIcon,CirculateSkip
+Style "FRAMEPOP"     	    NoTitle,Sticky,WindowListSkip,CirculateSkip
+
+Style "FvwmButtons"  	    Sticky, NoTitle,NoHandles,CirculateSkip
+Style "Garbage"      	    Title, Handles
+Style "Help On PostScript"  NoTitle,NoIcon
+Style "Information"         NoTitle
+Style "Load Averages"       NoTitle,Sticky,WindowListSkip,CirculateSkip
+Style "Message"             NoTitle
+Style "Work1"               Sticky
+Style "XClock"              NoTitle
+Style "XPbiff"              NoTitle
+Style "dctrl"               NoIcon
+Style "Dctrl"               NoIcon
+Style kcalc                 NoFuncHint, NoDecorHint
+Style "pgp-pixie"           NoTitle
+Style "popup"               NoTitle
+Style "sunclock"            NoTitle,Sticky,WindowListSkip
+Style "window info"         NoTitle
+Style "wmbattery"           NoTitle,Sticky,WindowListSkip,CirculateSkip
+Style "work1"               Sticky
+Style "xcb"                 Sticky,WindowListSkip,CirculateSkip
+Style "xcd"                 NoTitle
+Style "xchat"	            Sticky
+Style "xclock"              NoTitle,Sticky,WindowListSkip
+Style "xconsole"	          Sticky,WindowListSkip,CirculateSkip
+Style "xload"               NoTitle,Sticky,WindowListSkip,NoIcon
+Style "xmoondial"           NoTitle
+Style "xmultibiff"          CirculateSkip
+Style "xmultibiff"          NoTitle,Sticky,StaysOnTop,WindowListSkip
+Style "xbuffy"              CirculateSkip
+Style "xbuffy"              NoTitle,Sticky,StaysOnTop,WindowListSkip
+Style "xticktalk"           NoTitle,Sticky,WindowListSkip,CirculateSkip
+Style "gkrellm"             Sticky, WindowListSkip,CirculateSkip, StaysOnBottom, NeverFocus
+
+Style XMMS* BorderWidth 0,Icon,GNOMEIgnoreHints
+Style XMMS* Sticky,NoTitle,StaysOnTop,NoHandles
+Style xmms          UseUSPosition, UsePPosition
+Style XTerm       MiniIcon computer_x11.png
+Style Eterm       MiniIcon computer_x11.png
+Style Emacs       TitleAtLeft, LeftTitleRotatedCCW
+Style xcalc       ClickToFocus
+Style xman        ClickToFocus, MiniIcon book_help_paper.png
+Style xmag        ClickToFocus, MiniIcon document_database_view.png
+Style Gkrellm2    Sticky, WindowListSkip, StaysOnBottom, NeverFocus
+Style opera       EWMHMiniIconOverride, MiniIcon opera.png
+Style XVroot      GrabFocus
+Style gmrun       MiniIcon gears.png, NoFuncHint, NoDecorHint
+Style FvwmIdent   MiniIcon label_tag_version.png
+Style Calculator  MiniIcon calculator.png
+Style gcalctool   EWMHMiniIconOverride,MiniIcon calculator.png
+Style beep-media-player MiniIcon audio_horn.png, UsePPosition
+Style xmessage    MiniIcon person_face_talking.png
+Style xchat-2     !FPFocusByProgram, NoFuncHint, NoDecorHint
+Style aterm       WindowShadeShrinks
+Style rxvt        WindowShadeShrinks
+Style Mulberry    MiniIcon mail.png
+Style Message     MiniIcon person_face_talking.png
+Style VMware      MiniIcon hardware_computers.png
+Style SDL_App     EWMHMiniIconOverride, MiniIcon games_jesters-cap.png
+Style XDosEmu     EWMHMiniIconOverride, MiniIcon games_jesters-cap.png
+Style FvwmScript-Quit MiniIcon plug.png
+Style pan         !FPFocusByProgram
+Style nautilus    EWMHMiniIconOverride, MiniIcon floppy_disk.png
+Style abiword     EWMHMiniIconOverride, MiniIcon document_letter_word-processor.png
+Style grip        EWMHMiniIconOverride, MiniIcon hardware_audio_cd.png
+Style xv          MiniIcon graphics_woman_panel.png
+Style xwrits      NoDecorHint, NoFuncHint
+Style gvim        EWMHMiniIconOverride, MiniIcon gvim.png
+Style Firefox-bin EWMHMiniIconOVerride, MiniIcon firefox.png
+Style HiddenConsole Sticky, WindowListSkip, Notitle, StaysOnTop, NoHandles
+Style HiddenConsole WindowShadeSteps 100, ResizeHintOverride
+Style gaim        EWMHMiniIconOverride, MiniIcon instant-messenger.png
+Style Ddd         MiniIcon audio_waveform_view.png
+Style Eboard      MiniIcon games_chess.png
+Style gimp        EWMHMiniIconOverride, MiniIcon graphics_paint_edit.png
+Style gimp-2.0    EWMHMiniIconOverride, MiniIcon graphics_paint_edit.png
+Style findtextdialog NoFuncHint, NoDecorHint
+Style fvwm_menu   MiniIcon gears.png, NoButton 4
+
+
+Style "login" HilightFore White 
+Style "login" HilightBack #9a5a9187d9da
+
+
+# FlickeringMoveWorkaround disables ConfigureNotify events that
+# are usually sent to an application while it is moved. If some
+# windows flicker annoyingly while being moved, this option may
+# help you. Note that if this problem occurs it is not an fvwm
+# bug, it is a problem of the application.
+
+BugOpts FlickeringMoveWorkaround True
+
+
+# TitleStyle RightJustified
+
+
+TitleStyle            Inactive Colorset 51 -- flat
+AddTitleStyle         Inactive Colorset 52 50     # alpha == 60% here
+
+ButtonStyle    All AllInactive Colorset 51 -- flat
+AddButtonStyle All AllInactive Colorset 52 50
+
+
+ButtonStyle    All AllInactive -- !UseTitleStyle flat
+TitleStyle              Active Colorset 52 -- raised
+
+ButtonStyle    All   AllActive --  UseTitleStyle raised
+
+
+BorderStyle                   -- UseTitleStyle
+
+
+AddToDecor login
+#+ TitleStyle TiledPixmap purple-marble.xpm
+#+ TitleStyle Inactive TiledPixmap teal.xpm
+#+ BorderStyle Active TiledPixmap purple-marble.xpm
+#+ BorderStyle Inactive TiledPixmap teal.xpm
++ ButtonStyle 1 5 25x75@0 75x75@0 75x25@0 25x25@1 25x75@1
++ ButtonStyle 3 5 25x60@0 75x60@0 75x40@0 25x40@1 25x60@1
++ ButtonStyle 4 5 50x20@1 20x45@1 50x80@1 80x45@0 50x20@0
++ ButtonStyle 2 4 50x65@1 35x35@1 65x35@1 50x65@0
++ AddButtonStyle All -- UseTitleStyle
++ TitleStyle RightJustified
+
+Style XTerm StickyIcon
+Style "xterm" HilightFore Black 
+#Style "xterm" HilightFore #99ffaa 
+Style "xterm" HilightBack #9a5a9187d9da
+
+AddToDecor xterm
+#+ TitleStyle TiledPixmap purple-marble.xpm
+#+ TitleStyle Inactive TiledPixmap grey-marble.xpm.xpm
+#+ BorderStyle Active TiledPixmap purple-marble.xpm
+#+ BorderStyle Inactive TiledPixmap grey-marble.xpm.xpm
++ ButtonStyle 1 5 25x75@0 75x75@0 75x25@0 25x25@1 25x75@1
++ ButtonStyle 3 5 25x60@0 75x60@0 75x40@0 25x40@1 25x60@1
++ ButtonStyle 4 5 50x20@1 20x45@1 50x80@1 80x45@0 50x20@0
++ ButtonStyle 2 4 50x65@1 35x35@1 65x35@1 50x65@0
++ AddButtonStyle All -- UseTitleStyle
++ TitleStyle RightJustified
+
+
+# Default
+#TitleStyle ActiveUp TiledPixmap purple-marble.xpm
+#TitleStyle ActiveDown TiledPixmap purple-marble.xpm
+#BorderStyle Active TiledPixmap purple-marble.xpm
+DestroyDecor recreate DecorBase
+AddToDecor DecorBase
++       TitleStyle      Centered
--- fvwm-2.5.18.orig/debian/manoj/FvwmForm-QuitVerify
+++ fvwm-2.5.18/debian/manoj/FvwmForm-QuitVerify
@@ -0,0 +1,13 @@
+DestroyModuleConfig  FvwmForm-QuitVerify: *
+*FvwmForm-QuitVerify: GrabServer
+*FvwmForm-QuitVerify: WarpPointer
+*FvwmForm-QuitVerify: Command     Beep
+*FvwmForm-QuitVerify: Line        center
+*FvwmForm-QuitVerify: Text        "Do you really want to logout?"
+*FvwmForm-QuitVerify: Line        expand
+*FvwmForm-QuitVerify: Button      quit "Logout" ^M
+*FvwmForm-QuitVerify: Command     Quit
+*FvwmForm-QuitVerify: Button      restart   "Restart" ^R
+*FvwmForm-QuitVerify: Command     Restart
+*FvwmForm-QuitVerify: Button      quit "Cancel" ^[
+*FvwmForm-QuitVerify: Command     Nop
--- fvwm-2.5.18.orig/debian/manoj/headlines
+++ fvwm-2.5.18/debian/manoj/headlines
@@ -0,0 +1,46 @@
+DestroyFunc FuncFvwmMenuHeadlines
+AddToFunc   FuncFvwmMenuHeadlines
++ I PipeRead "fvwm-menu-headlines --frontpage --wm-icons --site $0 --command='Exec mozilla -remote \"openURL(%u, new-tab)\"'"
+DestroyMenu MenuFvwmHeadlines
+AddToMenu   MenuFvwmHeadlines "Headlines" Title
++ MissingSubmenuFunction FuncFvwmMenuHeadlines
++ "FreshMeat"  Popup freshmeat
++ "LinuxToday" Popup linuxtoday
++ "Slashdot"   Popup slashdot
++ "LinuxApps"  Popup linuxapps
++ "DaemonNews" Popup daemonnews
+#+ "GNOME News" Popup gnome-news
+#+ "KDE News"   Popup kde-news
+#+ "RootPrompt" Popup rootprompt
++ "NewsForge"  Popup newsforge
++ "Kuro5hin"   Popup kuro5hin
++ "BBSpot"     Popup bbspot
+#+ "LinuxFr"    Popup linuxfr
++ "ThinkGeek"  Popup thinkgeek
++ "" Nop
++ "CNN"        Popup cnn
++ "BBC-World"  Popup bbc-world
+#+ "BBC-SciTech" Popup bbc-scitech
++ "" Nop
++ "" Nop
+#+ "Reset all"  FuncFvwmResetHeadlines
+
+DestroyFunc FuncFvwmResetHeadlines
+AddToFunc   FuncFvwmResetHeadlines
++ I DestroyMenu freshmeat
++ I DestroyMenu linuxtoday
++ I DestroyMenu slashdot
++ I DestroyMenu linuxapps
++ I DestroyMenu daemonnews
++ I DestroyMenu gnome-news
++ I DestroyMenu kde-news
++ I DestroyMenu rootprompt
++ I DestroyMenu newsforge
++ I DestroyMenu kuro5hin
++ I DestroyMenu bbspot
++ I DestroyMenu linuxfr
++ I DestroyMenu thinkgeek
++ I DestroyMenu cnn
++ I DestroyMenu bbc-world
++ I DestroyMenu bbc-scitech
+
--- fvwm-2.5.18.orig/debian/manoj/binding.hook
+++ fvwm-2.5.18/debian/manoj/binding.hook
@@ -0,0 +1,406 @@
+#=====================================================  C. mouse bindings
+#   C. This defines the mouse bindings
+
+# First, for the mouse in the root window
+# Button 1 gives the Utilities menu
+# Button 2 gives the Window-Ops menu
+# Button 3 gives the WindowList (like TwmWindows)
+# I use the AnyModifier (A) option for the modifier field, so you can hold down
+# any shift-control-whatever combination you want!
+
+#     Button    Context Modifi  Function
+Mouse 3         RD       N       Menu "Utilities" Nop
+Mouse 2         RD       N       Menu "Window-Ops" Nop
+Mouse 1         RD       N       Function "general_ops_func" 
+Mouse 3         FIST   CM      Menu "Utilities" Nop
+Mouse 2         FIST   CM      Menu "Window-Ops" Nop
+Mouse 1         FIST   CM      Function "general_ops_func" 
+
+# To obtain the gnome menu with Alt-button1 on the root window
+Mouse 1  RD  M  SendToModule FvwmGtk gnome-all
+
+
+#
+# Now the title bar buttons
+# Any button in the left title-bar button gives the window ops menu
+# Any button in the right title-bar button Iconifies the window
+# Any button in the rightmost title-bar button maximizes
+# Note the use of "Mouse 0" for AnyButton.
+# The title bar buttons are numbered with odd numbered buttons on the
+# left side of the title bar and even numbers on the right. Smaller-
+# numbered buttons are displayed toward the outside of the window while
+# larger-numbered buttons appear toward the middle of the window (0 is
+# short for 10). In summary, the buttons are numbered:
+#
+#      1 3 5 7 9    0 8 6 4 2
+
+
+
+#left side
+#     Button    Context Modifi  Function
+Mouse 0         1       A       Function "window_ops_func"
+Mouse 0         3       A       Function "max_vert_func"
+Mouse 0         5       A       Function "max_hor_func"
+Mouse 0         7       A       Function "max_diag_func"
+Mouse 0         9       A       Function FuncFvwmMaximizeFullScreen
+#Mouse 0         9       A       Resize
+
+#right side
+#     Button    Context Modifi  Function
+Mouse 0         2       A       Close
+Mouse 0         4       A       IconifyWithScreenshot
+Mouse 0         6       A       Function "Move-or-Lower"
+Mouse 0         8       A       Function "funky_cancel"
+Mouse 0         0       A       Stick
+
+# Now the rest of the frame
+# Here I invoke my complex functions for Move-or-lower, Move-or-raise,
+# and Resize-or-Raise. 
+# Button 1 in the side, or corner pieces, with any modifiers, gives
+# resize or raise 
+Mouse 1         FS      A       Function "Resize-or-Raise"
+# Button 1 in the title, w/ any modifiers, gives move or raise
+Mouse 1         T       A       Function "Move-or-Raise"
+#Mouse 1         T       M       Function move_noresist
+
+# Button 1 in an icons gives move for a drag, de-iconify for a
+#          double-click, nothing for a single click
+# Button 2 in an icon, w/ any modifiers, gives de-iconify
+
+Mouse 1         I       A       Function "Move-or-Iconify"
+Mouse 2         I       A       Iconify
+
+# Button 2 in the corners, sides, or title-bar gives the window ops
+# menu 
+Mouse 2         F       A       Function "window_ops_func"
+Mouse 2         TS      A       Function "Move-or-Iconify"
+# Button 3 anywhere in the decoration (except the title-bar buttons)
+# does a raise-lower
+Mouse 3         IF      A       RaiseLower
+Mouse 3         TS      A       Function "Move-or-Raise"
+
+# Button 3 in the window, with the Modifier-1 key (usually alt or
+# diamond) gives Raise-Lower. Used to use control here, but that
+# interferes with xterm 
+#Mouse 3         W       M       RaiseLower
+
+#=====================================================  D. key bindings
+#   D. key bindings
+
+# Arrow Keys
+# press arrow + control anywhere, and scroll by 1 page
+Key Left        FIRST   C       Scroll -100000  0
+Key Right       FIRST   C       Scroll +100000 +0
+Key Up          FIRST   C       Scroll +0      -100000
+Key Down        FIRST   C       Scroll +0      +100000
+# Also for the Mouse wheel
+#Mouse 4         RD       A       Scroll +0      -100000
+#Mouse 5         RD       A       Scroll +0      +100000
+# Alternately, use the mouse wheel to set volumes:
+Mouse    4       RD       A       Exec aumix -v+5 -w+5
+Mouse    5       RD       A       Exec aumix -v-5 -w-5
+# With Control. move desks
+Mouse	4       RD       C	      GotoDesk -1
+Mouse	5       RD       C	      GotoDesk +1
+
+
+
+# press arrow + Alt anywhere
+#                              Move window 5% to the left
+Key Left        FIST   M       Move w-5 0 Warp
+#                              Move window 5% to the right
+Key Right       FIST   M       Move w+5 0 Warp
+#                              Move window 5% to the top
+Key Up          FIST   M       Move 0 w-5 Warp
+#                              Move window 5% to the bottom
+Key Down        FIST   M       Move 0 w+5 Warp
+
+# directing a window to move in a given direction (Up, Down, Left,
+# Right) until it hits something; eg a screen edge or another window.
+Key Down        WTF    SM      PackWrapperDown
+Key Up          WTF    SM      PackWrapperUp
+
+Key 5        FIST   M         Move m+0 m+0 Warp
+Key 1        FIST   M         Move  0 -0 Warp
+Key 2        FIST   M         Move 50 -0 Warp
+Key 3        FIST   M         Move -0 -0 Warp
+Key 4        FIST   M         Move -0 50 Warp
+Key 6        FIST   M         Move  0 50 Warp
+Key 7        FIST   M         Move  0 -0 Warp
+Key 8        FIST   M         Move 50  0 Warp
+Key 9        FIST   M         Move -0  0 Warp
+
+# press arrow on root, and scroll by 1 page
+Key Left        RD       AN      Scroll -100000 0
+Key Right       RD       AN      Scroll +100000 +0
+Key Up          RD       AN      Scroll +0   -100000
+Key Down        RD       AN      Scroll +0   +100000
+
+# press arrow + meta key, and scroll by 1/10 of a page
+Key Left        FIRST   S       Scroll -10000 +0
+Key Right       FIRST   S       Scroll +10000 +0
+Key Up          FIRST   S       Scroll +0   -10000
+Key Down        FIRST   S       Scroll +0   +10000
+
+# press shift arrow + control anywhere, and move the pointer by 1% of a page
+Key Left        FIRST   SC  CursorMove -1 0
+Key Right       FIRST   SC  CursorMove +1 +0
+Key Up          FIRST   SC  CursorMove +0   -1
+Key Down        FIRST   SC  CursorMove +0   +1
+Key Left        FIRST   MS  CursorMove -5  0
+Key Right       FIRST   MS  CursorMove +5  0
+Key Up          FIRST   MS  CursorMove +0  -5
+Key Down        FIRST   MS  CursorMove +0  +5  
+
+# Keyboard accelerators
+Key F1          FIRST   S       Popup "Utilities"
+Key F2          FIRST   S       Popup "Window-Ops"
+Key F3          FIRST   S       Module FvwmWinList 
+Key F4          FIRST   S       Iconify
+Key F5          FIRST   S       Move
+Key F6          FIRST   S       Resize
+Key F7          FIRST   S       CirculateUp
+Key F8          FIRST   S       CirculateDown
+# Alt+Fx takes us to various pages
+Key F1  	       A       M 	     GotoDeskAndPage 0 0 0
+Key F2  	       A       M 	     GotoDeskAndPage 0 1 0
+Key F3  	       A       M 	     GotoDeskAndPage 0 2 0
+Key F4  	       A       M 	     GotoDeskAndPage 0 3 0
+Key F5  	       A       M 	     GotoDeskAndPage 1 0 0
+Key F6  	       A       M 	     GotoDeskAndPage 1 1 0
+Key F7  	       A       M 	     GotoDeskAndPage 1 2 0
+Key F8  	       A       M 	     GotoDeskAndPage 1 3 0
+Key F9  	       A       M 	     GotoDeskAndPage 2 0 0
+Key F10 	       A       M 	     GotoDeskAndPage 2 1 0
+Key F11 	       A       M 	     GotoDeskAndPage 2 2 0
+Key F12 	       A       M 	     GotoDeskAndPage 2 3 0
+
+# move to page, Shift+Ctrl+KP_N  
+Key KP_1        A       SC      MoveToPage 0 2
+Key KP_2        A       SC      MoveToPage 1 2
+Key KP_3        A       SC      MoveToPage 2 2
+Key KP_4        A       SC      MoveToPage 0 1
+Key KP_5        A       SC      MoveToPage 1 1
+Key KP_6        A       SC      MoveToPage 2 1
+Key KP_7        A       SC      MoveToPage 0 0
+Key KP_8        A       SC      MoveToPage 1 0
+Key KP_9        A       SC      MoveToPage 2 0
+Key KP_0        A       SC      MoveToPage prev
+
+# move to desk, Shift+Ctrl+N
+Key 1           A       SC      MoveToDesk 0 0
+Key 2           A       SC      MoveToDesk 0 1
+Key 3           A       SC      MoveToDesk 0 2
+Key 4           A       SC      MoveToDesk 0 3
+Key 0           A       SC      MoveToDesk prev
+
+
+
+#Page Up/Dapge Down keys are used to scroll by one desktop page
+# in any context, press page up/down + control
+# in root context, just pressing page up/down is OK
+# 
+# I prefer the wrapping scroll.
+Key Next        RD       N       Scroll 100000 0  
+Key Prior       RD       N       Scroll -100000 0
+
+# non-iconified windows on the current page of the current desk
+Key Next        RD   S       Next [!iconic CurrentScreen CurrentDesk] focus-and-raise
+Key Prior       RD   S       Prev [!iconic CurrentScreen CurrentDesk] focus-and-raise
+
+# non-iconified windows on the current desk
+Key Next        RD   M       Next [!iconic CurrentDesk] focus-and-raise
+Key Prior       RD   M       Prev [!iconic CurrentDesk] focus-and-raise
+
+# non-iconified windows
+Key Next        RD   C       Next [!iconic] focus-and-raise
+Key Prior       RD   C       Prev [!iconic] focus-and-raise
+
+# any window or icon on the current page of the current desk,
+# including those otherwise skipped
+Key Next        RD   MC Next [CurrentScreen CurrentDesk CirculateHit] focus-and-raise
+Key Prior       RD   MC Prev [CurrentScreen CurrentDesk CirculateHit] focus-and-raise
+
+# any window or icon on the current desk including those otherwise
+# skipped
+Key Next        RD   MS      Next [CurrentDesk CirculateHit] focus-and-raise
+Key Prior       RD   MS      Prev [CurrentDesk CirculateHit] focus-and-raise
+
+# any window or icon including those otherwise skipped
+Key Next        RD   CS      Next [CirculateHit *] focus-and-raise
+Key Prior       RD   CS      Prev [CirculateHit *] focus-and-raise
+
+Key q   FIRST   M       Popup "Quit-Verify"          
+Key w   FIRST   M       Popup "Window-Ops"           
+Key g   FIRST   M       Popup "General"              
+Key m   FIRST   M       Popup "Mod-Popup"         
+Key u   FIRST   M       Popup "Utilities"            
+
+Key e   FIST    M       Popup "General"              
+Key r   FIRST   M       Popup "Mod-Popup"         
+Key t   FIRST   M       Popup "Utilities"            
+
+
+####
+# Mouse Gestures.
+#
+# Syntax reminder:
+#
+#   1   2   3
+#
+#   4   5   6
+#
+#   7   8   9
+#
+# Stroke Sequence Button Context Modifiers Function
+#
+# I use mouse gestures in Opera and Mozilla, so I've duplicated some
+# common ones here.
+#
+# To try these out, hold down the Left mouse button and trace the
+# pattern on the Root Window, the sequence is a pattern on the grid
+# above, so 14789 would be down then Right.
+#################
+####
+# First, define a StrokeFunc.
+#
+# Without this, you would have to execute all of your gestures
+# entirely on the Root Window, This lets you change the Context and
+# have a few other Neat Features, such as DrawMotion, which will draw
+# a line as you make your Gesture (Neat!).
+#
+# There is also EchoSequence, Feedback and NotStayPressed.
+#
+# Note: EchoSequence prints sequences to STDERR.
+#################
+# mouse 3 with Control on the root window
+Mouse 3 RD  C     StrokeFunc DrawMotion FeedBack StrokeWidth 2
+# mouse 3 with Alt on a window
+Mouse 3 WD M     StrokeFunc FeedBack DrawMotion StrokeWidth 2
+
+Stroke  0     0  RD  A   Exec xmessage "Just click mouse 3 on the root"
+# Down, Then Up.
+Stroke 25852 0 RD A  Refresh
+
+# Directions...
+Stroke 456 0 RD A    GotoPage +1p 0p
+Stroke 654 0 RD A    GotoPage -1p 0p
+Stroke 852 0 RD A    GotoPage 0p -1p
+Stroke 258 0 RD A    GotoPage 0p +1p
+
+# Diagonal...
+Stroke 159 0 RD A    GotoPage +1p +1p
+Stroke 951 0 RD A    GotoPage -1p -1p
+Stroke 357 0 RD A    GotoPage -1p +1p
+Stroke 753 0 RD A    GotoPage +1p -1p
+
+#####
+# Quit
+#
+# Down, Then Right.
+#
+# Dont worry about running this gesture by accident,
+# you will be asked to confirm
+#################
+Stroke 14789 0 RD A  Module FvwmForm FvwmForm-QuitVerify
+
+####
+# Up, Then Down