diff -Nru texlive-base-2022.20230122/debian/cfg.d/font-ignore.cfg texlive-base-2022.20230122/debian/cfg.d/font-ignore.cfg --- texlive-base-2022.20230122/debian/cfg.d/font-ignore.cfg 2022-10-11 21:23:42.000000000 +0000 +++ texlive-base-2022.20230122/debian/cfg.d/font-ignore.cfg 2023-02-14 22:41:13.000000000 +0000 @@ -206,10 +206,10 @@ blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-BoldItalic.otf blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Italic.otf blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Regular.otf -recommends;texlive-fonts-extra;fonts-ebgaramond -depends;texlive-fonts-extra-links;fonts-ebgaramond -blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Italic.otf -blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Regular.otf +#recommends;texlive-fonts-extra;fonts-ebgaramond +#depends;texlive-fonts-extra-links;fonts-ebgaramond +#blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Italic.otf +#blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Regular.otf recommends;texlive-fonts-extra;fonts-ebgaramond-extra depends;texlive-fonts-extra-links;fonts-ebgaramond-extra blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond-Initials.otf diff -Nru texlive-base-2022.20230122/debian/changelog texlive-base-2022.20230122/debian/changelog --- texlive-base-2022.20230122/debian/changelog 2023-01-24 22:31:36.000000000 +0000 +++ texlive-base-2022.20230122/debian/changelog 2023-02-15 13:35:08.000000000 +0000 @@ -1,3 +1,17 @@ +texlive-base (2022.20230122-2) unstable; urgency=medium + + [ Jelmer Vernooij ] + * Include package in Vcs-Git/Vcs-Browser header. + + * New texlive-latex-base is incompatible to old + texlive-lang-japanese, add Breaks statement (Closes: #1030622). + * epspdf.tlu: patch from Siep Kroonenberg : + Eliminate faulty check for writability system_tmpdir; + just error out when no tempdir for epspdf can be created. + (Closes: #1029913) + + -- Hilmar Preusse Wed, 15 Feb 2023 14:35:08 +0100 + texlive-base (2022.20230122-1) unstable; urgency=medium * New upstream snapshot. diff -Nru texlive-base-2022.20230122/debian/control texlive-base-2022.20230122/debian/control --- texlive-base-2022.20230122/debian/control 2023-01-24 22:31:36.000000000 +0000 +++ texlive-base-2022.20230122/debian/control 2023-02-15 13:35:08.000000000 +0000 @@ -7,8 +7,8 @@ Build-Depends-Indep: sharutils, tex-common (>= 6.14), findutils (>=4.2.0) Standards-Version: 4.5.1 Homepage: http://www.tug.org/texlive/ -Vcs-Git: https://github.com/debian-tex/texlive-nonbin.git -Vcs-Browser: https://github.com/debian-tex/texlive-nonbin +Vcs-Git: https://github.com/debian-tex/texlive-nonbin.git [texlive-base] +Vcs-Browser: https://github.com/debian-tex/texlive-nonbin/tree/master/texlive-base Package: texlive-base Architecture: all @@ -116,7 +116,7 @@ Depends: ${misc:Depends}, fonts-lmodern, texlive-base (>= 2022.20220405), texlive-base (>= 2022.20220405), texlive-binaries (>= 2022.20220321) Suggests: texlive-latex-base-doc, wp2latex Replaces: texlive-latex-extra (<< 2022.20220923), texlive-latex-recommended (<< 2019.20200205), texlive-latex-recommended (<< 2019.20200225), texlive-latex-recommended (<< 2020.20201203), texlive-latex-recommended (<< 2022.20230122) -Breaks: latexml (<= 0.8.6-4), texlive-base (<< 2022.20220405), texlive-formats-extra (<< 2020.20201129), texlive-latex-extra (<< 2019.20191203), texlive-latex-extra (<< 2022.20220923), texlive-latex-recommended (<< 2019.20191208), texlive-latex-recommended (<< 2019.20200205), texlive-latex-recommended (<< 2019.20200225), texlive-latex-recommended (<< 2020.20201203), texlive-latex-recommended (<< 2022.20230122) +Breaks: latexml (<= 0.8.6-4), texlive-base (<< 2022.20220405), texlive-formats-extra (<< 2020.20201129), texlive-lang-japanese (<= 2022.20221123-1), texlive-latex-extra (<< 2019.20191203), texlive-latex-extra (<< 2022.20220923), texlive-latex-recommended (<< 2019.20191208), texlive-latex-recommended (<< 2019.20200205), texlive-latex-recommended (<< 2019.20200225), texlive-latex-recommended (<< 2020.20201203), texlive-latex-recommended (<< 2022.20230122) Description: TeX Live: LaTeX fundamental packages These packages are either mandated by the core LaTeX team, or very widely used and strongly recommended in practice. diff -Nru texlive-base-2022.20230122/debian/patches/series texlive-base-2022.20230122/debian/patches/series --- texlive-base-2022.20230122/debian/patches/series 2022-11-24 22:32:58.000000000 +0000 +++ texlive-base-2022.20230122/debian/patches/series 2023-02-15 13:16:01.000000000 +0000 @@ -24,3 +24,4 @@ xypic-no-privacy-breach python3-shebang debian-fix-quote-in-quote +update_epspdf_luascript diff -Nru texlive-base-2022.20230122/debian/patches/update_epspdf_luascript texlive-base-2022.20230122/debian/patches/update_epspdf_luascript --- texlive-base-2022.20230122/debian/patches/update_epspdf_luascript 1970-01-01 00:00:00.000000000 +0000 +++ texlive-base-2022.20230122/debian/patches/update_epspdf_luascript 2023-02-15 13:25:59.000000000 +0000 @@ -0,0 +1,233 @@ +Description: Eliminate faulty check for writability system_tmpdir. +Origin: Siep Kroonenberg +Forwarded: No. Patch comes from upstream. +Author: Siep Kroonenberg +Last-Update: 20230214 + +--- texlive-base-2022.20230122.orig/texmf-dist/scripts/epspdf/epspdf.tlu ++++ texlive-base-2022.20230122/texmf-dist/scripts/epspdf/epspdf.tlu +@@ -13,8 +13,11 @@ + some refactoring; better handling of some corner cases + 0.6.5: eliminate .setpdfwrite from ghostscript commandlines, + since this is now considered obsolete ++0.6.5.1: eliminate faulty check for writability system_tmpdir; ++ just error out when no tempdir for epspdf can be created. ++ Avoid spawn for MiKTeX. + +-Copyright (C) 2006-2020 Siep Kroonenberg ++Copyright (C) 2006-2023 Siep Kroonenberg + + siepo at bitmuis nl + +@@ -304,40 +307,8 @@ + return false + end -- find_on_path + +-function dir_writable(d) +- -- because directory attributes do not tell the whole story, +- -- we actually try to create a file in the directory. +- if not lfs.isdir(d) then +- return false +- end +- -- try to create a new file, write to it and delete it afterwards +- for i=1,1000 do +- local s = d .. '/' .. tostring(i) +- if not lfs.isfile(s) then +- local fh = io.open(s, "w") +- if fh then +- fh:write('test') +- fh:close() +- if lfs.isfile(s) then +- if lfs.attributes(s, 'size') > 0 then +- os.remove(s) +- return true +- else +- os.remove(s) +- return false -- open and write resulted in empty file +- end -- lfs.attributes +- else +- return false -- open and write did not result in a file +- end -- lfs.isfile +- end -- fh +- return false -- filename available; could not open for write +- end -- not lfs.isfile +- end -- for +- return false +-end +- + function system_tempdir () +- local d ++ local d = false + if os.type=='windows' then + d = os.getenv('TEMP') + if not d then +@@ -350,9 +321,6 @@ + end + end + -- cygwin: $TEMP=/tmp, root '/' being root of cygwin installation +- if d and not dir_writable(d) then +- d = false +- end + return d + end + +@@ -403,6 +371,20 @@ + return res + end -- tab_combine + ++-- workaround for miktex spawn problem ++function spawnexec(cmd) ++ if is_miktex then ++ if type(cmd)=='table' then ++ return os.execute(table.concat(cmd, ' ')) ++ -- there is no need for quoting in the cases used ++ else ++ return os.execute(cmd) ++ end ++ else ++ return os.spawn(cmd) ++ end ++end ++ + -- files ---------------------------------------------------- + -- Copy a file in chunks, with optional length and offset. + -- Since files may be very large, we copy them piecemeal. +@@ -1547,13 +1529,7 @@ + -- if os.type=='unix' then + cmd = {luatex_prog, '--safer', '--no-shell-escape', textemp} + log_cmd(cmd) +- res = os.spawn(cmd) +- -- else +- -- cmd = luatex_prog..' --safer --no-shell-escape '..textemp +- -- log_cmd({cmd}) +- -- -- os.execute('timeout /t 1 /nobreak >nul') +- -- res = os.execute(cmd) +- -- end ++ res = spawnexec(cmd) + if res and res==0 and lfs.attributes(pdftemp, 'size')>0 then + psp = PsPdf:from_path(pdftemp) + options.bbox = false +@@ -1583,7 +1559,7 @@ + cmd = tab_combine({cmd, pdf_tail_options}) + table.insert(cmd, self.path) + log_cmd(cmd) +- local res = os.spawn(cmd) ++ local res = spawnexec(cmd) + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + psp.pages, psp.miver, psp.maver = pdf_props(psp.path) + options.gray = false +@@ -1623,7 +1599,7 @@ + cmd = tab_combine({cmd, pdf_tail_options}) + table.insert(cmd, self.path) + log_cmd(cmd) +- local res = os.spawn(cmd) ++ local res = spawnexec(cmd) + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + psp.pages, psp.miver, psp.maver = pdf_props(psp.path) + options.gray = false +@@ -1655,10 +1631,9 @@ + -- which are usually harmless and for which I know no easy fix + -- pdftops -q does not do the trick on Windows, + -- and redirection to logfile gives access denied under miktex +- -- res = os.spawn({'cmd', '/c', table.concat(cmd, ' ')..' 2>>'..log_bsl}) + res = os.execute(table.concat(cmd, ' ')..' 2>nul') + else +- res = os.spawn(cmd) ++ res = spawnexec(cmd) + end + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + psp.pages = 1 +@@ -1732,7 +1707,7 @@ + table.insert(cmd, '-sOutputFile='..psp.path) + table.insert(cmd, self.path) + log_cmd(cmd) +- res = os.spawn(cmd) ++ res = spawnexec(cmd) + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + psp.pages = 1 + options.page = false +@@ -1762,7 +1737,7 @@ + cmd = tab_combine({cmd, pdf_tail_options}) + table.insert(cmd, self.path) + log_cmd(cmd) +- local res = os.spawn(cmd) ++ local res = spawnexec(cmd) + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + psp.pages, psp.miver, psp.maver = pdf_props(psp.path) + options.gray = false +@@ -1805,10 +1780,9 @@ + -- which are usually harmless and for which I know no easy fix + -- pdftops -q does not do the trick on Windows, + -- and redirection to logfile gives access denied under miktex +- -- res = os.spawn({'cmd', '/c', table.concat(cmd, ' ')..' 2>>'..log_bsl}) + res = os.execute(table.concat(cmd, ' ')..' 2>nul') + else +- res = os.spawn(cmd) ++ res = spawnexec(cmd) + end + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + options.page = false +@@ -1833,7 +1807,7 @@ + table.insert(cmd, '-sOutputFile#'..psp.path) + table.insert(cmd, self.path) + log_cmd(cmd) +- local res = os.spawn(cmd) ++ local res = spawnexec(cmd) + if res and res==0 and lfs.attributes(psp.path, 'size')>0 then + options.gray = false + return psp +@@ -1901,9 +1875,12 @@ + if settings.pdf_target and (settings.pdf_target~='default') then + table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target) + end +- if settings.pdf_target~='screen' and settings.pdf_target~='ebook' then +- pdf_tail_options = { +- '-c', '<> setdistillerparams', '-f'} ++ if not is_miktex then ++ -- options below cause trouble with unpacked cmd table ++ if settings.pdf_target~='screen' and settings.pdf_target~='ebook' then ++ pdf_tail_options = { ++ '-c', '<> setdistillerparams', '-f'} ++ end + end + end + +@@ -2063,7 +2040,7 @@ + end + if (not need_gs) and options.page then + psp = psp:pdf_crop() +- -- less invasive that page selection by gs ++ -- less invasive than page selection by gs + end + if need_gs then + psp = psp:pdf_to_pdf() -- will handle page selection too +@@ -2395,7 +2372,7 @@ + -- a couple of functions only available during command-line parsing + + local function show_version () +- print('Epspdf version 0.6.4\nCopyright (c) 2006-2019 Siep Kroonenberg') ++ print('Epspdf version 0.6.5.1\nCopyright (c) 2006-2023 Siep Kroonenberg') + end + + local function help (mess) -- requires opts array +@@ -2649,10 +2626,16 @@ + -- a directory under a dedicated temp directory, which has a better chance + -- of getting cleaned up by the system. + +- lfs.chdir(system_tempdir() or out_dir) +- -- no check for failure; we create a subdirectory in +- -- whatever is the current directory +- tempdir = os.tmpdir() ++ for i, d in pairs({system_tempdir(), out_dir}) do ++ if not lfs.chdir(d) then ++ io.stdout:write('cannot cd into '..d..'\n') ++ goto continue ++ end ++ tempdir = os.tmpdir() ++ if not tempdir then goto continue end ++ break ++ ::continue:: ++ end + if not tempdir then + errror('Cannot create directory for temporary files') + end diff -Nru texlive-base-2022.20230122/debian/tpm2deb.cfg texlive-base-2022.20230122/debian/tpm2deb.cfg --- texlive-base-2022.20230122/debian/tpm2deb.cfg 2023-01-23 12:13:18.000000000 +0000 +++ texlive-base-2022.20230122/debian/tpm2deb.cfg 2023-02-06 10:51:17.000000000 +0000 @@ -487,6 +487,11 @@ # Make sure, the incompatible latexml will be removed. breaks;texlive-latex-extra;latexml (<= 0.8.6-5) +# #1030622 +# Make sure, the incompatible texlive-lang-japanese will +# be removed. +breaks;texlive-latex-base;texlive-lang-japanese (<= 2022.20221123-1) + # Suggest Word Perfect2LaTeX converter: wp2latex suggests;texlive-latex-base;wp2latex