libpaper 1.1.29

git-svn-id: svn://tug.org/texlive/trunk@69324 c570f23f-e606-0410-a88d-b1316a301751

13 files changed, 73 insertions, 64 deletions

diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog
index befb2403e9b..0a25d7a1373 100644
--- a/Build/source/libs/libpaper/ChangeLog
+++ b/Build/source/libs/libpaper/ChangeLog
@@ -1,6 +1,12 @@
+2024-01-07  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* Import libpaper-1.1.29 from debian.
+	version.ac: Adapted.
+
 2022-09-10  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* Import libpaper-1.1.28 from debian.
+	version.ac: Adapted.
 
 2021-07-25  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
diff --git a/Build/source/libs/libpaper/TLpatches/ChangeLog b/Build/source/libs/libpaper/TLpatches/ChangeLog
index 89b93cc9caf..1a6bf980784 100644
--- a/Build/source/libs/libpaper/TLpatches/ChangeLog
+++ b/Build/source/libs/libpaper/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2024-01-07  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* Import libpaper-1.1.29 from debian.
+	* Patches adapted.
+
 2022-09-10  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* Import libpaper-1.1.28 from debian.
diff --git a/Build/source/libs/libpaper/TLpatches/TL-Changes b/Build/source/libs/libpaper/TLpatches/TL-Changes
index 5d83a756d84..5dc59890243 100644
--- a/Build/source/libs/libpaper/TLpatches/TL-Changes
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/TLpatches/patch-01-JIS b/Build/source/libs/libpaper/TLpatches/patch-01-JIS
index e6e4ebf8bee..1f78bbd7d93 100644
--- a/Build/source/libs/libpaper/TLpatches/patch-01-JIS
+++ b/Build/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 },
diff --git a/Build/source/libs/libpaper/TLpatches/patch-02-TL b/Build/source/libs/libpaper/TLpatches/patch-02-TL
index 1f1ed680a6c..e57ad750e03 100644
--- a/Build/source/libs/libpaper/TLpatches/patch-02-TL
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/TLpatches/patch-03-getopt b/Build/source/libs/libpaper/TLpatches/patch-03-getopt
index beeaf289a04..f047d638570 100644
--- a/Build/source/libs/libpaper/TLpatches/patch-03-getopt
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/TLpatches/patch-04-unsigned b/Build/source/libs/libpaper/TLpatches/patch-04-unsigned
index a844a24d98a..9898556074b 100644
--- a/Build/source/libs/libpaper/TLpatches/patch-04-unsigned
+++ b/Build/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;
diff --git a/Build/source/libs/libpaper/TLpatches/patch-05-windows b/Build/source/libs/libpaper/TLpatches/patch-05-windows
index 3368d6ee46c..0e5f2314752 100644
--- a/Build/source/libs/libpaper/TLpatches/patch-05-windows
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/libpaper-src/changelog.debian b/Build/source/libs/libpaper/libpaper-src/changelog.debian
index 36dc42fb384..be1818e2c3e 100644
--- a/Build/source/libs/libpaper/libpaper-src/changelog.debian
+++ b/Build/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 <eppesuig@debian.org>  Fri, 17 Mar 2023 14:44:15 +0100
+
 libpaper (1.1.28) unstable; urgency=medium
 
   * Completely fixed #927226.
diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in b/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in
index 53cecd83bdd..fc45c0a878c 100644
--- a/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in b/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in
index 47e1aeebf12..9b1655e8914 100644
--- a/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in
+++ b/Build/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
diff --git a/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in b/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in
index f0f71934890..a753e3e365e 100644
--- a/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in
+++ b/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in
@@ -17,24 +17,25 @@ string found; the case in the name of the paper does not import (see
 section however).
 .SH "PAPER NAMES"
 The following names are commonly understood by programs:
-.B a3\fP,\fB a4\fP,\fB a5\fP,
-.B b5\fP,\fB letter\fP,\fB legal\fP,\fB executive\fP,\fB note\fP
+.BR a3 ", " a4 ", " a5 ", " b5 ", " letter ", " legal ", " executive ,
+.B note
 and
 .BR 11x17 .
 .PP
 Additional paper names that one may encounter are:
-.B a0\fP,\fB a1\fP,\fB a2\fP,\fB a6\fP,\fB a7\fP,\fB a8\fP,\fB a9\fP,\fB a10\fP,
-.B b0\fP,\fB b1\fP,\fB b2\fP,\fB b3\fP,\fB b4\fP,\fB tabloid\fP,
-.B statement\fP,\fB note\fP,
-.B halfletter\fP,\fB halfexecutive\fP,\fB folio\fP,\fB quarto\fP,\fB ledger\fP,
-.B archA\fP,\fB archB\fP,\fB archC\fP,\fB archD\fP,\fB archE\fP,\fB flsa\fP,
-.B flse\fP,\fB csheet\fP,\fB dsheet\fP,\fB esheet\fP
-and       
+.BR a0 ", " a1 ", " a2 ", " a6 ", " a7 ", " a8 ", " a9 ", " a10 ,
+.BR b0 ", " b1 ", " b2 ", " b3 ", " b4 ", " tabloid ,
+.BR statement ", " note ,
+.BR halfletter ", " halfexecutive ", " folio ", " quarto ", " ledger ,
+.BR archA ", " archB ", " archC ", " archD ", " archE ", " flsa ,
+.BR flse ", " csheet ", " dsheet ,
+.B esheet
+and
 .BR 10x14 .
 .PP
 The value of the
 .B papersize
-file can be overrideen by
+file can be overridden by
 looking in order at the
 .B @PAPERSIZEVAR@
 environment variable, then at the contents of the file specified by the
diff --git a/Build/source/libs/libpaper/version.ac b/Build/source/libs/libpaper/version.ac
index 9a47c1d7db9..02424971562 100644
--- a/Build/source/libs/libpaper/version.ac
+++ b/Build/source/libs/libpaper/version.ac
@@ -9,4 +9,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current libpaper version
-m4_define([libpaper_version], [1.1.28])
+m4_define([libpaper_version], [1.1.29])