Merge branch 'master' into build/work000 r69342 #158

source/ChangeLog

@@ -1,3 +1,7 @@
+2023-12-31  Karl Berry  <[email protected]>
+
+	* reautoconf: add -f / --force option to pass to autoreconf.
+
 2023-12-26  Karl Berry  <[email protected]>
 
 	* reautoconf: don't bother with environment variables;

source/configure

@@ -1662,7 +1662,7 @@ Optional Features:
   --disable-etex-synctex      build e-TeX without SyncTeX support
   --enable-ptex             compile and install pTeX
   --disable-ptex-synctex      build pTeX without SyncTeX support
-  --disable-eptex           do not compile and install e-pTeX
+  --enable-eptex            compile and install e-pTeX
   --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
   --disable-uptex-synctex     build upTeX without SyncTeX support
@@ -5504,7 +5504,7 @@ case $enable_eptex in #(
   yes | no) :
      ;; #(
   *) :
-    enable_eptex=yes ;;
+    enable_eptex=no ;;
 esac
 
 # Check whether --enable-eptex-synctex was given.

source/libs/README

@@ -31,7 +31,7 @@ harfbuzz 8.3.0 - checked 12nov23
 icu 74.2 - checked 22dec23
   https://github.com/unicode-org/icu/releases/
 
-libpaper 1.1.28 - checked 10sep22
+libpaper 1.1.29 - checked 07jan24
   http://ftp.debian.org/debian/pool/main/libp/libpaper/
 
 libpng 1.6.40 - checked 22jun23

source/libs/configure

@@ -1550,7 +1550,7 @@ Optional Features:
   --disable-etex-synctex      build e-TeX without SyncTeX support
   --enable-ptex             compile and install pTeX
   --disable-ptex-synctex      build pTeX without SyncTeX support
-  --disable-eptex           do not compile and install e-pTeX
+  --enable-eptex            compile and install e-pTeX
   --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
   --disable-uptex-synctex     build upTeX without SyncTeX support
@@ -4552,7 +4552,7 @@ case $enable_eptex in #(
   yes | no) :
      ;; #(
   *) :
-    enable_eptex=yes ;;
+    enable_eptex=no ;;
 esac
 
 # Check whether --enable-eptex-synctex was given.

source/libs/libpaper/ChangeLog

@@ -1,6 +1,12 @@
+2024-01-07  Hironobu Yamashita  <[email protected]>
+
+	* Import libpaper-1.1.29 from debian.
+	version.ac: Adapted.
+
 2022-09-10  Hironobu Yamashita  <[email protected]>
 
 	* Import libpaper-1.1.28 from debian.
+	version.ac: Adapted.
 
 2021-07-25  TANAKA Takuji  <[email protected]>
 

source/libs/libpaper/TLpatches/ChangeLog

@@ -1,3 +1,8 @@
+2024-01-07  Hironobu Yamashita  <[email protected]>
+
+	* Import libpaper-1.1.29 from debian.
+	* Patches adapted.
+
 2022-09-10  Hironobu Yamashita  <[email protected]>
 
 	* Import libpaper-1.1.28 from debian.

source/libs/libpaper/TLpatches/TL-Changes

@@ -1,25 +1,9 @@
-Changes applied to libpaper_1.1.28.tar.gz as obtained from:
+Changes applied to libpaper_1.1.29.tar.gz as obtained from:
 	http://ftp.debian.org/debian/pool/main/libp/libpaper/
 
 Renamed and reserved:
 	debian/changelog -> changelog.debian
 
-Removed unused files:
-	Makefile.in
-	aclocal.m4
-	compile
-	config.guess
-	config.sub
-	configure
-	depcomp
-	install-sh
-	ltmain.sh
-	missing
-	mkinstalldirs
-	lib/Makefile.in
-	man/Makefile.in
-	src/Makefile.in
-
 Removed empty files:
 	AUTHORS
 	NEWS

source/libs/libpaper/TLpatches/patch-01-JIS

@@ -1,6 +1,6 @@
-diff -ur libpaper-1.1.28.orig/lib/paperspecs libpaper-1.1.28/lib/paperspecs
---- libpaper-1.1.28.orig/lib/paperspecs	2016-07-16 23:10:58.000000000 +0900
-+++ libpaper-1.1.28/lib/paperspecs	2022-09-10 19:05:40.000000000 +0900
+diff -ur libpaper-1.1.29/lib/paperspecs libpaper-src/lib/paperspecs
+--- libpaper-1.1.29/lib/paperspecs	2016-07-16 23:10:58.000000000 +0900
++++ libpaper-src/lib/paperspecs	2024-01-07 11:30:24.000000000 +0900
 @@ -40,6 +40,18 @@
  c6 114 162 mm
  c7 81 114 mm
@@ -20,9 +20,9 @@ diff -ur libpaper-1.1.28.orig/lib/paperspecs libpaper-1.1.28/lib/paperspecs
  DL 110 220 mm
  Comm10 297 684
  Monarch 279 540
-diff -ur libpaper-1.1.28.orig/lib/paperspecs.h libpaper-1.1.28/lib/paperspecs.h
---- libpaper-1.1.28.orig/lib/paperspecs.h	2016-07-17 05:21:02.000000000 +0900
-+++ libpaper-1.1.28/lib/paperspecs.h	2022-09-10 19:05:40.000000000 +0900
+diff -ur libpaper-1.1.29/lib/paperspecs.h libpaper-src/lib/paperspecs.h
+--- libpaper-1.1.29/lib/paperspecs.h	2016-07-17 05:21:02.000000000 +0900
++++ libpaper-src/lib/paperspecs.h	2024-01-07 11:30:24.000000000 +0900
 @@ -43,6 +43,18 @@
      { "c6", 323.149606, 459.212598 },
      { "c7", 229.606299, 323.149606 },

source/libs/libpaper/TLpatches/patch-02-TL

@@ -1,6 +1,6 @@
-diff -ur libpaper-1.1.28.orig/lib/paper.c libpaper-1.1.28/lib/paper.c
---- libpaper-1.1.28.orig/lib/paper.c	2018-12-03 06:15:41.000000000 +0900
-+++ libpaper-1.1.28/lib/paper.c	2022-09-10 19:13:15.000000000 +0900
+diff -ur libpaper-1.1.29/lib/paper.c libpaper-src/lib/paper.c
+--- libpaper-1.1.29/lib/paper.c	2018-12-03 06:15:41.000000000 +0900
++++ libpaper-src/lib/paper.c	2024-01-07 11:32:25.000000000 +0900
 @@ -87,24 +87,11 @@
  }
 
@@ -121,10 +121,9 @@ diff -ur libpaper-1.1.28.orig/lib/paper.c libpaper-1.1.28/lib/paper.c
      paperdef = defaultpapername();
      paperstr = malloc((strlen(paperdef) + 1) * sizeof(char));
 
-Only in libpaper-1.1.28/lib: paper.c.orig
-diff -ur libpaper-1.1.28.orig/man/paperconf.1.in libpaper-1.1.28/man/paperconf.1.in
---- libpaper-1.1.28.orig/man/paperconf.1.in	2012-05-04 04:05:12.000000000 +0900
-+++ libpaper-1.1.28/man/paperconf.1.in	2022-09-10 19:09:11.000000000 +0900
+diff -ur libpaper-1.1.29/man/paperconf.1.in libpaper-src/man/paperconf.1.in
+--- libpaper-1.1.29/man/paperconf.1.in	2023-03-17 22:35:38.000000000 +0900
++++ libpaper-src/man/paperconf.1.in	2024-01-07 11:36:12.000000000 +0900
 @@ -1,4 +1,4 @@
 -.TH PAPERCONF 1 "24 April 2001"
 +.TH PAPERCONF 1 "25 October 2013"
@@ -150,13 +149,13 @@ diff -ur libpaper-1.1.28.orig/man/paperconf.1.in libpaper-1.1.28/man/paperconf.1
  .TP
 @@ -98,21 +95,9 @@
  .SH ENVIRONMENT
- .TP 20            
+ .TP 20
  .B @PAPERSIZEVAR@
 -Paper size to use regardless of what the papersize file contains.
 -.TP 20
 -.B @PAPERCONFVAR@
 -Full path to a file containing the paper size to use.
--.SH FILES         
+-.SH FILES
 -.TP 20
 -.B @PAPERCONF@
 -Contains the name of the system-wide default paper size to be used

source/libs/libpaper/TLpatches/patch-03-getopt

@@ -1,6 +1,6 @@
-diff -ur libpaper-1.1.28.orig/man/paperconf.1.in libpaper-1.1.28/man/paperconf.1.in
---- libpaper-1.1.28.orig/man/paperconf.1.in	2022-09-10 19:09:11.000000000 +0900
-+++ libpaper-1.1.28/man/paperconf.1.in	2022-09-10 19:15:12.000000000 +0900
+diff -ur libpaper-1.1.29/man/paperconf.1.in libpaper-src/man/paperconf.1.in
+--- libpaper-1.1.29/man/paperconf.1.in	2024-01-07 11:40:25.000000000 +0900
++++ libpaper-src/man/paperconf.1.in	2024-01-07 11:40:56.000000000 +0900
 @@ -3,39 +3,12 @@
  .B paperconf
  \- print paper configuration information

source/libs/libpaper/TLpatches/patch-04-unsigned

@@ -1,6 +1,6 @@
-diff -ur libpaper-1.1.28.orig/lib/dimen.c libpaper-1.1.28/lib/dimen.c
---- libpaper-1.1.28.orig/lib/dimen.c	2002-11-11 09:56:08.000000000 +0900
-+++ libpaper-1.1.28/lib/dimen.c	2022-09-10 19:16:05.000000000 +0900
+diff -ur libpaper-1.1.29/lib/dimen.c libpaper-src/lib/dimen.c
+--- libpaper-1.1.29/lib/dimen.c	2002-11-11 09:56:08.000000000 +0900
++++ libpaper-src/lib/dimen.c	2024-01-07 11:42:10.000000000 +0900
 @@ -53,9 +53,9 @@
 
      if (*(unit = what) == '-') ++unit;
@@ -13,9 +13,9 @@ diff -ur libpaper-1.1.28.orig/lib/dimen.c libpaper-1.1.28/lib/dimen.c
  	return -1;
      } else {
  	double base = atof(what);
-diff -ur libpaper-1.1.28.orig/src/paperconf.c libpaper-1.1.28/src/paperconf.c
---- libpaper-1.1.28.orig/src/paperconf.c	2012-05-04 04:05:12.000000000 +0900
-+++ libpaper-1.1.28/src/paperconf.c	2022-09-10 19:16:05.000000000 +0900
+diff -ur libpaper-1.1.29/src/paperconf.c libpaper-src/src/paperconf.c
+--- libpaper-1.1.29/src/paperconf.c	2012-05-04 04:05:12.000000000 +0900
++++ libpaper-src/src/paperconf.c	2024-01-07 11:42:10.000000000 +0900
 @@ -53,8 +53,8 @@
  	printf("%s", papername(paper));
  	pr = 1;

source/libs/libpaper/TLpatches/patch-05-windows

@@ -1,6 +1,6 @@
-diff -ur libpaper-1.1.28.orig/src/paperconf.c libpaper-1.1.28/src/paperconf.c
---- libpaper-1.1.28.orig/src/paperconf.c	2022-09-10 19:16:05.000000000 +0900
-+++ libpaper-1.1.28/src/paperconf.c	2022-09-10 19:17:11.000000000 +0900
+diff -ur libpaper-1.1.29/src/paperconf.c libpaper-src/src/paperconf.c
+--- libpaper-1.1.29/src/paperconf.c	2024-01-07 11:43:15.000000000 +0900
++++ libpaper-src/src/paperconf.c	2024-01-07 11:43:48.000000000 +0900
 @@ -3,9 +3,14 @@
  #include "config.h"
  #endif

source/libs/libpaper/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for libpaper (TeX Live) 1.1.28.
+# Generated by GNU Autoconf 2.72 for libpaper (TeX Live) 1.1.29.
 #
 # Report bugs to <[email protected]>.
 #
@@ -603,8 +603,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpaper (TeX Live)'
 PACKAGE_TARNAME='libpaper--tex-live-'
-PACKAGE_VERSION='1.1.28'
-PACKAGE_STRING='libpaper (TeX Live) 1.1.28'
+PACKAGE_VERSION='1.1.29'
+PACKAGE_STRING='libpaper (TeX Live) 1.1.29'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1306,7 +1306,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 libpaper (TeX Live) 1.1.28 to adapt to many kinds of systems.
+'configure' configures libpaper (TeX Live) 1.1.29 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpaper (TeX Live) 1.1.28:";;
+     short | recursive ) echo "Configuration of libpaper (TeX Live) 1.1.29:";;
    esac
   cat <<\_ACEOF
 
@@ -1471,7 +1471,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpaper (TeX Live) configure 1.1.28
+libpaper (TeX Live) configure 1.1.29
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1631,7 +1631,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 libpaper (TeX Live) $as_me 1.1.28, which was
+It was created by libpaper (TeX Live) $as_me 1.1.29, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4280,7 +4280,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpaper--tex-live-'
- VERSION='1.1.28'
+ VERSION='1.1.29'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -6178,7 +6178,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 libpaper (TeX Live) $as_me 1.1.28, which was
+This file was extended by libpaper (TeX Live) $as_me 1.1.29, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6246,7 +6246,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="\\
-libpaper (TeX Live) config.status 1.1.28
+libpaper (TeX Live) config.status 1.1.29
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

source/libs/libpaper/libpaper-src/changelog.debian

@@ -1,3 +1,14 @@
+libpaper (1.1.29) unstable; urgency=medium
+
+  * Fix for parallel build. See #857058
+  * Added romanian translation. See #1032333
+  * Updated standards-version to 4.6.0 (no changes)
+  * Update papersize manual page. See #959403
+  * Update paperconf manual page. See #959404
+  * Update paperconfig manual page. See #959405
+
+ -- Giuseppe Sacco <[email protected]>  Fri, 17 Mar 2023 14:44:15 +0100
+
 libpaper (1.1.28) unstable; urgency=medium
 
   * Completely fixed #927226.

source/libs/libpaper/libpaper-src/man/paperconf.1.in

@@ -66,7 +66,7 @@ Use millimetres as unit for paper size.
 Use inches as unit for paper size.
 
 .SH ENVIRONMENT
-.TP 20            
+.TP 20
 .B @PAPERSIZEVAR@
 Paper size to use.
 .SH AUTHOR

source/libs/libpaper/libpaper-src/man/paperconfig.8.in

@@ -6,13 +6,14 @@
 .SH SYNOPSIS
 .B paperconfig
 [
-.BR \-v\fP, \fB\-\-version
+.BR \-v ", " \-\-version
 ]
 [
-.BR \-h\fP, \fB\-\-help
+.BR \-h ", " \-\-help
 ]
 [
-.BI "\-p\fP, \fB\-\-paper" " papername"
+.BR \-p ", " \-\-paper
+.I papername
 |
 .B \-\-force
 ]
@@ -31,18 +32,20 @@ notifies other packages of the change by running the scripts in the
 directory.
 .SH OPTIONS
 .TP
-.BR \-v\fP, \fB\-\-version
+.BR \-v ", " \-\-version
 Print the version of
 .B paperconfig
 and exit.
 .TP
-.BR \-h\fP, \fB\-\-help
+.BR \-h ", " \-\-help
 Print help about usage and exit.
 .TP
-.BI "\-p\fP, \fB\-\-paper" " papername"
+.BR \-p ", " \-\-paper\c
+.I papername
 Use
 .I papername
-if possible. If
+if possible.
+If
 .I papername
 is not a valid paper, print an error message and exit.
 .TP
@@ -65,7 +68,7 @@ variable is not set.
 Directory of scripts to run after the paper size has been changed.
 This package puts no scripts here, but other packages may.
 .B run-parts
-is used to run the scripts, therefore their names must comply with 
+is used to run the scripts, therefore their names must comply with
 .B run-part's
 naming requirements.
 .SH AUTHOR