diff options
author | Hironobu Yamashita <h.y.acetaminophen@gmail.com> | 2022-09-10 10:38:07 +0000 |
---|---|---|
committer | Hironobu Yamashita <h.y.acetaminophen@gmail.com> | 2022-09-10 10:38:07 +0000 |
commit | 1a2f0c2523736035e34bd85435527ca767b6aa88 (patch) | |
tree | e7e5e598853df00d49dd986c73edeea09f707c91 /Build/source/libs/libpaper | |
parent | e9dcc4d473bdfc92b4b21b8cdc483084a7aca2ac (diff) |
libpaper 1.1.28 from debian
git-svn-id: svn://tug.org/texlive/trunk@64327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpaper')
40 files changed, 1967 insertions, 887 deletions
diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog index f1fdffc950a..befb2403e9b 100644 --- a/Build/source/libs/libpaper/ChangeLog +++ b/Build/source/libs/libpaper/ChangeLog @@ -1,3 +1,7 @@ +2022-09-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Import libpaper-1.1.28 from debian. + 2021-07-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * src/paperconf.c: Apply patch of W32TeX for Windows diff --git a/Build/source/libs/libpaper/TLpatches/ChangeLog b/Build/source/libs/libpaper/TLpatches/ChangeLog index 63bf66a9362..89b93cc9caf 100644 --- a/Build/source/libs/libpaper/TLpatches/ChangeLog +++ b/Build/source/libs/libpaper/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2022-09-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Import libpaper-1.1.28 from debian. + * Patches adapted. + 2021-07-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * patch-05-windows (new): Patch of W32TeX for Windows diff --git a/Build/source/libs/libpaper/TLpatches/TL-Changes b/Build/source/libs/libpaper/TLpatches/TL-Changes index 779b6d4ff35..5d83a756d84 100644 --- a/Build/source/libs/libpaper/TLpatches/TL-Changes +++ b/Build/source/libs/libpaper/TLpatches/TL-Changes @@ -1,9 +1,10 @@ -Changes applied to the libpaper-1.1.24+nmu2/ tree as obtained from: - ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ +Changes applied to libpaper_1.1.28.tar.gz as obtained from: + http://ftp.debian.org/debian/pool/main/libp/libpaper/ -Removed: - COPYING - INSTALL +Renamed and reserved: + debian/changelog -> changelog.debian + +Removed unused files: Makefile.in aclocal.m4 compile @@ -19,5 +20,9 @@ Removed: man/Makefile.in src/Makefile.in +Removed empty files: + AUTHORS + NEWS + Removed unused dirs: debian diff --git a/Build/source/libs/libpaper/TLpatches/patch-01-JIS b/Build/source/libs/libpaper/TLpatches/patch-01-JIS index ce2016ad995..e6e4ebf8bee 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.24+nmu2.orig/lib/paperspecs libpaper-1.1.24+nmu2/lib/paperspecs ---- libpaper-1.1.24+nmu2.orig/lib/paperspecs 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paperspecs 2013-10-24 11:32:28.000000000 +0200 +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 @@ -40,6 +40,18 @@ c6 114 162 mm c7 81 114 mm @@ -20,9 +20,9 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs libpaper-1.1.24+nmu2/lib/paper DL 110 220 mm Comm10 297 684 Monarch 279 540 -diff -ur libpaper-1.1.24+nmu2.orig/lib/paperspecs.h libpaper-1.1.24+nmu2/lib/paperspecs.h ---- libpaper-1.1.24+nmu2.orig/lib/paperspecs.h 2012-05-04 12:11:27.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paperspecs.h 2013-10-24 11:32:42.000000000 +0200 +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 @@ -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 601ccb9d252..1f1ed680a6c 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.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c ---- libpaper-1.1.24+nmu2.orig/lib/paper.c 2010-04-24 14:12:11.000000000 +0200 -+++ libpaper-1.1.24+nmu2/lib/paper.c 2013-10-24 15:45:37.955710461 +0200 +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 @@ -87,24 +87,11 @@ } @@ -56,7 +56,7 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c } if (paperenv) { -@@ -145,61 +120,6 @@ +@@ -145,64 +120,6 @@ return strcpy(paperstr, paperenv); } @@ -102,7 +102,10 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c - fclose(ps); - - paperstr = malloc((strlen(papername) + 1) * sizeof(char)); -- if (! paperstr) return 0; +- if (! paperstr) { +- free(papername); +- return 0; +- } - - strcpy(paperstr, papername); - free(papername); @@ -118,9 +121,10 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c paperdef = defaultpapername(); paperstr = malloc((strlen(paperdef) + 1) * sizeof(char)); -diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in ---- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-10-25 08:27:54.783329615 +0200 +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 @@ -1,4 +1,4 @@ -.TH PAPERCONF 1 "24 April 2001" +.TH PAPERCONF 1 "25 October 2013" diff --git a/Build/source/libs/libpaper/TLpatches/patch-03-getopt b/Build/source/libs/libpaper/TLpatches/patch-03-getopt index cec650d1108..beeaf289a04 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.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in ---- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2013-10-25 08:27:54.000000000 +0200 -+++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-11-20 13:59:18.000000000 +0100 +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 @@ -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 13c798bc1e5..a844a24d98a 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.24+nmu2.orig/lib/dimen.c libpaper-1.1.24+nmu2/lib/dimen.c ---- libpaper-1.1.24+nmu2.orig/lib/dimen.c 2002-11-11 01:56:08.000000000 +0100 -+++ libpaper-1.1.24+nmu2/lib/dimen.c 2014-06-18 08:31:52.000000000 +0200 +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 @@ -53,9 +53,9 @@ if (*(unit = what) == '-') ++unit; @@ -13,9 +13,9 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/dimen.c libpaper-1.1.24+nmu2/lib/dimen.c return -1; } else { double base = atof(what); -diff -ur libpaper-1.1.24+nmu2.orig/src/paperconf.c libpaper-1.1.24+nmu2/src/paperconf.c ---- libpaper-1.1.24+nmu2.orig/src/paperconf.c 2012-05-03 21:05:12.000000000 +0200 -+++ libpaper-1.1.24+nmu2/src/paperconf.c 2014-06-18 08:31:54.000000000 +0200 +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 @@ -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 e5efe39dd85..3368d6ee46c 100644 --- a/Build/source/libs/libpaper/TLpatches/patch-05-windows +++ b/Build/source/libs/libpaper/TLpatches/patch-05-windows @@ -1,6 +1,6 @@ -diff -urN libpaper-src.orig/src/paperconf.c libpaper-src/src/paperconf.c ---- libpaper-src.orig/src/paperconf.c 2018-06-04 21:21:52.425895682 +0900 -+++ libpaper-src/src/paperconf.c 2021-07-25 10:23:30.460565370 +0900 +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 @@ -3,9 +3,14 @@ #include "config.h" #endif diff --git a/Build/source/libs/libpaper/configure b/Build/source/libs/libpaper/configure index fbc855efd8a..eec9bd3d09b 100755 --- a/Build/source/libs/libpaper/configure +++ b/Build/source/libs/libpaper/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libpaper (TeX Live) 1.1.24+nmu2. +# Generated by GNU Autoconf 2.71 for libpaper (TeX Live) 1.1.28. # # Report bugs to <tex-k@tug.org>. # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpaper (TeX Live)' PACKAGE_TARNAME='libpaper--tex-live-' -PACKAGE_VERSION='1.1.24+nmu2' -PACKAGE_STRING='libpaper (TeX Live) 1.1.24+nmu2' +PACKAGE_VERSION='1.1.28' +PACKAGE_STRING='libpaper (TeX Live) 1.1.28' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1313,7 +1313,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.24+nmu2 to adapt to many kinds of systems. +\`configure' configures libpaper (TeX Live) 1.1.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1381,7 +1381,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpaper (TeX Live) 1.1.24+nmu2:";; + short | recursive ) echo "Configuration of libpaper (TeX Live) 1.1.28:";; esac cat <<\_ACEOF @@ -1478,7 +1478,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpaper (TeX Live) configure 1.1.24+nmu2 +libpaper (TeX Live) configure 1.1.28 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1634,7 +1634,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.24+nmu2, which was +It was created by libpaper (TeX Live) $as_me 1.1.28, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4221,7 +4221,7 @@ fi # Define the identity of the package. PACKAGE='libpaper--tex-live-' - VERSION='1.1.24+nmu2' + VERSION='1.1.28' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6085,7 +6085,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.24+nmu2, which was +This file was extended by libpaper (TeX Live) $as_me 1.1.28, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6153,7 +6153,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.24+nmu2 +libpaper (TeX Live) config.status 1.1.28 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/libpaper/libpaper-src/COPYING b/Build/source/libs/libpaper/libpaper-src/COPYING new file mode 100644 index 00000000000..aca3fe3efe3 --- /dev/null +++ b/Build/source/libs/libpaper/libpaper-src/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Build/source/libs/libpaper/libpaper-src/Makefile.am b/Build/source/libs/libpaper/libpaper-src/Makefile.am index b0a136b95c8..e646ec42084 100644 --- a/Build/source/libs/libpaper/libpaper-src/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-src/Makefile.am @@ -1,3 +1,3 @@ -
-SUBDIRS = lib src man
-
+ +SUBDIRS = lib src man + diff --git a/Build/source/libs/libpaper/libpaper-src/README b/Build/source/libs/libpaper/libpaper-src/README index 7c4fb128610..2b451f7a552 100644 --- a/Build/source/libs/libpaper/libpaper-src/README +++ b/Build/source/libs/libpaper/libpaper-src/README @@ -1,39 +1,39 @@ -The paper library and accompanying files are intended to provide a simple
-way for applications to take actions based on a system- or user-specified
-paper size.
-
-This release is quite minimal, its purpose being to provide really basic
-functions (obtaining the system paper name and getting the height and
-width of a given kond of paper) that applications can immediately
-integrate.
-A more complete library, using a capabilities file for papers (giving,
-in addition to the size, informations like paper weigth, color, etc)
-will be released later.
-
-See the sources for paperconf(1) in src/paper.c for how to use the library.
-
-Adding new paper sizes
-======================
-
-If a paper format is missing, one need to add it to lib/paperspecs. The
-format of this file is one paper format per line, with the name of the
-format, the width and height of the format separated with space. You
-may add an option measurement unit among in, ft, pt, m, dm, cm, mm or you
-may leave the default unit of "point". By defaults the width and height
-are specified in the "point" unit, which is 1/72 inch (2.54 cm). This
-is the A4 entry:
-
- a4 210 297 mm
-
-that was previously written as
-
- a4 595 842
-
-The sizes here are 595 points / 72 points pr inch * 2.54 cm per
-inch = 20.99 cm and 842/72*2.54 = 29.70 cm. The A4 format
-is 210x297 mm so this is a good approximation. (Source:
-<URL:http://en.wikipedia.org/wiki/A4_paper_size>)
-
-Copyright (C) Yves Arrouye <yves@debian.org>, 1996
- Adrian Bunk <bunk@fs.tum.de> , 2000
-
+The paper library and accompanying files are intended to provide a simple +way for applications to take actions based on a system- or user-specified +paper size. + +This release is quite minimal, its purpose being to provide really basic +functions (obtaining the system paper name and getting the height and +width of a given kond of paper) that applications can immediately +integrate. +A more complete library, using a capabilities file for papers (giving, +in addition to the size, informations like paper weigth, color, etc) +will be released later. + +See the sources for paperconf(1) in src/paper.c for how to use the library. + +Adding new paper sizes +====================== + +If a paper format is missing, one need to add it to lib/paperspecs. The +format of this file is one paper format per line, with the name of the +format, the width and height of the format separated with space. You +may add an option measurement unit among in, ft, pt, m, dm, cm, mm or you +may leave the default unit of "point". By defaults the width and height +are specified in the "point" unit, which is 1/72 inch (2.54 cm). This +is the A4 entry: + + a4 210 297 mm + +that was previously written as + + a4 595 842 + +The sizes here are 595 points / 72 points pr inch * 2.54 cm per +inch = 20.99 cm and 842/72*2.54 = 29.70 cm. The A4 format +is 210x297 mm so this is a good approximation. (Source: +<URL:http://en.wikipedia.org/wiki/A4_paper_size>) + +Copyright (C) Yves Arrouye <yves@debian.org>, 1996 + Adrian Bunk <bunk@fs.tum.de> , 2000 + diff --git a/Build/source/libs/libpaper/libpaper-src/changelog.debian b/Build/source/libs/libpaper/libpaper-src/changelog.debian new file mode 100644 index 00000000000..36dc42fb384 --- /dev/null +++ b/Build/source/libs/libpaper/libpaper-src/changelog.debian @@ -0,0 +1,791 @@ +libpaper (1.1.28) unstable; urgency=medium + + * Completely fixed #927226. + + -- Giuseppe Sacco <eppesuig@debian.org> Wed, 26 Jun 2019 00:04:32 +0200 + +libpaper (1.1.27) unstable; urgency=medium + + * Fixed a circular dependency in debian/rules that left libpaper1.config + not built. See #927226. + + -- Giuseppe Sacco <eppesuig@debian.org> Sun, 23 Jun 2019 21:27:03 +0200 + +libpaper (1.1.26) unstable; urgency=medium + + * Check for ucf presence in the postrm script. See #916197 and #916198. + + -- Giuseppe Sacco <eppesuig@debian.org> Tue, 11 Dec 2018 11:50:45 +0100 + +libpaper (1.1.25) unstable; urgency=medium + + * Fixed C4 dimension, closes: #829203 + * Added debian/source/format file. + * Updated debian/copyright in order to refer to GPL-2 instead of + GPL, closes: #729004 + * Fixed several lintian warnings about debian/* files. + * Update to debian standard version 3.9.8 without any fix. + * Correctly free() memory, closes: #914815 + * Updated paperconfig man page for run-parts, closes: #594931 + * Changed rules in order to cross build, closes: #693968 + + -- Giuseppe Sacco <eppesuig@debian.org> Sun, 09 Dec 2018 10:28:40 +0100 + +libpaper (1.1.24+nmu5) unstable; urgency=medium + + [ Helmut Grohne ] + * Non-maintainer upload. + * Fix /tmp file vulnerability in debian/rules clean target + (Closes: #841722) + + -- Jonathan Wiltshire <jmw@debian.org> Fri, 11 Nov 2016 11:28:37 +0000 + +libpaper (1.1.24+nmu4) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ""Multi-Arch: same" but postrm removes arch-independent + configuration": + Guard removal of /etc/papersize in libpaper1.postrm with check for + DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT; depend on dpkg (>= 1.17.2). + Thanks to Ivo De Decker for the proposal. + (Closes: #682420) + * Debconf template translations: + - new: Polish, thanks Michał Kułach, closes: #658159 + - updated: Turkish, thanks Atila KOÇ, closes: #688293 + + -- gregor herrmann <gregoa@debian.org> Sat, 01 Nov 2014 14:35:13 +0100 + +libpaper (1.1.24+nmu3) unstable; urgency=low + + * Non-maintainer upload. + * Use dh_autoreconf to update configury for new architectures. (Closes: #700358) + + -- Wookey <wookey@debian.org> Fri, 04 Apr 2014 00:48:01 +0000 + +libpaper (1.1.24+nmu2) unstable; urgency=low + + * Add multiarch support (Closes: #649672) + * Fix option-parsing headers for non-linux OSes (Closes: #542851) + * Correct DL size in paperconf (Closes: #475683) + + -- Wookey <wookey@wookware.org> Wed, 02 May 2012 17:52:10 +0000 + +libpaper (1.1.24+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Danish (Joe Hansen). Closes: #599843 + + -- Christian Perrier <bubulle@debian.org> Fri, 06 May 2011 07:07:12 +0200 + +libpaper (1.1.24) unstable; urgency=low + + * Small changes to simplify portability (Closes: #578884, #578885, #578886, #578887) + + -- Giuseppe Sacco <eppesuig@debian.org> Sat, 24 Apr 2010 14:13:52 +0200 + +libpaper (1.1.23+nmu2) unstable; urgency=low + + * Non-maintainer upload. + * Lintian fixes: + - Bump debhelper compatibility level to 7 + - As a consequence, replace calls to "dh_clean -k" by "dh_prep" + - Add ${misc:Depends} to binary packages dependencies to + properly cope with dependencies triggerred by debhelper + utilities + * Fix pending l10n issues. Debconf translations: + - Slovak (Ivan Masár). Closes: #534463 + + -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:34:25 +0100 + +libpaper (1.1.23+nmu1) unstable; urgency=low + + * Non-maintainer upload to fix pending l10n issues. + * Debconf translations: + - Finnish. Closes: #448419 + - Basque. Closes: #485430 + * [Lintian] No longer ignore errors by "make distclean" + * [Lintian] Make the package binNMUable by replacing ${Source-Version} + by ${binary:Version} in dependencies + * [Lintian] drop (invalid) NEWS.Debian file that documents a very old + transition + + -- Christian Perrier <bubulle@debian.org> Wed, 28 May 2008 07:45:35 +0200 + +libpaper (1.1.23) unstable; urgency=low + + [ Tormod Volden ] + * Use defaultpapername() if systempapername() fails, as suggested + in lib/paper.h. This makes paperconf return a default papersize + instead of failing if /etc/papersize doesn't exist. + Closes: #376346. + + [ Giuseppe Sacco ] + * Added hungarian translation: Closes: #433726. + + -- Giuseppe Sacco <eppesuig@debian.org> Fri, 28 Sep 2007 18:42:18 +0200 + +libpaper (1.1.22) unstable; urgency=low + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. Closes: #433065 + * Debconf translation updates: + - French + - Basque. Closes: #433765 + - Japanese. Closes: #433781 + - Vietnamese. Closes: #433796 + - Czech. Closes: #434004 + - Italian. Closes: #434058 + - Russian. Closes: #434070 + - Galician. Closes: #434315 + - Spanish. Closes: #434674 + - German. Closes: #434793 + - Dutch. Closes: #435326 + - Swedish. Closes: #435339 + - Brazilian Portuguese. Closes: #435695, #435696 + - Portuguese. Closes: #435716 + - Catalan. Closes: #435722 + + [ Giuseppe Sacco ] + * Applied proposed patch for i18n fix as proposed by Christian Perrier + + -- Giuseppe Sacco <eppesuig@debian.org> Wed, 08 Aug 2007 21:04:14 +0200 + +libpaper (1.1.21) unstable; urgency=low + + * Added support for hooks called when reconfigured (Closes: #375669) + * Added config.sub and config.guess as asked by maintainers non Debian systems. + * Added russian debconf translation (Closes: #397171) + + -- Giuseppe Sacco <eppesuig@debian.org> Mon, 20 Nov 2006 23:57:06 +0100 + +libpaper (1.1.20) unstable; urgency=low + + * Update spanish translation by Carlos Valdivia Yagüe (Closes: #384930) + + -- Giuseppe Sacco <eppesuig@debian.org> Mon, 28 Aug 2006 08:42:49 +0200 + +libpaper (1.1.19) unstable; urgency=low + + * Resolved the circular dependency between libpaper1 and libpaper-utils + (Closes: #369818, #370100, #370311) + + -- Giuseppe Sacco <eppesuig@debian.org> Sun, 11 Jun 2006 17:55:23 +0200 + +libpaper (1.1.18) unstable; urgency=low + + * Fix dependency (Closes: #369818) + + -- Giuseppe Sacco <eppesuig@debian.org> Thu, 1 Jun 2006 17:44:13 +0200 + +libpaper (1.1.17) unstable; urgency=low + + * now postrm deletes conffiles during purge (Closes: #367529) + * simplified the way to get informations from current locale (Closes: #367567) + * use CURDIR instead of PWD in debian/rules to make it work on + autobuilders with sudo (Closes: #367589) + + -- Giuseppe Sacco <eppesuig@debian.org> Wed, 17 May 2006 07:41:49 +0200 + +libpaper (1.1.16) unstable; urgency=low + + * Added patch by Martin Michlmayr (Closes: #367361) + + -- Giuseppe Sacco <eppesuig@debian.org> Mon, 15 May 2006 15:04:17 +0200 + +libpaper (1.1.15) unstable; urgency=low + + * Reverted version numbering to debian native + * changed the way to "guess" the correct page dimensions based on + current locale (Closes: #288693, #320534) + * Updated Changelog and Copyright information (Closes: #366486) + * Added galician debconf translation (Closes: #361811) + + -- Giuseppe Sacco <eppesuig@debian.org> Sat, 13 May 2006 16:03:28 +0200 + +libpaper (1.1.14-7) unstable; urgency=low + + * Correctly handle RUNPARTSDIRVAR. Again, thanks to Stephen Gildea. + * Call autoconf while building all packages. + + -- Giuseppe Sacco <eppesuig@debian.org> Tue, 4 Apr 2006 14:22:41 +0200 + +libpaper (1.1.14-6) unstable; urgency=low + + * Added patch by Stephen Gildea for RUNPARTSDIRVAR (Closes: #352693) + * /etc/papersize is always removed on purge (Closes: #355690) + * Corrected two typos on papersize man page (Closes: #349958) + * Corrected two typos on paperconf man page (Closes: #349959) + * Corrected the way configure is called, see #285426. + + -- Giuseppe Sacco <eppesuig@debian.org> Sun, 19 Mar 2006 19:07:04 +0100 + +libpaper (1.1.14-5) unstable; urgency=low + + * Added vi translation (Closes: #312445) + * Corrected paperconfig man page (Closes: #335321) + * Correctly documented the run-parts callback + * Fixed LC_ALL and LANG when calling AWK in order to generate numbers + using '.' instead of ',' in C sources. + + -- Giuseppe Sacco <eppesuig@debian.org> Sat, 7 Jan 2006 22:18:06 +0100 + +libpaper (1.1.14-4) unstable; urgency=low + + * Added da translation (Closes: #296990) + * Added a hook for calling applications when papersize changes (Closes: #345466) + * Depends on debconf-2.0 (Closes: #332004) + * Removed dummy packages (Closes: #322048) + * Fixed passing --build and --host tp configure. (Closes: #285426) + * Added sv translation (Closes: #334753) + * Check for ufc configuration file before deleting /etc/papersize (Closes: #327076) + * Increased Standards-Version. + * Added italian translation. + + -- Giuseppe Sacco <eppesuig@debian.org> Thu, 5 Jan 2006 10:37:12 +0100 + +libpaper (1.1.14-3) unstable; urgency=medium + + * Added an explaination of how to add a new paper format, see #278017. + * Used medium urgency in order to get into sarge. + + -- Giuseppe Sacco <eppesuig@debian.org> Sun, 24 Oct 2004 11:21:03 +0200 + +libpaper (1.1.14-2) unstable; urgency=low + + * Moved libpaper-dev and libpaperg-dev from section devel to libdevel. + + -- Giuseppe Sacco <eppesuig@debian.org> Sat, 23 Oct 2004 12:45:25 +0200 + +libpaper (1.1.14-1) unstable; urgency=medium + + * New maintaier + * New Dutch po-debconf translation + * New Czech po-debconf translation + * New pt_BR po-debconf translation + * Applied patch by Frank Küster for a smoother upgrade from woody + * Applied patch by Magnus Fromreide in order to add measure units. + + -- Giuseppe Sacco <eppesuig@debian.org> Sat, 23 Oct 2004 11:56:26 +0200 + +libpaper (1.1.14-0.4) unstable; urgency=medium + + * And yet another NMU + * Only try to run ucf if it is available on purge since we + can't be sure (Closes: #264249) Thx to Ryan Murray for + noticing. + * Update French translation of debconf templates. (Closes: #263152) + * Update Portuguese (Brasilian) translation of debconf templates. + (Closes: #264212) + * Urgency medium to get this into sarge in time + + -- Frank Lichtenheld <djpig@debian.org> Wed, 18 Aug 2004 11:21:34 +0200 + +libpaper (1.1.14-0.3) unstable; urgency=low + + * Third NMU to increase the dependencies on debconf (>= 1.3.22) + and ucf (>= 0.28). Thanks David Golombek for noticing. + (Closes: #261844) + * Update Japanese translation of debconf templates. (Closes: #260820) + * Update German translation of debconf templates. + * Add Ukrainian translation of debconf templates. (Closes: #261637) + + -- Frank Lichtenheld <djpig@debian.org> Wed, 28 Jul 2004 21:17:55 +0200 + +libpaper (1.1.14-0.2) unstable; urgency=low + + * Second NMU to acknowledge the fact that it was me, not Fabio that + uploaded the last NMU and so I am responsible for any breakages + caused... + + -- Frank Lichtenheld <djpig@debian.org> Tue, 20 Jul 2004 21:18:55 +0200 + +libpaper (1.1.14-0.1) unstable; urgency=low + + * NMU + * Switch libpaper1.config from perl to sh for the sake of consistency + and simplicity. + * Add title template so that can be translated. + * Switch _Choises: to __Choises: to help translator teams. (Closes: #238049) + * Add Depends: ucf to libpaper1 and rewrite maintainer's scripts. + (Closes: #245403, #216471) + * Update Czech translation of debconf templates. (Closes: #232061) + * Update French translation of debconf templates. (Closes: #238649) + * Update Turkish translation of debconf templates. (Closes: #246070) + * Update Dutch translation of debconf templates. (Closes: #246551) + * Update German translation of debconf templates. (Closes: #251733) + + -- Fabio M. Di Nitto <fabbione@fabbione.net> Wed, 30 Jun 2004 14:23:44 +0200 + +libpaper (1.1.14) unstable; urgency=low + + * Explicitly choose NOT to include a menu option for paper-config, + Closes: #187603 + * Move the notice about the changed meanins of the PAPERSIZE & PAPERCONF + environment variables to NEWS.Debian. This has the added advantage of + elimiating the the one non-medium level debconf prompt in this package, + Closes: #200503, #226254 + * Convert to po-debconf for i10n support, + Closes: #201787 + * Be explicit about the order of environment variable evaluation and the + "value of tlast resort" in both the paperconf.1 and papersize.5 man + pages, + Closes: #212974 + * Add JA debconf translation, + Closes: #213069 + + -- Stephen Zander <gibreel@debian.org> Mon, 19 Jan 2004 20:22:39 -0800 + +libpaper (1.1.13) unstable; urgency=low + + * Correct the weird guid bit setting in the source package, + Closes: #177560 + * Create /etc/papersize in the libpaper1 postinst;this code got lost in + the last release, + Closes: #181023 + + -- Stephen Zander <gibreel@debian.org> Wed, 26 Feb 2003 00:49:47 -0800 + +libpaper (1.1.12) unstable; urgency=low + + * No longer coonflict with libpaperg & libpaperg-dev, just replace & + provide. I don't want a bunch of bugs about how dpkg complains that + it doesn't have a package to configure after unpacking. The conflict + will return when the dummy packages disappear after the next Debian + release. + * Build the dummy packages in the binary-indep rule not the binary-arch + rule, + Closes: #174386 + * Add 'Replaces: libpaperg (<< 1.1.9), libpaper1 (<< 1.1.10)' to + libpaper-utils instaed of using diversion hackery. I finally get how + these fields interact. + Closes: #174810 + + -- Stephen Zander <gibreel@debian.org> Tue, 31 Dec 2002 16:57:07 -0800 + +libpaper (1.1.11) unstable; urgency=low + + * Further updates to the libpaper-utils templates courtesy of Branden + Robinson <branden@debian.org>, + Closes: #170829 + * Correct the missing references to PAPERCONFVAR in paperconfig.in + (thanks to Junichi Uekawa <dancer@netfort.gr.jp>) + Closes: #173043 + + -- Stephen Zander <gibreel@debian.org> Thu, 19 Dec 2002 17:13:33 -0800 + +libpaper (1.1.10) unstable; urgency=low + + * Working out which packages depend on libpaper1 is easy: + apt-cache showpkg libpaper1 + Working out which packages should use libpaper but don't is not the + responsibility of this package, + Closes: #153471 + * Create a libpaper-utils package to hold paperconf & paperconfig, + Closes: #169152 + * Include -I$(topsrcdir)/lib in paperconf_CPPFLAGS so we can find + <paper.h>, + Closes: #169154, #169376 + * Improve the template descriptions (thanks to Branden Robinson + <branden@debian.org> & Thomas Schoepf <schoepf@debian.org>) + Closes: #169195, #169270 + * Make the dummy libpaperg package depend on libpaper-utils, so the + naming migration is complete, + Closes: #169215 + * Specifiy the default papersize file name in the papersize man page, + Closes: #169693 + + -- Stephen Zander <gibreel@debian.org> Mon, 18 Nov 2002 22:05:09 -0800 + +libpaper (1.1.9) unstable; urgency=low + + * Two release have gone by with libpaperg so it should be safe to C/R/P + against. Rename the package to be in-line with current naming + standards (libpaper<SONAME>, libpaper-dev). Provide a dummy + libpaperg-dev to aid the transition + * Reverse the meanings of the PAPERCONF & PAPERSIZE environment + variables. Their current meanings violate the principle of least + surprise (i.e. people expect PAPERSIZE to be a paper size etc not the + path to a file and the expect PAPERCONF to be a configuration file not + a paper size). The previous meanings will be supported for backward + compatibility *only* until the next Debian release, + Closes: #159579 + * Allow America as a synonym for US when deciding whether to default to + letter or a4 paper size, + Closes: #155843 + * Rebuild using the latest automake & DESTDIR= to fix breakage in the + .la file and allow for building outside the source tree, + Closes: #160228, #161163 + * Include <errno.h> instead of using 'extern int errno', + Closes: #168521 + + -- Stephen Zander <gibreel@debian.org> Sun, 10 Nov 2002 15:49:09 -0800 + +libpaper (1.1.8) unstable; urgency=high + + * Ensure changes made during reconfiguration take effect, + Closes: #136702 + * Remove debconf code from preinst as it's not necessary, + Closes: #143838 + + -- Stephen Zander <gibreel@debian.org> Sun, 21 Apr 2002 20:23:22 -0700 + +libpaper (1.1.7) unstable; urgency=low + + * Bring debconf template handling in line with i10n recommendations, + Closes: #133821 + + -- Stephen Zander <gibreel@debian.org> Sat, 23 Feb 2002 16:21:20 -0800 + +libpaper (1.1.6) unstable; urgency=low + + * Close an additional bug related to the config typos in the previous + version of the package, + Closes: #132672 + * Update the french translation in the debconf template file, + Closes: #133821 + * Remove /usr/bin/paperconf from debconf configuration; it served no + useful purpose anyway, + Closes: #134066 + + -- Stephen Zander <gibreel@debian.org> Fri, 22 Feb 2002 12:09:35 -0800 + +libpaper (1.1.5) unstable; urgency=medium + + * Fix some careless typos in the debconf config script, + Closes: #132660, #132663 + + -- Stephen Zander <gibreel@debian.org> Wed, 6 Feb 2002 16:55:26 -0800 + +libpaper (1.1.4) unstable; urgency=low + + * New maintainer, + Closes: #130829 + * Provide default paper size based on timezone, + Closes: #48303 + * Add documentation for papername, paperpswidth & paperpsheight, + Closes: #112733 + * Prevent libpaperg from reasking for a paper size when /etc/papersize + exists, + Closes: #131335 + + -- Stephen Zander <gibreel@debian.org> Tue, 5 Feb 2002 19:54:41 -0800 + +libpaper (1.1.3) unstable; urgency=low + + * Orphaned this package. + + -- Adrian Bunk <bunk@fs.tum.de> Fri, 25 Jan 2002 12:59:59 +0100 + +libpaper (1.1.2) unstable; urgency=high + + * Fix debian/config to get dpkg-reconfigure working. + + -- Adrian Bunk <bunk@fs.tum.de> Tue, 4 Dec 2001 10:41:42 +0100 + +libpaper (1.1.1) unstable; urgency=high + + * Hardcoded the papersizes in debian/templates. + (closes: #115347) + * #define MAXPATHLEN in src/paperconf.c if it isn't already + defined. This should fix the compilation on GNU/Hurd. + (closes: #103850) + * Updated libtool. + + -- Adrian Bunk <bunk@fs.tum.de> Sat, 17 Nov 2001 15:13:56 +0100 + +libpaper (1.1.0) unstable; urgency=low + + * Changed the build system to use automake and libtool. + + -- Adrian Bunk <bunk@fs.tum.de> Sun, 23 Sep 2001 00:34:41 +0200 + +libpaper (1.0.10) unstable; urgency=low + + * Add a" || true" to the removal of the diversions in the + preinst of libpaperg. (closes: #112977) + * Renamed configure.in to configure.ac. + + -- Adrian Bunk <bunk@fs.tum.de> Fri, 21 Sep 2001 13:51:58 +0200 + +libpaper (1.0.9) unstable; urgency=high + + * Don't ask the debconf question when the user had the potato + package installed. (closes: #95030) + * The potato package didn't remove the diversion correctly. + Remove it in the preinst of libpaperg. (closes: #112247) + * s/defaultpapersize/defaultpapername/ in systempapername (3). + (This time in the right file...) + * Updated config.guess and config.sub. (closes: #88550, #94793) + * Added spanish and brazilian portuguese translations of the + debconf template. (closes: #103245, #106239) + + -- Adrian Bunk <bunk@fs.tum.de> Tue, 18 Sep 2001 00:07:13 +0200 + +libpaper (1.0.8.1) unstable; urgency=high + + * copy in new config.{guess,sub} to get support for new architectures. + Closes: #94793 + + -- LaMont Jones <lamont@debian.org> Mon, 9 Jul 2001 21:39:34 -0600 + +libpaper (1.0.8) unstable; urgency=high + + * Corrected a small error in paperconf (1). (closes: #91230) + + -- Adrian Bunk <bunk@fs.tum.de> Sun, 15 Apr 2001 01:00:20 +0200 + +libpaper (1.0.7) unstable; urgency=low + + * libpaperg-dev replaces libpaperg (<< 1.0.5). (closes: #90508) + * Corrected the sections of the binary packages: + libpaperg : text -> libs + libpaperg-dev: text -> devel + * Removed dh_testversion from debian/rules. + * Added a Hungarian translation of the debconf template. Thanks + to KORN Andras <korn@chardonnay.math.bme.hu> for this. + + -- Adrian Bunk <bunk@fs.tum.de> Wed, 21 Mar 2001 18:24:15 +0100 + +libpaper (1.0.6) unstable; urgency=medium + + * Depend on the latest version of debconf in unstable to avoid the + problems with the ancient version in testing. (closes: #90199) + + -- Adrian Bunk <bunk@fs.tum.de> Mon, 19 Mar 2001 08:39:16 +0100 + +libpaper (1.0.5) unstable; urgency=low + + * Run paperconfig in the postinst only when /etc/papersize doesn't + exist. (closes: #74691, #76809, #77070) + * Changed paperconfig to show a usage message and exit with + error code 1 when called without parameters. (closes: #73643) + * s/systempapersize()/systempapername()/ in systempapername (3). + (closes: #83580) + * Added German, French and Swedish translations of the template file. + (closes: #83970, #84705) + * Changed the English template to suggest "a4" as well as "letter". + (closes: #84254) + * Moved the section 3 man pages from libpaperg to libpaperg-dev. + * s/Debian::DebConf::Client::ConfModule/Debconf::Client::ConfModule/ + in debian/config. + * libpaperg does now conflict with libpaper. I removed some stuff + that did let both packages being installed together. + + -- Adrian Bunk <bunk@fs.tum.de> Sat, 3 Mar 2001 13:40:57 +0100 + +libpaper (1.0.4) unstable; urgency=low + + * New maintainer. + * libpaper is now a native Debian package. + * Removed the libc5 libpaper package. + * Added a libpaperg-dev package. (closes: #75660) + * Rewritten debian/rules based on debhelper. + * /usr/doc -> /usr/share/doc + * /usr/man -> /usr/share/man + * Updated the copyright file. + * Removed the obsolete examples directory. + * Updated config.guess and config.sub and added support for GNU/Hurd + in configure.in. (closes: #39036) + * Added Build-Depends. + * Standards-Version: 3.1.1 + + -- Adrian Bunk <bunk@fs.tum.de> Mon, 18 Sep 2000 23:29:42 +0200 + +libpaper (1.0.3-14) unstable; urgency=low + + * Added debconf support, thaks to the patch by + John Goerzen <jgoerzen@progenylinux.com> (Closes: Bug#70959). + + -- Marco Pistore <pistore@debian.org> Tue, 12 Sep 2000 07:26:25 +0200 + +libpaper (1.0.3-13) unstable frozen; urgency=low + + * Fixed preinst and postrm scripts for the libpaperg package, + so that diversions are handled correctly (Closes: Bug#49205) + * Fixed bugs in lib/paper.c file that made function systempapername + if file /etc/papersize is present but not readable (also + dixed memory lead in the same function) (Closes: Bug#63582) + * Now file /etc/papersize is chmod 644 after creation in + paperconfig, to override root's umask. + + -- Marco Pistore <pistore@debian.org> Sun, 14 May 2000 19:32:17 +0200 + +libpaper (1.0.3-12.2) unstable; urgency=low + + * Fixed a syntax error in debian/control introduced by the last NMU: + The Architecture: list is separated by spaces not commas. + + -- Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de> Wed, 2 Jun 1999 13:16:28 +0200 + +libpaper (1.0.3-12.1) unstable; urgency=low + + * Added support for arm architecture in config.guess + + -- Tor Slettnes <tor@slett.net> Mon, 22 Mar 1999 17:40:50 -0800 + +libpaper (1.0.3-12) unstable; urgency=low + + * Added sparc among the libc5 compat architectures in debian/rules + (Closes: Bug#30173) + * Now function systempapername return the paper name in the correct + case (Closes: Bug#29911) + + -- Marco Pistore <pistore@di.unipi.it> Tue, 8 Dec 1998 09:50:04 +0100 + +libpaper (1.0.3-11) unstable; urgency=low + + * added some "|| true" in the paperconfig script, so that it does not + fail even if called with "bash -e" (closes: Bug#26014) + + -- Marco Pistore <pistore@di.unipi.it> Sat, 22 Aug 1998 15:39:30 +0200 + +libpaper (1.0.3-10) unstable frozen; urgency=low + + * Now libpaper does not depend anymore on libpaperg (this was + the release critical bug#22942). In previous versions, the + dependency was added so that the executables /usr/bin/paperconf and + /usr/sbin/paperconfig (that were present only in libpaperg), could + be used also from the old (i.e., bo) packages that depends on libpaper + (in bo, libpaper provided both the libraries and the executables, + so both of them should be provided to a package that depends on libpaper). + Now, the executables are present in both packages, and libpaperg + uses dpkg-divert to "move away" the libpaper binaries when + libpaperg is installed (closes: Bug#22942) + * Removed "sparc" in debian/rules from the libraries that require + libc5 support (closes: Bug#22082) + * Added some new #include in the source (changes in the c headers?) + + -- Marco Pistore <pistore@di.unipi.it> Sun, 14 Jun 1998 20:02:11 +0200 + +libpaper (1.0.3-9) unstable frozen; urgency=low + + * I forgot to upload previous version also to FROZEN! + BRIAN, please include this in HAMM, since it closes a bug (20566) + and assures that copyright appears in /usr/doc/libpaper. + + -- Marco Pistore <pistore@di.unipi.it> Sun, 5 Apr 1998 19:18:00 +0200 + +libpaper (1.0.3-8) unstable; urgency=low + + * Now paperconfig converts the given paper name into the correctly + capitalized name. I.e., "paperconfig -p LeTtEr" sets the system paper + to "letter" (closes: Bug#20566). + * Now paperconfig uses /usr/bin/pager as default pager if ${PAGER} is + unset. + * Changelogs and copyright now appear also in the libc5 package. + /usr/doc/libpaper is no more a link to /usr/doc/libpaperg; hence + in the preinst script of the libc5 package the link is transformed + into a void directory if needed. + + -- Marco Pistore <pistore@di.unipi.it> Fri, 3 Apr 1998 23:23:01 +0200 + +libpaper (1.0.3-7) unstable frozen; urgency=low + + * Only the shared libs are compiled with -fPIC and all libs are + compiled with -D_REENTRANT + * Corrected wrong permissions for some files + * Docs of libc6 version are now in libpaperg + * Symlinks have been fixed + * /etc/papersize is removed on purge + * ldconfig is called in postinst and postrm + + -- Marco Pistore <pistore@di.unipi.it> Thu, 12 Mar 1998 23:52:53 +0100 + +libpaper (1.0.3-6) unstable; urgency=low + + * Modified debian/rules so that the "build" target works correctly + (bug 15827) + * Added options to paperconf to use centimetres, millimetres and inches + as units for paper size (bug 5928) + + -- Marco Pistore <pistore@di.unipi.it> Sun, 11 Jan 1998 17:49:55 +0100 + +libpaper (1.0.3-5) unstable; urgency=low + + * Corrected many man pages, so that "which" works with the .so + directive (bugs 4993 and 12121) + * Now shared libraries are strippend with --strip-unneeded + (bugs 5133 and 8310) + * Small changes in the README files (bug 7833) + * Fixed security hole in paperconfig (superuser uses file in /tmp: + bug 11607) + * File "configure" regenerated with a more recent version of autoconf + + -- Marco Pistore <pistore@di.unipi.it> Mon, 27 Oct 1997 23:54:51 +0100 + +libpaper (1.0.3-4) unstable; urgency=low + + * Libc6 (hamm) version + * Now we have two binary packages: + - libpaperg (which is like the old libpaper packages, but it is + compiled for libc6 libraries), and + - libpaper (which contains static and shared libraries compiled + for libc5) + * The debian/* files have been largely rewritten + * Small changes in Makefile.in + * /etc/papersize is now a conffile + + -- Marco Pistore <pistore@di.unipi.it> Fri, 26 Sep 1997 19:06:24 +0200 + +libpaper (1.0.3-3) unstable; urgency=LOW + + * Suppressed the error message output produced by the call to paperconf + in the paperconfig script. + + -- Yves Arrouye <Yves.Arrouye@marin.fdn.fr> Sat, 28 Sep 1996 11:54:58 +0200 + +libpaper (1.0.3-2) unstable; urgency=LOW + + * Removed the overriden CFLAGS and LDFLAGS in debian/rules (fixes bug + #4581). + + -- Yves Arrouye <Yves.Arrouye@marin.fdn.fr> Wed, 25 Sep 1996 09:04:30 +0200 + +libpaper (1.0.3-1) unstable; urgency=LOW + + * Put a call to ldconfig back into postinst. + * Put the manpage suffix paper back (so we have xxx.3paper). + * Upgraded to libpaper 1.0.3 which has a complete set of manual + pages. + + -- Yves Arrouye <Yves.Arrouye@marin.sevy.fr> Tue, 24 Sep 1996 07:49:30 +0200 + +libpaper (1.0.2-3) unstable; urgency=LOW + + * Removed the call to ldconfig in the postrm, since the library and its + symbolic mode are in the correct order. + + -- Yves Arrouye <Yves.Arrouye@marin.fdn.fr> Tue, 17 Sep 1996 19:27:59 +0200 + +libpaper (1.0.2-2) unstable; urgency=LOW + + * Switched to the new source format. + * Corrected Makefile.in for clean target. + + -- Yves Arrouye <arrouye@marin.sevy.fr> Thu, 5 Sep 1996 11:49:05 +0200 + +libpaper (1.0.1-2) unstable; urgency=LOW + + * Renamed PAPER env. var to PAPERCONF. + * Changes in paperconfig(8) to unset the PAPERCONF variable, to use the + file specified by the $PAPERSIZE variable and to rewrite the file + only when really needed. + * The postinst does not ask if whitespace and comments should be removed + because paperconfig(8) handles that. + + -- Yves Arrouye <arrouye@marin.sevy.fr> Thu, 5 Sep 1996 11:21:52 +0200 + +libpaper (1.0.1-1) unstable; urgency=LOW + + * Corrected bug #4139 (/etc/papersize was a conffile modified by + scripts) and added paperconfig(8). + * Renamed paper(1) to paperconf(1) (fixes bugs #4137 and #4138). + * Removed postrm which called ldconfig(8) (fixes bug #4251). + * Added TODO file. + + -- Yves Arrouye <arrouye@marin.sevy.fr> Sat, 24 Aug 1996 11:22:56 +0200 + + + diff --git a/Build/source/libs/libpaper/libpaper-src/config.h.in b/Build/source/libs/libpaper/libpaper-src/config.h.in deleted file mode 100644 index 66e89084033..00000000000 --- a/Build/source/libs/libpaper/libpaper-src/config.h.in +++ /dev/null @@ -1,73 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Default configuration file location */
-#undef PAPERCONF
-
-/* Environment variable that overrides the default configuration file location
- */
-#undef PAPERCONFVAR
-
-/* Default paper size */
-#undef PAPERSIZE
-
-/* Environment variable that overrides the defaultpaper size */
-#undef PAPERSIZEVAR
-
-/* Default directory for run-parts */
-#undef RUNPARTSDIR
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
diff --git a/Build/source/libs/libpaper/libpaper-src/configure.ac b/Build/source/libs/libpaper/libpaper-src/configure.ac index cc5bacc7101..4d80bc57f84 100644 --- a/Build/source/libs/libpaper/libpaper-src/configure.ac +++ b/Build/source/libs/libpaper/libpaper-src/configure.ac @@ -1,66 +1,66 @@ -dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([libpaper], [1.1.9])
-AC_CONFIG_SRCDIR([configure.ac])
-AM_INIT_AUTOMAKE([no-define])
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-dnl Check for standard build environment
-dnl ====================================
-AC_PROG_CC
-AC_GNU_SOURCE
-AC_PROG_INSTALL
-AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-dnl Complier features
-dnl =================
-AC_C_CONST
-
-dnl set up some substitutions
-dnl =========================
-PAPERCONF="${sysconfdir}/papersize"
-AC_SUBST(PAPERCONF)
-AH_TEMPLATE(PAPERCONF, [Default configuration file location])
-AC_DEFINE_UNQUOTED(PAPERCONF, "$PAPERCONF")
-
-PAPERCONFVAR=PAPERCONF
-AC_SUBST(PAPERCONFVAR)
-AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default configuration file location])
-AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR")
-
-PAPERSIZE=letter
-AC_SUBST(PAPERSIZE)
-AH_TEMPLATE(PAPERSIZE, [Default paper size])
-AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE")
-
-RUNPARTSDIR="${sysconfdir}/libpaper.d"
-AC_SUBST(RUNPARTSDIR)
-AH_TEMPLATE(RUNPARTSDIR, [Default directory for run-parts])
-AC_DEFINE_UNQUOTED(RUNPARTSDIR, "$RUNPARTSDIR")
-
-RUNPARTSDIRVAR=PAPERDIR
-AC_SUBST(RUNPARTSDIRVAR)
-AH_TEMPLATE(RUNPARTSDIRVAR, [Environment variable that overrides the default directory for run-parts])
-AC_DEFINE_UNQUOTED(RUNPARTSDIRVAR, "$RUNPARTSDIRVAR")
-
-PAPERSIZEVAR=PAPERSIZE
-AC_SUBST(PAPERSIZEVAR)
-AH_TEMPLATE(PAPERSIZEVAR, [Environment variable that overrides the default paper size])
-AC_DEFINE_UNQUOTED(PAPERSIZEVAR, "$PAPERSIZEVAR")
-
-dnl Create files
-dnl ============
-AC_OUTPUT([
- Makefile
- lib/Makefile
- src/Makefile
- src/paperconfig
- man/Makefile
- man/paperconf.1
- man/paperconfig.8
- man/papersize.5
- man/systempapername.3
-])
-
+dnl Process this file with autoconf to produce a configure script. + +AC_INIT([libpaper], [1.1.27]) +AC_CONFIG_SRCDIR([configure.ac]) +AM_INIT_AUTOMAKE([no-define]) +AM_CONFIG_HEADER(config.h) +AM_MAINTAINER_MODE + +dnl Check for standard build environment +dnl ==================================== +AC_PROG_CC +AC_GNU_SOURCE +AC_PROG_INSTALL +AM_PROG_LIBTOOL +AC_PROG_MAKE_SET + +dnl Complier features +dnl ================= +AC_C_CONST + +dnl set up some substitutions +dnl ========================= +PAPERCONF="${sysconfdir}/papersize" +AC_SUBST(PAPERCONF) +AH_TEMPLATE(PAPERCONF, [Default configuration file location]) +AC_DEFINE_UNQUOTED(PAPERCONF, "$PAPERCONF") + +PAPERCONFVAR=PAPERCONF +AC_SUBST(PAPERCONFVAR) +AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default configuration file location]) +AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR") + +PAPERSIZE=letter +AC_SUBST(PAPERSIZE) +AH_TEMPLATE(PAPERSIZE, [Default paper size]) +AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE") + +RUNPARTSDIR="${sysconfdir}/libpaper.d" +AC_SUBST(RUNPARTSDIR) +AH_TEMPLATE(RUNPARTSDIR, [Default directory for run-parts]) +AC_DEFINE_UNQUOTED(RUNPARTSDIR, "$RUNPARTSDIR") + +RUNPARTSDIRVAR=PAPERDIR +AC_SUBST(RUNPARTSDIRVAR) +AH_TEMPLATE(RUNPARTSDIRVAR, [Environment variable that overrides the default directory for run-parts]) +AC_DEFINE_UNQUOTED(RUNPARTSDIRVAR, "$RUNPARTSDIRVAR") + +PAPERSIZEVAR=PAPERSIZE +AC_SUBST(PAPERSIZEVAR) +AH_TEMPLATE(PAPERSIZEVAR, [Environment variable that overrides the default paper size]) +AC_DEFINE_UNQUOTED(PAPERSIZEVAR, "$PAPERSIZEVAR") + +dnl Create files +dnl ============ +AC_OUTPUT([ + Makefile + lib/Makefile + src/Makefile + src/paperconfig + man/Makefile + man/paperconf.1 + man/paperconfig.8 + man/papersize.5 + man/systempapername.3 +]) + diff --git a/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am b/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am index 028abaa59a2..3375cc05d38 100644 --- a/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-src/lib/Makefile.am @@ -1,21 +1,21 @@ -
-lib_LTLIBRARIES = libpaper.la
-libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h
-libpaper_la_LDFLAGS = -version-info 2:2:1
-libpaper_la_CPPFLAGS = -D_REENTRANT
-
-BUILT_SOURCES = paperspecs.h
-
-include_HEADERS = paper.h
-
-EXTRA_DIST = paperspecs
-
-paperspecs.h: paperspecs Makefile
- echo ' /* This file has been automaticaly generated.' >$@
- echo ' Edit paperspecs to make changes to the papers specifications. */' >>$@
- echo >>$@
- env LANG=C LC_ALL=C awk '{ factor = 1.0; \
- if ($$4 == "mm") factor = 72.0 / 25.4; \
- if ($$4 == "in") factor = 72.0; \
- printf(" { \"%s\", %5f, %5f },\n", \
- $$1, $$2 * factor, $$3 * factor); }' < $< >> $@
+ +lib_LTLIBRARIES = libpaper.la +libpaper_la_SOURCES = dimen.c paper.c dimen.h paperspecs.h +libpaper_la_LDFLAGS = -version-info 2:2:1 +libpaper_la_CPPFLAGS = -D_REENTRANT + +BUILT_SOURCES = paperspecs.h + +include_HEADERS = paper.h + +EXTRA_DIST = paperspecs + +paperspecs.h: paperspecs Makefile + echo ' /* This file has been automaticaly generated.' >$@ + echo ' Edit paperspecs to make changes to the papers specifications. */' >>$@ + echo >>$@ + env LANG=C LC_ALL=C awk '{ factor = 1.0; \ + if ($$4 == "mm") factor = 72.0 / 25.4; \ + if ($$4 == "in") factor = 72.0; \ + printf(" { \"%s\", %5f, %5f },\n", \ + $$1, $$2 * factor, $$3 * factor); }' < $< >> $@ diff --git a/Build/source/libs/libpaper/libpaper-src/lib/paperspecs b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs index 6be0a46dc3a..f7f40fa92cc 100644 --- a/Build/source/libs/libpaper/libpaper-src/lib/paperspecs +++ b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs @@ -35,7 +35,7 @@ b9 44 62 mm b10 31 44 mm c2 458 648 mm c3 324 458 mm -c4 229 354 mm +c4 229 324 mm c5 162 229 mm c6 114 162 mm c7 81 114 mm diff --git a/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h index a94ec36dafb..3fc97ee7ecd 100644 --- a/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h +++ b/Build/source/libs/libpaper/libpaper-src/lib/paperspecs.h @@ -38,7 +38,7 @@ { "b10", 87.874016, 124.724409 }, { "c2", 1298.267717, 1836.850394 }, { "c3", 918.425197, 1298.267717 }, - { "c4", 649.133858, 1003.464567 }, + { "c4", 649.133858, 918.425197 }, { "c5", 459.212598, 649.133858 }, { "c6", 323.149606, 459.212598 }, { "c7", 229.606299, 323.149606 }, diff --git a/Build/source/libs/libpaper/libpaper-src/man/Makefile.am b/Build/source/libs/libpaper/libpaper-src/man/Makefile.am index 6a86233affd..f9d579a645c 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-src/man/Makefile.am @@ -1,25 +1,25 @@ -man_MANS = \
- paperconf.1 \
- defaultpapername.3 \
- defaultpapersizefile.3 \
- paperdone.3 \
- paperfirst.3 \
- paperinfo.3 \
- paperinit.3 \
- paperlast.3 \
- papernext.3 \
- paperprev.3 \
- paperpsheight.3 \
- paperpsname.3 \
- paperpswidth.3 \
- paperwithsize.3 \
- systempapername.3 \
- systempapersizefile.3 \
- papersize.5 \
- paperconfig.8
-
-EXTRA_DIST = \
- paperconf.1.in \
- systempapername.3.in \
- papersize.5.in \
- paperconfig.8.in
+man_MANS = \ + paperconf.1 \ + defaultpapername.3 \ + defaultpapersizefile.3 \ + paperdone.3 \ + paperfirst.3 \ + paperinfo.3 \ + paperinit.3 \ + paperlast.3 \ + papernext.3 \ + paperprev.3 \ + paperpsheight.3 \ + paperpsname.3 \ + paperpswidth.3 \ + paperwithsize.3 \ + systempapername.3 \ + systempapersizefile.3 \ + papersize.5 \ + paperconfig.8 + +EXTRA_DIST = \ + paperconf.1.in \ + systempapername.3.in \ + papersize.5.in \ + paperconfig.8.in diff --git a/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3 b/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3 index 32199b5702f..882f4bbf27e 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/defaultpapername.3 @@ -1,2 +1,2 @@ -.so man3/systempapername.3
-
+.so man3/systempapername.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3 b/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3 index b3c0e4823cf..390a56bdfeb 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/defaultpapersizefile.3 @@ -1,2 +1,2 @@ -.so man3/systempapersizefile.3
-
+.so man3/systempapersizefile.3 + 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 243881cbc57..53cecd83bdd 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in +++ b/Build/source/libs/libpaper/libpaper-src/man/paperconf.1.in @@ -1,76 +1,76 @@ -.TH PAPERCONF 1 "25 October 2013"
-.SH NAME
-.B paperconf
-\- print paper configuration information
-.SH SYNOPSIS
-\fBpaperconf\fR
-[\fB\-z\fR]
-[\fB\-n\fR|\fB\-N\fR]
-[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR]
-[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR]
-[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR]
-.SH DESCRIPTION
-.B paperconf
-prints information about a given paper.
-The information that can be obtained is the name of the paper, its
-size and its width or height.
-When called without arguments,
-.B paperconf
-prints the name of the system- or user-specified paper, obtained by
-looking in order at the
-.B @PAPERSIZEVAR@
-environment variable
-or by using
-.B a4
-as a fall-back value.
-By default, width and height of the paper are printed in PostScript points.
-.SH OPTIONS
-.TP
-.BI \-p " paper"
-Specify the name of the
-.I paper
-about which information is asked.
-.TP
-.B \-d
-Use the default builtin paper name.
-.TP
-.B \-a
-Consider all known paper names.
-.TP
-.B \-z
-If the paper name is unknown, print it but issue a message on the
-standard error and exit with a non-zero code.
-.TP
-.B \-n
-Print the name of the paper.
-.TP
-.B \-N
-Print the name of the paper with the first letter capitalized.
-.TP
-.B \-s
-Print the size (width followed by height) of the paper.
-.TP
-.B \-w
-Print the width of the paper.
-.TP
-.B \-h
-Print the height of the paper.
-.TP
-.B \-c
-Use centimetres as unit for paper size.
-.TP
-.B \-m
-Use millimetres as unit for paper size.
-.TP
-.B \-i
-Use inches as unit for paper size.
-
-.SH ENVIRONMENT
-.TP 20
-.B @PAPERSIZEVAR@
-Paper size to use.
-.SH AUTHOR
-Yves Arrouye <arrouye@debian.org>
-
-Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-
+.TH PAPERCONF 1 "25 October 2013" +.SH NAME +.B paperconf +\- print paper configuration information +.SH SYNOPSIS +\fBpaperconf\fR +[\fB\-z\fR] +[\fB\-n\fR|\fB\-N\fR] +[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR] +[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR] +[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR] +.SH DESCRIPTION +.B paperconf +prints information about a given paper. +The information that can be obtained is the name of the paper, its +size and its width or height. +When called without arguments, +.B paperconf +prints the name of the system- or user-specified paper, obtained by +looking in order at the +.B @PAPERSIZEVAR@ +environment variable +or by using +.B a4 +as a fall-back value. +By default, width and height of the paper are printed in PostScript points. +.SH OPTIONS +.TP +.BI \-p " paper" +Specify the name of the +.I paper +about which information is asked. +.TP +.B \-d +Use the default builtin paper name. +.TP +.B \-a +Consider all known paper names. +.TP +.B \-z +If the paper name is unknown, print it but issue a message on the +standard error and exit with a non-zero code. +.TP +.B \-n +Print the name of the paper. +.TP +.B \-N +Print the name of the paper with the first letter capitalized. +.TP +.B \-s +Print the size (width followed by height) of the paper. +.TP +.B \-w +Print the width of the paper. +.TP +.B \-h +Print the height of the paper. +.TP +.B \-c +Use centimetres as unit for paper size. +.TP +.B \-m +Use millimetres as unit for paper size. +.TP +.B \-i +Use inches as unit for paper size. + +.SH ENVIRONMENT +.TP 20 +.B @PAPERSIZEVAR@ +Paper size to use. +.SH AUTHOR +Yves Arrouye <arrouye@debian.org> + +Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org> + 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 c462441f202..47e1aeebf12 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in +++ b/Build/source/libs/libpaper/libpaper-src/man/paperconfig.8.in @@ -1,73 +1,77 @@ -.\" paperconfig.8, Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>
-.TH PAPERCONFIG 8 "5 January 2005" "Debian/Linux" "Linux Administrator's Manual"
-.SH NAME
-.B paperconfig
-\- configure the system default paper size
-.SH SYNOPSIS
-.B paperconfig
-[
-.BR \-v\fP, \fB\-\-version
-]
-[
-.BR \-h\fP, \fB\-\-help
-]
-[
-.BI "\-p\fP, \fB\-\-paper" " papername"
-|
-.B \-\-force
-]
-.SH DESCRIPTION
-.B paperconfig
-sets the system (or default) paper to be used by tools using the
-.B papersize
-file.
-It can either ask interactively for the paper to use or be called
-non-interactively by scripts.
-.PP
-When the paper size has been changed,
-.B paperconfig
-notifies other packages of the change by running the scripts in the
-.I @RUNPARTSDIR@
-directory.
-.SH OPTIONS
-.TP
-.BR \-v\fP, \fB\-\-version
-Print the version of
-.B paperconfig
-and exit.
-.TP
-.BR \-h\fP, \fB\-\-help
-Print help about usage and exit.
-.TP
-.BI "\-p\fP, \fB\-\-paper" " papername"
-Use
-.I papername
-if possible. If
-.I papername
-is not a valid paper, print an error message and exit.
-.TP
-.B \-\-force
-Force interactive selection of the system paper even if the actual paper
-is a valid one.
-.SH ENVIRONMENT
-.B PAPERCONF
-Full path to a file containing the paper size to use; this file will
-be rewritten with the system paper size.
-.SH FILES
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used
-if the
-.B @PAPERSIZEVAR@
-variable is not set.
-.TP 20
-.B @RUNPARTSDIR@
-Directory of scripts to run after the paper size has been changed.
-This package puts no scripts here, but other packages may.
-.SH AUTHOR
-Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR paperconf (1)
-.br
-.BR papersize (5)
-
+.\" paperconfig.8, Copyright (C) 1996, Yves Arrouye <arrouye@debian.org> +.TH PAPERCONFIG 8 "5 January 2005" "Debian/Linux" "Linux Administrator's Manual" +.SH NAME +.B paperconfig +\- configure the system default paper size +.SH SYNOPSIS +.B paperconfig +[ +.BR \-v\fP, \fB\-\-version +] +[ +.BR \-h\fP, \fB\-\-help +] +[ +.BI "\-p\fP, \fB\-\-paper" " papername" +| +.B \-\-force +] +.SH DESCRIPTION +.B paperconfig +sets the system (or default) paper to be used by tools using the +.B papersize +file. +It can either ask interactively for the paper to use or be called +non-interactively by scripts. +.PP +When the paper size has been changed, +.B paperconfig +notifies other packages of the change by running the scripts in the +.I @RUNPARTSDIR@ +directory. +.SH OPTIONS +.TP +.BR \-v\fP, \fB\-\-version +Print the version of +.B paperconfig +and exit. +.TP +.BR \-h\fP, \fB\-\-help +Print help about usage and exit. +.TP +.BI "\-p\fP, \fB\-\-paper" " papername" +Use +.I papername +if possible. If +.I papername +is not a valid paper, print an error message and exit. +.TP +.B \-\-force +Force interactive selection of the system paper even if the actual paper +is a valid one. +.SH ENVIRONMENT +.B PAPERCONF +Full path to a file containing the paper size to use; this file will +be rewritten with the system paper size. +.SH FILES +.TP 20 +.B @PAPERCONF@ +Contains the name of the system-wide default paper size to be used +if the +.B @PAPERSIZEVAR@ +variable is not set. +.TP 20 +.B @RUNPARTSDIR@ +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 +.B run-part's +naming requirements. +.SH AUTHOR +Yves Arrouye <arrouye@debian.org> +.SH SEE ALSO +.BR paperconf (1) +.br +.BR papersize (5) + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperdone.3 b/Build/source/libs/libpaper/libpaper-src/man/paperdone.3 index 0ac16967590..d1098b8c116 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperdone.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperdone.3 @@ -1,2 +1,2 @@ -.so man3/paperinit.3
-
+.so man3/paperinit.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3 b/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperfirst.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3 b/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3 index 3b59bc9579f..68f5bf75f98 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperinfo.3 @@ -1,65 +1,65 @@ -.TH PAPERINFO 3 "24 September 1996"
-.SH NAME
-paperinfo, paperwithsize, paperfirst, paperlast, papernext, paperprev
-\- return informations about a paper
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "const struct paper* paperinfo(const char* papername)"
-.B "const struct paper* paperwithsize(double psw, double psh)"
-.sp
-.B "char* papername(const struct paper*)"
-.B "double paperpswidth(const struct paper*)"
-.B "double paperpsheigth(const struct paper*)"
-.sp
-.B "const struct paper* paperfirst(void)"
-.B "const struct paper* papernext(const struct paper* pinfo)"
-.B "const struct paper* paperprev(const struct paper* pinfo)"
-.B "const struct paper* paperlast(void)"
-.fi
-.SH DESCRIPTION
-.B paperinfo()
-returns a pointer to a
-.B struct paper
-containing informations about the paper with name
-.B papername
-.
-.B paperwithsize()
-looks for a paper whose width and height is
-.B psw
-and
-.B psh
-in PostScript points, and return a pointer to a
-.B struct paper
-corresponding to the paper found.
-.PP
-.B papername()
-returns the name of a paper described by an opaque struct paper object
-.
-.B paperpswidth()
-returns the width, in PostScript points, of a paper described by an
-opaque struct paper object
-.
-.B paperpsheight()
-returns the height, in PostScript points, of a paper described by an
-opaque struct paper object
-.
-.PP
-.B paperfirst()
-and
-.B paperlast()
-return the first and last entries for papers.
-Iteration from one entry to the next or the previous one can be done
-with
-.B papernext()
-and
-.B paperprev()
-respectively.
-.SH SEE ALSO
-.BR paperinit (3),
-.BR paperdone (3)
-.BR defaultpapername (3)
-.br
-.BR papersize (5)
-
+.TH PAPERINFO 3 "24 September 1996" +.SH NAME +paperinfo, paperwithsize, paperfirst, paperlast, papernext, paperprev +\- return informations about a paper +.SH SYNOPSYS +.nf +.B #include <paper.h> +.sp +.B "const struct paper* paperinfo(const char* papername)" +.B "const struct paper* paperwithsize(double psw, double psh)" +.sp +.B "char* papername(const struct paper*)" +.B "double paperpswidth(const struct paper*)" +.B "double paperpsheigth(const struct paper*)" +.sp +.B "const struct paper* paperfirst(void)" +.B "const struct paper* papernext(const struct paper* pinfo)" +.B "const struct paper* paperprev(const struct paper* pinfo)" +.B "const struct paper* paperlast(void)" +.fi +.SH DESCRIPTION +.B paperinfo() +returns a pointer to a +.B struct paper +containing informations about the paper with name +.B papername +. +.B paperwithsize() +looks for a paper whose width and height is +.B psw +and +.B psh +in PostScript points, and return a pointer to a +.B struct paper +corresponding to the paper found. +.PP +.B papername() +returns the name of a paper described by an opaque struct paper object +. +.B paperpswidth() +returns the width, in PostScript points, of a paper described by an +opaque struct paper object +. +.B paperpsheight() +returns the height, in PostScript points, of a paper described by an +opaque struct paper object +. +.PP +.B paperfirst() +and +.B paperlast() +return the first and last entries for papers. +Iteration from one entry to the next or the previous one can be done +with +.B papernext() +and +.B paperprev() +respectively. +.SH SEE ALSO +.BR paperinit (3), +.BR paperdone (3) +.BR defaultpapername (3) +.br +.BR papersize (5) + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperinit.3 b/Build/source/libs/libpaper/libpaper-src/man/paperinit.3 index fd69167ea16..e1f71dfdf99 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperinit.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperinit.3 @@ -1,27 +1,27 @@ -.TH PAPERINIT 3 "24 September 1996"
-.SH NAME
-paperinit, paperdone \- begin and end using the paper library
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "void paperinit(void)"
-.B "void paperdone(void)"
-.fi
-.SH DESCRIPTION
-.B paperinit()
-initializes the paper library, allocating any resources that are
-necessary for its use.
-This function must be called before any other function of the paper
-library is used.
-.PP
-.B paperdone()
-frees any resources that were allocated for the paper library.
-No function of the library should be called after a call to this
-function.
-.SH SEE ALSO
-.BR defaultpapername (3),
-.BR paperinfo (3)
-.br
-.BR papersize (5)
-
+.TH PAPERINIT 3 "24 September 1996" +.SH NAME +paperinit, paperdone \- begin and end using the paper library +.SH SYNOPSYS +.nf +.B #include <paper.h> +.sp +.B "void paperinit(void)" +.B "void paperdone(void)" +.fi +.SH DESCRIPTION +.B paperinit() +initializes the paper library, allocating any resources that are +necessary for its use. +This function must be called before any other function of the paper +library is used. +.PP +.B paperdone() +frees any resources that were allocated for the paper library. +No function of the library should be called after a call to this +function. +.SH SEE ALSO +.BR defaultpapername (3), +.BR paperinfo (3) +.br +.BR papersize (5) + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperlast.3 b/Build/source/libs/libpaper/libpaper-src/man/paperlast.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperlast.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperlast.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/papernext.3 b/Build/source/libs/libpaper/libpaper-src/man/papernext.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/papernext.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/papernext.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperprev.3 b/Build/source/libs/libpaper/libpaper-src/man/paperprev.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperprev.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperprev.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperpsheight.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperpsname.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3 b/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperpswidth.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + 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 d553909ad71..f0f71934890 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in +++ b/Build/source/libs/libpaper/libpaper-src/man/papersize.5.in @@ -1,63 +1,63 @@ -.TH PAPERSIZE 5
-.SH NAME
-.B papersize
-\- specify preferred paper size
-.SH SYNOPSYS
-.B @PAPERCONF@
-.SH DESCRIPTION
-The
-.B papersize
-file is used to specify the preferred paper size to use by available
-commands and programs generating documents.
-.PP
-The format of this file is extremely simple: whitespace and anything
-starting with `#' is ignored, and the name of the paper is the first
-string found; the case in the name of the paper does not import (see
-.B CAVEATS
-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
-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 10x14 .
-.PP
-The value of the
-.B papersize
-file can be overrideen by
-looking in order at the
-.B @PAPERSIZEVAR@
-environment variable, then at the contents of the file specified by the
-.B @PAPERCONFVAR@
-environment variable. If the
-.B papersize
-file does not exist, programs using the paper library default to using
-.B letter
-as a fall-back value
-.SH CAVEATS
-This manual page documents the format of the
-.B papersize
-file that is read by the
-.B libpaper
-library.
-Some programs that read this file do not yet use the library and may have
-trouble ignoring whitespace and comments in the file; they may also
-require that the paper names use a specific capitalization.
-.SH DOCUMENTATION
-Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR paperconf (1)
-.br
-.BR paperconfig (8)
-
-
+.TH PAPERSIZE 5 +.SH NAME +.B papersize +\- specify preferred paper size +.SH SYNOPSYS +.B @PAPERCONF@ +.SH DESCRIPTION +The +.B papersize +file is used to specify the preferred paper size to use by available +commands and programs generating documents. +.PP +The format of this file is extremely simple: whitespace and anything +starting with `#' is ignored, and the name of the paper is the first +string found; the case in the name of the paper does not import (see +.B CAVEATS +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 +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 10x14 . +.PP +The value of the +.B papersize +file can be overrideen by +looking in order at the +.B @PAPERSIZEVAR@ +environment variable, then at the contents of the file specified by the +.B @PAPERCONFVAR@ +environment variable. If the +.B papersize +file does not exist, programs using the paper library default to using +.B letter +as a fall-back value +.SH CAVEATS +This manual page documents the format of the +.B papersize +file that is read by the +.B libpaper +library. +Some programs that read this file do not yet use the library and may have +trouble ignoring whitespace and comments in the file; they may also +require that the paper names use a specific capitalization. +.SH DOCUMENTATION +Yves Arrouye <arrouye@debian.org> +.SH SEE ALSO +.BR paperconf (1) +.br +.BR paperconfig (8) + + diff --git a/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3 b/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3 index 932aa20a755..0ba4c23059d 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/paperwithsize.3 @@ -1,2 +1,2 @@ -.so man3/paperinfo.3
-
+.so man3/paperinfo.3 + diff --git a/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in b/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in index f77d96e7991..033e0309756 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in +++ b/Build/source/libs/libpaper/libpaper-src/man/systempapername.3.in @@ -1,53 +1,53 @@ -.TH SYSTEMPAPERNAME 3 "17 September 2001"
-.SH NAME
-systempapername, defaultpapername, systempapersizefile,
-defaultpapersizefile \- return names for managing system paper
-information
-.SH SYNOPSYS
-.nf
-.B #include <paper.h>
-.sp
-.B "const char* systempapername(void)"
-.B "const char* defaultpapername(void)"
-.sp
-.B "const char* systempapersizefile(void)"
-.B "const char* defaultpapersizefile(void)"
-.fi
-.SH DESCRIPTION
-.B systempapername()
-returns the name of the default paper to be used by a program.
-This name is obtained by looking in that order at the
-.B @PAPERCONFVAR@
-environment variable, at the contents of the file returned by
-.B systempapersizefile()
-or by using
-.B defaultpapername()
-as a last chance.
-.PP
-.B defaultpapername()
-returns the name of the default paper to use if it is impossible to get
-its name from the environment.
-.PP
-.B systempapersizefile()
-returns the path of the papersize file to use.
-This path is obtained by looking at the
-.B @PAPERCONFVAR@
-environment variable or by calling
-.BR defaultpapersizefile() .
-.PP
-.B defaultpapersizefile
-returns the path of the default papersize file.
-.SH ENVIRONMENT
-.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
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used.
-.SH SEE ALSO
-.BR papersize (5)
-
+.TH SYSTEMPAPERNAME 3 "17 September 2001" +.SH NAME +systempapername, defaultpapername, systempapersizefile, +defaultpapersizefile \- return names for managing system paper +information +.SH SYNOPSYS +.nf +.B #include <paper.h> +.sp +.B "const char* systempapername(void)" +.B "const char* defaultpapername(void)" +.sp +.B "const char* systempapersizefile(void)" +.B "const char* defaultpapersizefile(void)" +.fi +.SH DESCRIPTION +.B systempapername() +returns the name of the default paper to be used by a program. +This name is obtained by looking in that order at the +.B @PAPERCONFVAR@ +environment variable, at the contents of the file returned by +.B systempapersizefile() +or by using +.B defaultpapername() +as a last chance. +.PP +.B defaultpapername() +returns the name of the default paper to use if it is impossible to get +its name from the environment. +.PP +.B systempapersizefile() +returns the path of the papersize file to use. +This path is obtained by looking at the +.B @PAPERCONFVAR@ +environment variable or by calling +.BR defaultpapersizefile() . +.PP +.B defaultpapersizefile +returns the path of the default papersize file. +.SH ENVIRONMENT +.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 +.TP 20 +.B @PAPERCONF@ +Contains the name of the system-wide default paper size to be used. +.SH SEE ALSO +.BR papersize (5) + diff --git a/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3 b/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3 index c7f4c7f9b21..42182084272 100644 --- a/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3 +++ b/Build/source/libs/libpaper/libpaper-src/man/systempapersizefile.3 @@ -1 +1 @@ -.so man3/systempapername.3
+.so man3/systempapername.3 diff --git a/Build/source/libs/libpaper/libpaper-src/src/Makefile.am b/Build/source/libs/libpaper/libpaper-src/src/Makefile.am index 9e608539781..5d7bc85170e 100644 --- a/Build/source/libs/libpaper/libpaper-src/src/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-src/src/Makefile.am @@ -1,8 +1,8 @@ -
-bin_PROGRAMS = paperconf
-paperconf_LDADD = ../lib/libpaper.la
-paperconf_CPPFLAGS = -I$(top_srcdir)/lib
-
-sbin_SCRIPTS = paperconfig
-
-EXTRA_DIST = paperconfig.in
+ +bin_PROGRAMS = paperconf +paperconf_LDADD = ../lib/libpaper.la +paperconf_CPPFLAGS = -I$(top_srcdir)/lib + +sbin_SCRIPTS = paperconfig + +EXTRA_DIST = paperconfig.in diff --git a/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in b/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in index cd04efaa9aa..9548b4aa2f9 100644 --- a/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in +++ b/Build/source/libs/libpaper/libpaper-src/src/paperconfig.in @@ -1,227 +1,227 @@ -#! /bin/sh
-
-# paperconfig: configuration of system paper name
-#
-# Copyright (C) 1996, Yves Arrouye <arrouye@debian.org>
-# 2001, Adrian Bunk <bunk@fs.tum.de>
-
-usage() {
- if [ "$1" = -h ]
- then
- exec 1>&2
- echo -n U
- else
- echo -n u
- fi
-
- echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ -p, --paper name | --force ]"
-
- if [ "$1" = -h ]
- then
- cat <<EOF
-
-Options: -v, --verbose print version information and exit
- -h, --help print this help and exit
- -p, --paper name specify the paper to use
- --force force paper configuration
-EOF
- exit 0
- else
- exit 1
- fi
-}
-
-# "|| true" added below, to assure that the script does not fail even if
-# called with bash -e. (MP 22/08/98)
-
-unset @PAPERSIZEVAR@ || true
-: ${@PAPERCONFVAR@:=@PAPERCONF@}
-export @PAPERCONFVAR@
-
-unset @RUNPARTSDIRVAR@ || true
-: ${@RUNPARTSDIRVAR@:=@RUNPARTSDIR@}
-export @RUNPARTSDIRVAR@
-
-force=0
-
-if [ "$#" -eq 0 ]
- then
- usage
-fi
-
-while [ $# -ne 0 ]
-do
- case "$1" in
- -v|--version)
- echo "`basename $0` version 1.0" \
- "by Yves Arrouye <arrouye@debian.org>"
- exit 0
- ;;
- -h|--help)
- usage -h
- ;;
- -p|--paper)
- test $# -gt 1 || usage
- paper="$2"
- shift
- ;;
- --force)
- force=1
- ;;
- *)
- usage
- ;;
- esac
- shift
-done
-
-invalidpaper() {
- ! paperconf "$1" 2>/dev/null 1>&2
-}
-
-format() {
- _maxwidth=$1; shift
- _start="$1"; shift
-
- _cline=
-
- for w
- do
- if [ `echo "$_start$_cline$w " | wc -c` -ge 0$_maxwidth ]
- then
- echo "$_cline"
- _cline=
- _start=
- fi
- _cline="$_cline$w "
- done
-
- if [ -n "$_cline" ]
- then
- echo "$_cline"
- fi
-
- unset _maxwidth _cline _start
-}
-
-# "chmod 644" added below, to assure that the conf file is created
-# with the right access permissions (MP 13/05/2000)
-
-setpaper() {
- paperright=`paperconf "$1" 2>/dev/null`
-
- ok=0
-
- if 2>/dev/null echo "$paperright" >${@PAPERCONFVAR@}.new
- then
- if 2>/dev/null mv -f ${@PAPERCONFVAR@}.new $@PAPERCONFVAR@
- then
- if 2>/dev/null chmod 644 $@PAPERCONFVAR@
- then
- ok=1
- fi
- fi
- fi
-
- if [ $ok -eq 0 ]
- then
- echo `basename $0`: cannot create $@PAPERCONFVAR@
- exit 2
- else
- #
- # Added code for calling back applications when
- # papersize changes. See bug #345466
- # eppesuig@debian.org, 2006-01-05
- if [ -d ${@RUNPARTSDIRVAR@} ]
- then
- run-parts ${@RUNPARTSDIRVAR@}
- fi
- fi
-}
-
-if [ ! -z "$paper" ]
-then
- if invalidpaper $paper
- then
- >&2 echo `basename $0`: \"$paper\" is not a known paper name
- exit 3
- fi
- setpaper "$paper"
- exit 0
-fi
-
-knownpapers="`paperconf -a`"
-
-prompt=
-width=72
-
-# "|| true" added below, to assure that the script does not fail even if
-# called with bash -e. (MP 22/08/98)
-
-paper=`paperconf 2>/dev/null || true`
-dftpaper=`paperconf -d`
-
-if [ $force -eq 1 ] || [ ! -e $@PAPERCONFVAR@ ] || invalidpaper $paper
-then
- papers="`format $width \"\" $knownpapers`"
- echo
-
- if [ -x /usr/bin/pager ]
- then
- : ${PAGER:=/usr/bin/pager}
- fi
- if [ -x /bin/more ]
- then
- : ${PAGER:=/bin/more}
- fi
- : ${PAGER:=cat}
-
- LESS="-X -E $LESS"
- export LESS
-
- (
- cat <<EOF
-The default (also known as system) paper can be chosen from many known
-papers that are currently recognized by programs using the libpaper
-library (with libpaper, paper names are case insensitive; if you use
-programs that use the system paper size but do not rely on the libpaper
-library, this may not be true and some of the papers listed below may
-not be known by these programs):
-
-EOF
- echo "$papers" | sed 's/^/ /'
- echo
- ) | ${PAGER}
-
- : ${paper:=$dftpaper}
-
- echo -n "Default paper name? [$paper] "
- read ans
- : ${ans:=$paper}
- paper=$ans
-fi
-
-while invalidpaper "$paper"
-do
- if [ -z "$paper" ]
- then
- echo "Please choose a paper from the available papers list."
- else
- echo "Unknow paper \"$paper\"," \
- "please choose one from the available papers list."
- fi
-
- paper=$dftpaper
-
- echo -n "Default paper name? [$paper] "
- read ans
- paper=$ans
-done
-
-if [ "`paperconf 2>/dev/null`" != "$paper" ] || grep -q "[# ]" $@PAPERCONFVAR@
-then
- setpaper "$paper"
-fi
-
-exit 0
-
+#! /bin/sh + +# paperconfig: configuration of system paper name +# +# Copyright (C) 1996, Yves Arrouye <arrouye@debian.org> +# 2001, Adrian Bunk <bunk@fs.tum.de> + +usage() { + if [ "$1" = -h ] + then + exec 1>&2 + echo -n U + else + echo -n u + fi + + echo "sage: `basename $0` [ -v, --version ] [ -h, --help ] [ -p, --paper name | --force ]" + + if [ "$1" = -h ] + then + cat <<EOF + +Options: -v, --verbose print version information and exit + -h, --help print this help and exit + -p, --paper name specify the paper to use + --force force paper configuration +EOF + exit 0 + else + exit 1 + fi +} + +# "|| true" added below, to assure that the script does not fail even if +# called with bash -e. (MP 22/08/98) + +unset @PAPERSIZEVAR@ || true +: ${@PAPERCONFVAR@:=@PAPERCONF@} +export @PAPERCONFVAR@ + +unset @RUNPARTSDIRVAR@ || true +: ${@RUNPARTSDIRVAR@:=@RUNPARTSDIR@} +export @RUNPARTSDIRVAR@ + +force=0 + +if [ "$#" -eq 0 ] + then + usage +fi + +while [ $# -ne 0 ] +do + case "$1" in + -v|--version) + echo "`basename $0` version 1.0" \ + "by Yves Arrouye <arrouye@debian.org>" + exit 0 + ;; + -h|--help) + usage -h + ;; + -p|--paper) + test $# -gt 1 || usage + paper="$2" + shift + ;; + --force) + force=1 + ;; + *) + usage + ;; + esac + shift +done + +invalidpaper() { + ! paperconf "$1" 2>/dev/null 1>&2 +} + +format() { + _maxwidth=$1; shift + _start="$1"; shift + + _cline= + + for w + do + if [ `echo "$_start$_cline$w " | wc -c` -ge 0$_maxwidth ] + then + echo "$_cline" + _cline= + _start= + fi + _cline="$_cline$w " + done + + if [ -n "$_cline" ] + then + echo "$_cline" + fi + + unset _maxwidth _cline _start +} + +# "chmod 644" added below, to assure that the conf file is created +# with the right access permissions (MP 13/05/2000) + +setpaper() { + paperright=`paperconf "$1" 2>/dev/null` + + ok=0 + + if 2>/dev/null echo "$paperright" >${@PAPERCONFVAR@}.new + then + if 2>/dev/null mv -f ${@PAPERCONFVAR@}.new $@PAPERCONFVAR@ + then + if 2>/dev/null chmod 644 $@PAPERCONFVAR@ + then + ok=1 + fi + fi + fi + + if [ $ok -eq 0 ] + then + echo `basename $0`: cannot create $@PAPERCONFVAR@ + exit 2 + else + # + # Added code for calling back applications when + # papersize changes. See bug #345466 + # eppesuig@debian.org, 2006-01-05 + if [ -d ${@RUNPARTSDIRVAR@} ] + then + run-parts ${@RUNPARTSDIRVAR@} + fi + fi +} + +if [ ! -z "$paper" ] +then + if invalidpaper $paper + then + >&2 echo `basename $0`: \"$paper\" is not a known paper name + exit 3 + fi + setpaper "$paper" + exit 0 +fi + +knownpapers="`paperconf -a`" + +prompt= +width=72 + +# "|| true" added below, to assure that the script does not fail even if +# called with bash -e. (MP 22/08/98) + +paper=`paperconf 2>/dev/null || true` +dftpaper=`paperconf -d` + +if [ $force -eq 1 ] || [ ! -e $@PAPERCONFVAR@ ] || invalidpaper $paper +then + papers="`format $width \"\" $knownpapers`" + echo + + if [ -x /usr/bin/pager ] + then + : ${PAGER:=/usr/bin/pager} + fi + if [ -x /bin/more ] + then + : ${PAGER:=/bin/more} + fi + : ${PAGER:=cat} + + LESS="-X -E $LESS" + export LESS + + ( + cat <<EOF +The default (also known as system) paper can be chosen from many known +papers that are currently recognized by programs using the libpaper +library (with libpaper, paper names are case insensitive; if you use +programs that use the system paper size but do not rely on the libpaper +library, this may not be true and some of the papers listed below may +not be known by these programs): + +EOF + echo "$papers" | sed 's/^/ /' + echo + ) | ${PAGER} + + : ${paper:=$dftpaper} + + echo -n "Default paper name? [$paper] " + read ans + : ${ans:=$paper} + paper=$ans +fi + +while invalidpaper "$paper" +do + if [ -z "$paper" ] + then + echo "Please choose a paper from the available papers list." + else + echo "Unknow paper \"$paper\"," \ + "please choose one from the available papers list." + fi + + paper=$dftpaper + + echo -n "Default paper name? [$paper] " + read ans + paper=$ans +done + +if [ "`paperconf 2>/dev/null`" != "$paper" ] || grep -q "[# ]" $@PAPERCONFVAR@ +then + setpaper "$paper" +fi + +exit 0 + diff --git a/Build/source/libs/libpaper/version.ac b/Build/source/libs/libpaper/version.ac index 3304d3fd5c9..9a47c1d7db9 100644 --- a/Build/source/libs/libpaper/version.ac +++ b/Build/source/libs/libpaper/version.ac @@ -1,5 +1,6 @@ dnl -dnl Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright 2013, 2014 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright 2022 Karl Berry <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +9,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current libpaper version -m4_define([libpaper_version], [1.1.24+nmu2]) +m4_define([libpaper_version], [1.1.28]) |