summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/ctanupload/ctanupload.pl11
-rw-r--r--Master/texmf-dist/doc/support/ctanupload/ctanupload.pdfbin170676 -> 170076 bytes
-rw-r--r--Master/texmf-dist/doc/support/ctanupload/ctanupload.tex7
-rwxr-xr-xMaster/texmf-dist/scripts/ctanupload/ctanupload.pl11
4 files changed, 23 insertions, 6 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ctanupload/ctanupload.pl b/Build/source/texk/texlive/linked_scripts/ctanupload/ctanupload.pl
index 716bc24b2aa..e39c3d21237 100644
--- a/Build/source/texk/texlive/linked_scripts/ctanupload/ctanupload.pl
+++ b/Build/source/texk/texlive/linked_scripts/ctanupload/ctanupload.pl
@@ -10,7 +10,7 @@ sub fromenv;
sub load_data;
sub save_data;
-my $VERSION = 'v1.2a from 2012/05/03';
+my $VERSION = 'v1.2b from 2012/05/06';
my %CTAN_SERVERURLS = (
dante => 'http://dante.ctan.org/upload.html',
uktug => 'http://www.tex.ac.uk/upload/',
@@ -343,10 +343,17 @@ if ($FIELDS{DoNotAnnounce}) {
$DoNotAnnounce = '[x]';
}
else {
- delete $FIELDS{DoNotAnnounce};
+ $FIELDS{DoNotAnnounce} = 'Yes';
delete $FIELDS{to_announce};
$DoNotAnnounce = '[ ]';
}
+# Only keep the announcement field used by the site:
+if ($CTAN_URL eq $CTAN_SERVERURLS{dante}) {
+ delete $FIELDS{to_announce};
+}
+else {
+ delete $FIELDS{DoNotAnnounce};
+}
if (!$FIELDS{directory}) {
$FIELDS{directory} = '/macros/latex/contrib/' . $FIELDS{contribution};
diff --git a/Master/texmf-dist/doc/support/ctanupload/ctanupload.pdf b/Master/texmf-dist/doc/support/ctanupload/ctanupload.pdf
index b263b9c9000..0270e82bf71 100644
--- a/Master/texmf-dist/doc/support/ctanupload/ctanupload.pdf
+++ b/Master/texmf-dist/doc/support/ctanupload/ctanupload.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/ctanupload/ctanupload.tex b/Master/texmf-dist/doc/support/ctanupload/ctanupload.tex
index 1f5305b7155..1fb2d2acf5c 100644
--- a/Master/texmf-dist/doc/support/ctanupload/ctanupload.tex
+++ b/Master/texmf-dist/doc/support/ctanupload/ctanupload.tex
@@ -2,8 +2,10 @@
\title{The \textsf{ctanupload} script}
\author{Martin Scharrer}
-\email{martin@scharrer.me}
-\date{Version v1.2a -- 2012/05/03}
+\email{martin@scharrer-online.de}
+\date{Version v1.2b -- 2012/05/06}
+\repository{https://bitbucket.org/martin_scharrer/ctanupload/}
+
\providecommand\envvar{\texttt}
@@ -34,6 +36,7 @@ variable fields like the version number or announcement text can be entered manu
The script first collects the required data, applies some sanity checks before it is displayed again for confirmation.
If the data is correct it is uploaded and the status and response from the CTAN upload server is printed.
+\clearpage
\section{Usage}
\DescribeScript{ctanupload}<options>~'--'<name>'='<value>~!\ldots!
\DescribeScript{ctanupload}<options>~'--'<name>~<value>~!\ldots!
diff --git a/Master/texmf-dist/scripts/ctanupload/ctanupload.pl b/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
index 716bc24b2aa..e39c3d21237 100755
--- a/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
+++ b/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
@@ -10,7 +10,7 @@ sub fromenv;
sub load_data;
sub save_data;
-my $VERSION = 'v1.2a from 2012/05/03';
+my $VERSION = 'v1.2b from 2012/05/06';
my %CTAN_SERVERURLS = (
dante => 'http://dante.ctan.org/upload.html',
uktug => 'http://www.tex.ac.uk/upload/',
@@ -343,10 +343,17 @@ if ($FIELDS{DoNotAnnounce}) {
$DoNotAnnounce = '[x]';
}
else {
- delete $FIELDS{DoNotAnnounce};
+ $FIELDS{DoNotAnnounce} = 'Yes';
delete $FIELDS{to_announce};
$DoNotAnnounce = '[ ]';
}
+# Only keep the announcement field used by the site:
+if ($CTAN_URL eq $CTAN_SERVERURLS{dante}) {
+ delete $FIELDS{to_announce};
+}
+else {
+ delete $FIELDS{DoNotAnnounce};
+}
if (!$FIELDS{directory}) {
$FIELDS{directory} = '/macros/latex/contrib/' . $FIELDS{contribution};