timbreicmc (15dec17)

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

4 files changed, 22 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/timbreicmc/README.md b/Master/texmf-dist/doc/latex/timbreicmc/README.md
index d0749db55ce..721440ef459 100644
--- a/Master/texmf-dist/doc/latex/timbreicmc/README.md
+++ b/Master/texmf-dist/doc/latex/timbreicmc/README.md
@@ -1,11 +1,7 @@
 # Package timbreicmc #
 
 Typeset documents with
-[ICMC/USP São Carlos](http://www.icmc.usp.br) watermarks.
-
-ICMC is acronym for "Instituto de Ciências Matemáticas e de
-Computação" of the University de São Paulo (USP), in the city of
-São Carlos-SP, Brazil.
+[ICMC/USP São Carlos-SP, Brazil](http://www.icmc.usp.br) watermarks.
 
 Author: Miguel V. S. Frasson
 [mvsfrasson@gmail.com](mailto:mvsfrasson@gmail.com)
diff --git a/Master/texmf-dist/doc/latex/timbreicmc/timbreicmc.pdf b/Master/texmf-dist/doc/latex/timbreicmc/timbreicmc.pdf
index 551cac8977a..47b3adda241 100644
--- a/Master/texmf-dist/doc/latex/timbreicmc/timbreicmc.pdf
+++ b/Master/texmf-dist/doc/latex/timbreicmc/timbreicmc.pdf
diff --git a/Master/texmf-dist/source/latex/timbreicmc/timbreicmc.dtx b/Master/texmf-dist/source/latex/timbreicmc/timbreicmc.dtx
index 80bf43e4c64..19d02ec7b63 100644
--- a/Master/texmf-dist/source/latex/timbreicmc/timbreicmc.dtx
+++ b/Master/texmf-dist/source/latex/timbreicmc/timbreicmc.dtx
@@ -1,12 +1,22 @@
 %% \CheckSum{0}
 % \iffalse meta-comment
 % File: timbreicmc.dtx
-% Copyright (C) 2017 Miguel V. S. Frasson (mvsfrasson@gmail.com)
+% Copyright 2017 Miguel V. S. Frasson (mvsfrasson@gmail.com)
 %
-% This package may be distributed under the terms of the LaTeX
-% Project Public License, as described in lppl.txt in the base
-% LaTeX distribution, either version 1.2 or (at your option)
-% any later version.
+% This work may be distributed and/or modified under the conditions of
+% the LaTeX Project Public License, either version 1.3 of this license
+% or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% 
+% The Current Maintainer of this work is Miguel V. S. Frasson.
+%
+% This work consists of the files timbreicmc.dtx and timbreicmc.ins
+% and the derived file timbreicmc.sty.
 % \fi
 %
 % \iffalse
@@ -45,13 +55,14 @@
 %
 % \changes{1.0}{2017/12/12}{Initial version}
 % \changes{1.1}{2017/12/14}{Drop timbreicmclogoicmc.tex; all code inside sty file}
-%
+% \changes{1.2}{2017/12/12}{Improve license statements}
+% 
 % \MakeShortVerb!
 %
 % \title{\bfseries\textsf{timbreicmc}:\\ Papéis timbrados usados no\\ ICMC/USP
 % São Carlos-SP, Brasil}
 % \author{Miguel V.\ S.\ Frasson \\ \texttt{mvsfrasson@gmail.com}}
-% \date{2017--12--12 versão 1.1}
+% \date{2017--12--12 versão 1.2}
 %
 % \maketitle
 %
@@ -70,7 +81,7 @@
 % departamentos\footnote{Pressupondo que os principais usuários de
 % \hologo{LaTeX} são os docentes, a fim de reduzir o trabalho de
 % implementação.  Caso alguma seção tenha interesse em utilizar, favor
-% entrar em contato com o autor.} na versão 1.1), pode-se alterar o
+% entrar em contato com o autor.} na versão 1.2), pode-se alterar o
 % papel timbrado para a seção específica. Por exemplo, para o timbre
 % do SME, usar\\
 % !   \usepackage[sme]{timbreicmc}!\\
@@ -148,7 +159,7 @@
 % \paragraph*{Ajustes iniciais.}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{timbreicmc}[2017/12/12 v1.1 Timbres do ICMC-USP (alguns)]
+\ProvidesPackage{timbreicmc}[2017/12/12 v1.2 Timbres do ICMC-USP (alguns)]
 %    \end{macrocode}
 %
 % Para inserção da marca d'água, usaremos o pacote !xwatermark!, que
diff --git a/Master/texmf-dist/tex/latex/timbreicmc/timbreicmc.sty b/Master/texmf-dist/tex/latex/timbreicmc/timbreicmc.sty
index 3f9040f0adb..22adbab6f22 100644
--- a/Master/texmf-dist/tex/latex/timbreicmc/timbreicmc.sty
+++ b/Master/texmf-dist/tex/latex/timbreicmc/timbreicmc.sty
@@ -21,7 +21,7 @@
 %% 
 %% \CheckSum{0}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{timbreicmc}[2017/12/12 v1.1 Timbres do ICMC-USP (alguns)]
+\ProvidesPackage{timbreicmc}[2017/12/12 v1.2 Timbres do ICMC-USP (alguns)]
 \RequirePackage{xwatermark,xcolor,tikz}
 \newlength{\timbreICMCmargem}
 \setlength{\timbreICMCmargem}{1.25cm}