[texlive-nonbin] 05/07: update/remove patches for texlive-extra
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit 450d57c1507852cb6afa5e4eaef8facb8247530b
Author: Norbert Preining <preining@debian.org>
Date: Sat Jul 22 21:24:35 2017 +0900
update/remove patches for texlive-extra
---
texlive-extra/debian/changelog | 3 +-
.../debian/patches/epstopdf-remove-pswrite | 12 --------
texlive-extra/debian/patches/fix-algorithm2e | 22 ---------------
.../debian/patches/fix-algorithm2e-latin1 | 21 --------------
texlive-extra/debian/patches/series | 4 ---
.../debian/patches/upstream-fix-contracard | 10 +++----
.../upstream-glossaries-extra-infinite-loop | 32 ----------------------
7 files changed, 7 insertions(+), 97 deletions(-)
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index dd2f112..1c47dfa 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -3,8 +3,9 @@ texlive-extra (2017.20170722-1) unstable; urgency=medium
* new upstream checkout
* tl-extra-utils depends on libunicode-linebreak-perl (Closes: #868012)
* tl-science depends on tl-lang-greek for lgrenc.def (Closes: #778917)
+ * update patches
- -- Norbert Preining <preining@debian.org> Sat, 22 Jul 2017 20:34:17 +0900
+ -- Norbert Preining <preining@debian.org> Sat, 22 Jul 2017 21:24:26 +0900
texlive-extra (2017.20170629-1) unstable; urgency=medium
diff --git a/texlive-extra/debian/patches/epstopdf-remove-pswrite b/texlive-extra/debian/patches/epstopdf-remove-pswrite
deleted file mode 100644
index 9d70b82..0000000
--- a/texlive-extra/debian/patches/epstopdf-remove-pswrite
+++ /dev/null
@@ -1,12 +0,0 @@
-remove pswrite device from epstopdf for new gs (Closes: #797537)
---- a/texmf-dist/scripts/epstopdf/epstopdf.pl.orig 2015-09-10 10:39:49.977155587 +0900
-+++ b/texmf-dist/scripts/epstopdf/epstopdf.pl 2015-09-10 10:40:11.108542077 +0900
-@@ -328,7 +328,7 @@
- planm planc plank
- pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pcx2up
- png16 png16m png256 png48 pngalpha pnggray pngmono
-- psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb
-+ psdf psdcmyk psdrgb pdfwrite ps2write epswrite psgray psmono psrgb
- tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw
- tiffpack tiffgray tiffsep tiffsep1 tiffscaled tiffscaled8 tiffscaled24
- svg svgwrite
diff --git a/texlive-extra/debian/patches/fix-algorithm2e b/texlive-extra/debian/patches/fix-algorithm2e
deleted file mode 100644
index 1fc584b..0000000
--- a/texlive-extra/debian/patches/fix-algorithm2e
+++ /dev/null
@@ -1,22 +0,0 @@
----
- texmf-dist/tex/latex/algorithm2e/algorithm2e.sty | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- texlive-extra-2015.20160117.orig/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
-+++ texlive-extra-2015.20160117/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
-@@ -1058,7 +1058,7 @@
- \DeclareOption{displayblockmarkers}{%
- \setboolean{algocf@displayblockmarkers}{true}%
- }
--\newboolean{algocf@displaygroupmarkers}{\setboolean{algocf@displaygroupmarkers}{false}
-+\newboolean{algocf@displaygroupmarkers}\setboolean{algocf@displaygroupmarkers}{false}
- \DeclareOption{displaygroupmarkers}{%
- \setboolean{algocf@displaygroupmarkers}{true}%
- }
-@@ -3251,4 +3251,4 @@
- %
- %%
- %%%
--%%%% END
-\ No newline at end of file
-+%%%% END
diff --git a/texlive-extra/debian/patches/fix-algorithm2e-latin1 b/texlive-extra/debian/patches/fix-algorithm2e-latin1
deleted file mode 100644
index fbb885f..0000000
--- a/texlive-extra/debian/patches/fix-algorithm2e-latin1
+++ /dev/null
@@ -1,21 +0,0 @@
----
- texmf-dist/tex/latex/algorithm2e/algorithm2e.sty | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- texlive-extra-2016.20170123.orig/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
-+++ texlive-extra-2016.20170123/texmf-dist/tex/latex/algorithm2e/algorithm2e.sty
-@@ -1308,11 +1308,11 @@
- \renewcommand{\listalgorithmcfname}{Algoritma Listesi}%
- \renewcommand{\algorithmcfname}{Algoritma}%
- \renewcommand{\algorithmautorefname}{algoritma}%
--\renewcommand{\algorithmcflinename}{�izgi}%
-+\renewcommand{\algorithmcflinename}{\c{c}izgi}%
- \renewcommand{\algocf@typo}{}%
--\renewcommand{\@algocf@procname}{Prosed�r}%
-+\renewcommand{\@algocf@procname}{Prosed\"{u}r}%
- \renewcommand{\@algocf@funcname}{Fonksiyon}%
--\renewcommand{\procedureautorefname}{prosed�r}%
-+\renewcommand{\procedureautorefname}{prosed\"{u}r}%
- \renewcommand{\functionautorefname}{fonksiyon}%
- \renewcommand{\algocf@languagechoosen}{turkish}%
- }%
diff --git a/texlive-extra/debian/patches/series b/texlive-extra/debian/patches/series
index 8996b7e..9d6bcb8 100644
--- a/texlive-extra/debian/patches/series
+++ b/texlive-extra/debian/patches/series
@@ -3,11 +3,7 @@ ulqda-use-digest-sha
latex2man-mktemp
tmp-dir-for-pdfjam
fix-invoice.sty
-#epstopdf-remove-pswrite
fix-perl522-noise
-fix-algorithm2e
sympytex-path
fix-gbrief-multiple
upstream-fix-contracard
-#upstream-glossaries-extra-infinite-loop
-fix-algorithm2e-latin1
diff --git a/texlive-extra/debian/patches/upstream-fix-contracard b/texlive-extra/debian/patches/upstream-fix-contracard
index 4af96a3..a8a1cd2 100644
--- a/texlive-extra/debian/patches/upstream-fix-contracard
+++ b/texlive-extra/debian/patches/upstream-fix-contracard
@@ -4,7 +4,7 @@
tlpkg/texlive.tlpdb | 2
3 files changed, 780 insertions(+), 780 deletions(-)
---- texlive-extra-2017.20170525.orig/texmf-dist/doc/latex/contracard/contracard.sty
+--- texlive-extra-2017.20170722.orig/texmf-dist/doc/latex/contracard/contracard.sty
+++ /dev/null
@@ -1,779 +0,0 @@
-%%
@@ -787,7 +787,7 @@
-%%
-%% End of file `contracard.sty'.
--- /dev/null
-+++ texlive-extra-2017.20170525/texmf-dist/tex/latex/contracard/contracard.sty
++++ texlive-extra-2017.20170722/texmf-dist/tex/latex/contracard/contracard.sty
@@ -0,0 +1,779 @@
+%%
+%% This is file `contracard.sty',
@@ -1568,9 +1568,9 @@
+%%
+%%
+%% End of file `contracard.sty'.
---- texlive-extra-2017.20170525.orig/tlpkg/texlive.tlpdb
-+++ texlive-extra-2017.20170525/tlpkg/texlive.tlpdb
-@@ -61519,13 +61519,13 @@
+--- texlive-extra-2017.20170722.orig/tlpkg/texlive.tlpdb
++++ texlive-extra-2017.20170722/tlpkg/texlive.tlpdb
+@@ -62436,13 +62436,13 @@
RELOC/doc/latex/contracard/README.md
RELOC/doc/latex/contracard/contracard.lod
RELOC/doc/latex/contracard/contracard.pdf details="Package documentation"
diff --git a/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop b/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop
deleted file mode 100644
index a3fb180..0000000
--- a/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop
+++ /dev/null
@@ -1,32 +0,0 @@
----
- texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty | 17 +++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
---- texlive-extra-2016.20170123.orig/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
-+++ texlive-extra-2016.20170123/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
-@@ -948,10 +948,23 @@
- \@glsxtr@record{#1}{#2}%
- \@glsxtr@org@GLSpl@{#1}{#2}%
- }%
--\let\@glsxtr@org@glsdisp\@glsdisp
- \renewcommand*{\@glsdisp}[3][]{%
- \@glsxtr@record{#1}{#2}%
-- \@glsxtr@org@glsdisp[#1]{#2}{#3}%
-+ \glsdoifexists{#2}{%
-+ \let\do@gls@link@checkfirsthyper\@gls@link@checkfirsthyper
-+ \let\glsifplural\@secondoftwo
-+ \let\glscapscase\@firstofthree
-+ \def\glscustomtext{#3}%
-+ \def\glsinsert{}%
-+ \def\@glo@text{\csname gls@\glstype @entryfmt\endcsname}%
-+ \@gls@link[#1]{#2}{\@glo@text}%
-+ \ifKV@glslink@local
-+ \glslocalunset{#2}%
-+ \else
-+ \glsunset{#2}%
-+ \fi
-+ }%
-+ \glspostlinkhook
- }
- \renewcommand*{\@gls@@link}[3][]{%
- \@glsxtr@record{#1}{#2}%
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: