summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/xcalc/ChangeLog72
-rw-r--r--app/xcalc/Makefile.in7
-rw-r--r--app/xcalc/README.md2
-rw-r--r--app/xcalc/aclocal.m416
-rw-r--r--app/xcalc/actions.c2
-rw-r--r--app/xcalc/compile17
-rw-r--r--app/xcalc/configure50
-rw-r--r--app/xcalc/configure.ac4
-rw-r--r--app/xcalc/man/Makefile.in1
-rw-r--r--app/xcalc/man/xcalc.man4
10 files changed, 123 insertions, 52 deletions
diff --git a/app/xcalc/ChangeLog b/app/xcalc/ChangeLog
index b347b90a5..c2278ff95 100644
--- a/app/xcalc/ChangeLog
+++ b/app/xcalc/ChangeLog
@@ -1,3 +1,63 @@
+commit dfbeedae7eefa1605ed2f912beb0de31810ec63f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Apr 3 10:33:30 2022 -0700
+
+ xcalc 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d484e053d54801f1afdcc67ef7651d048df97295
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Apr 2 13:01:49 2022 -0700
+
+ man page: remove out-of-date COPYRIGHT section
+
+ The information previously listed here didn't match what is present in
+ the source code or the COPYING file, and the X(7) man page doesn't list
+ any license information as this had claimed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7889111d9809af38a2cfb8c1ead1931c1f593be8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 10:42:03 2021 -0800
+
+ Build xz tarballs instead of bzip2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 242bcecfbb662a1c57f3d8d505492be2b6db89a2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 10:42:00 2021 -0800
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b7886c8da2a3d8a92dea43828202d1762898041b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 28 11:42:06 2021 -0800
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19eb8cefe1c3f7b5018e51d3dd5cc4bf691a553d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 17 17:02:35 2021 -0700
+
+ TI mode: correct key color highlighting
+
+ Decimal number key mapping in XCalc-color was offset after adding
+ the bitwise ops & base conversion keys in commit c4f1bdb1
+
+ Fixes: #2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit df1721c44e0b357f4d8ae80247861b4a6f7a7bbb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jun 9 13:44:24 2019 -0700
@@ -90,7 +150,7 @@ Date: Sun Feb 17 13:50:58 2019 -0800
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 85c9feb6e10cea1ef017d702151b14717c40b9d5
-Author: Stéphane Aulery <lkppo@free.fr>
+Author: Stéphane Aulery <lkppo@free.fr>
Date: Sun Jul 7 22:50:30 2013 +0200
Reduce scope of i (cppcheck --verbose --enable=all)
@@ -100,7 +160,7 @@ Date: Sun Jul 7 22:50:30 2013 +0200
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit aa3d39389bfc752486a83933574d0365c74d4e29
-Author: Stéphane Aulery <lkppo@free.fr>
+Author: Stéphane Aulery <lkppo@free.fr>
Date: Sun Jul 7 22:50:29 2013 +0200
Reduce scope of cell (cppcheck --verbose --enable=all)
@@ -315,7 +375,7 @@ Date: Sat Jul 6 20:45:40 2013 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3e6d23bb9d57ae3d19e9eb47ced654669fca4d7c
-Author: Stéphane Aulery <lkppo@free.fr>
+Author: Stéphane Aulery <lkppo@free.fr>
Date: Sun Jul 7 02:02:46 2013 +0200
Use the new M_E symbol from math.h
@@ -328,7 +388,7 @@ Date: Sun Jul 7 02:02:46 2013 +0200
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f3b065f03a7b68310b489d5d97b11985ef36e977
-Author: Stéphane Aulery <lkppo@free.fr>
+Author: Stéphane Aulery <lkppo@free.fr>
Date: Sun Jul 7 02:02:38 2013 +0200
Use the new M_PI symbol from math.h
@@ -341,7 +401,7 @@ Date: Sun Jul 7 02:02:38 2013 +0200
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b9a89876666a42ad8692e8384a5a826456e6ae56
-Author: Stéphane Aulery <lkppo@free.fr>
+Author: Stéphane Aulery <lkppo@free.fr>
Date: Sat Jul 6 15:39:07 2013 +0200
Drop CRAY support
@@ -830,7 +890,7 @@ Date: Sun Jul 17 20:11:02 2005 +0000
fix rules to work with non-GNU make and outside of $srcdir
commit 392f5dd1907a5110c89b308ef51122b39b23dde5
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jun 29 23:12:07 2005 +0000
Build system for Xcalc
diff --git a/app/xcalc/Makefile.in b/app/xcalc/Makefile.in
index da6c85b64..2398f2ab4 100644
--- a/app/xcalc/Makefile.in
+++ b/app/xcalc/Makefile.in
@@ -209,9 +209,9 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -332,6 +332,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -707,6 +708,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@@ -714,7 +716,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
diff --git a/app/xcalc/README.md b/app/xcalc/README.md
index 1681453df..0f008affd 100644
--- a/app/xcalc/README.md
+++ b/app/xcalc/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/app/xcalc
diff --git a/app/xcalc/aclocal.m4 b/app/xcalc/aclocal.m4
index 2a518c4b6..d0a818e1e 100644
--- a/app/xcalc/aclocal.m4
+++ b/app/xcalc/aclocal.m4
@@ -19,9 +19,9 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
@@ -62,7 +62,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -194,7 +194,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
diff --git a/app/xcalc/actions.c b/app/xcalc/actions.c
index 6b454dae3..cd38314af 100644
--- a/app/xcalc/actions.c
+++ b/app/xcalc/actions.c
@@ -136,7 +136,7 @@ XtActionsRec Actions[] = {
{"reciprocal", reciprocal}, /* reciprocal function */
{"rightParen", rightParen}, /* TI-specific left parenthesis */
{"roll", roll}, /* HP-specific roll stack */
-{"scientific", scientific}, /* scientfic notation (EE) */
+{"scientific", scientific}, /* scientific notation (EE) */
{"selection", selection}, /* copy selection */
{"shl", shl}, /* arithmetic shift left */
{"shr", shr}, /* arithmetic shift right */
diff --git a/app/xcalc/compile b/app/xcalc/compile
index a85b723c7..df363c8fb 100644
--- a/app/xcalc/compile
+++ b/app/xcalc/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# 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, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/app/xcalc/configure b/app/xcalc/configure
index 798d121c7..afb9829ed 100644
--- a/app/xcalc/configure
+++ b/app/xcalc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xcalc 1.1.0.
+# Generated by GNU Autoconf 2.69 for xcalc 1.1.1.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcalc/issues>.
#
@@ -581,8 +581,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xcalc'
PACKAGE_TARNAME='xcalc'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xcalc 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xcalc 1.1.1'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xcalc/issues'
PACKAGE_URL=''
@@ -732,6 +732,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -815,6 +816,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1067,6 +1069,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1204,7 +1215,7 @@ fi
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
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1317,7 +1328,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 xcalc 1.1.0 to adapt to many kinds of systems.
+\`configure' configures xcalc 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,6 +1368,7 @@ Fine tuning of the installation directories:
--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]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1387,7 +1399,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xcalc 1.1.0:";;
+ short | recursive ) echo "Configuration of xcalc 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1506,7 +1518,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xcalc configure 1.1.0
+xcalc configure 1.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1830,7 +1842,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 xcalc $as_me 1.1.0, which was
+It was created by xcalc $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2659,7 +2671,7 @@ fi
# Define the identity of the package.
PACKAGE='xcalc'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -10496,8 +10508,8 @@ done
# Checks for pkg-config packages
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCALC" >&5
-$as_echo_n "checking for XCALC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw7 xt x11 xproto >= 7.0.17" >&5
+$as_echo_n "checking for xaw7 xt x11 xproto >= 7.0.17... " >&6; }
if test -n "$XCALC_CFLAGS"; then
pkg_cv_XCALC_CFLAGS="$XCALC_CFLAGS"
@@ -10537,7 +10549,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10564,7 +10576,7 @@ Alternatively, you may set the environment variables XCALC_CFLAGS
and XCALC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -10588,8 +10600,8 @@ fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPDEFS" >&5
-$as_echo_n "checking for APPDEFS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xt" >&5
+$as_echo_n "checking for xt... " >&6; }
if test -n "$APPDEFS_CFLAGS"; then
pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS"
@@ -10629,7 +10641,7 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -10656,7 +10668,7 @@ Alternatively, you may set the environment variables APPDEFS_CFLAGS
and APPDEFS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -11225,7 +11237,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 xcalc $as_me 1.1.0, which was
+This file was extended by xcalc $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11291,7 +11303,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xcalc config.status 1.1.0
+xcalc config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/app/xcalc/configure.ac b/app/xcalc/configure.ac
index c586b0acc..9eab2a2ad 100644
--- a/app/xcalc/configure.ac
+++ b/app/xcalc/configure.ac
@@ -23,13 +23,13 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xcalc], [1.1.0],
+AC_INIT([xcalc], [1.1.1],
[https://gitlab.freedesktop.org/xorg/app/xcalc/issues], [xcalc])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
diff --git a/app/xcalc/man/Makefile.in b/app/xcalc/man/Makefile.in
index 00fb8b358..fc02c3db3 100644
--- a/app/xcalc/man/Makefile.in
+++ b/app/xcalc/man/Makefile.in
@@ -225,6 +225,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/app/xcalc/man/xcalc.man b/app/xcalc/man/xcalc.man
index 8ffe0adff..8e58d01df 100644
--- a/app/xcalc/man/xcalc.man
+++ b/app/xcalc/man/xcalc.man
@@ -470,10 +470,6 @@ X(__miscmansuffix__), xrdb(__appmansuffix__), the Athena Widget Set
.PP
HP mode is not completely debugged. In particular, the stack is
not handled properly after errors.
-.SH COPYRIGHT
-Copyright 1994 X Consortium
-.br
-See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
.SH AUTHORS
John Bradley, University of Pennsylvania
.br
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 00:34:49 +0000