Release 6.24.12

Fixes

@@ -1,3 +1,5 @@
+ 33. V6.24.12 - 2024-04-05
+ 32. Fix history merge and add a test for it (Werner Fink, Kimmo Suominen)
  31. V6.24.11 - 2024-03-14
  30. Make nice priority incremental even with setpriority(2) to match
      how it worked with nice(3) (Kimmo Suominen)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for Tcsh 6.24.11.
+# Generated by GNU Autoconf 2.72 for Tcsh 6.24.12.
 #
 # Report bugs to <https://bugs.astron.com/>.
 #
@@ -604,8 +604,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Tcsh'
 PACKAGE_TARNAME='tcsh'
-PACKAGE_VERSION='6.24.11'
-PACKAGE_STRING='Tcsh 6.24.11'
+PACKAGE_VERSION='6.24.12'
+PACKAGE_STRING='Tcsh 6.24.12'
 PACKAGE_BUGREPORT='https://bugs.astron.com/'
 PACKAGE_URL='https://www.tcsh.org/'
 
@@ -1286,7 +1286,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures Tcsh 6.24.11 to adapt to many kinds of systems.
+'configure' configures Tcsh 6.24.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1352,7 +1352,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Tcsh 6.24.11:";;
+     short | recursive ) echo "Configuration of Tcsh 6.24.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1450,7 +1450,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Tcsh configure 6.24.11
+Tcsh configure 6.24.12
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2187,7 +2187,7 @@ 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 Tcsh $as_me 6.24.11, which was
+It was created by Tcsh $as_me 6.24.12, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2961,7 +2961,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-PACKAGE_DATE=2024-03-14
+PACKAGE_DATE=2024-04-05
 
 PACKAGE_ORIGIN=Astron
 
@@ -9516,7 +9516,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Tcsh $as_me 6.24.11, which was
+This file was extended by Tcsh $as_me 6.24.12, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9585,7 +9585,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Tcsh config.status 6.24.11
+Tcsh config.status 6.24.12
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -10,8 +10,8 @@ dnl Written by Kaveh Ghazi ([email protected]) 5/11/96.
 dnl
 dnl UPDATE THIS SECTION FOR RELEASE
 dnl
-AC_DEFUN([TCSH_VERSION], [6.24.11])
-AC_DEFUN([TCSH_DATE],    [2024-03-14])
+AC_DEFUN([TCSH_VERSION], [6.24.12])
+AC_DEFUN([TCSH_DATE],    [2024-04-05])
 
 AC_PREREQ([2.69])dnl Minimum Autoconf version required.
 AC_INIT([Tcsh],TCSH_VERSION,[https://bugs.astron.com/],,[https://www.tcsh.org/])

debian/changelog

@@ -1,11 +1,11 @@
-tcsh (6.24.11) unstable; urgency=medium
+tcsh (6.24.12) unstable; urgency=medium
 
-  * Release 6.24.11
+  * Release 6.24.12
   * Please look in the Fixes file for an actual changelog
   * In packaging tcsh:
     - Avoid non-default settings in system-wide init files.
     - Use https://salsa.debian.org/debian/tcsh/debian resources
       to maintain compatibility with older versions packaged by
       Debian.
 
- -- The Tcsh Team <[email protected]>  Thu, 14 Mar 2024 00:00:00 +0000
+ -- The Tcsh Team <[email protected]>  Fri, 05 Apr 2024 00:00:00 +0000