Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2021-05-07 05:45:11 +02:00
commit 0e9fb93256
3 changed files with 3 additions and 6 deletions

View File

@ -623,12 +623,9 @@
<varlistentry> <varlistentry>
<term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term> <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
<listitem> <listitem>
<!-- <para>Home page: <ulink url="&shadow-home;"/></para> --> <para>Home page: <ulink url="&shadow-home;"/></para>
<para>Download: <ulink url="&shadow-url;"/></para> <para>Download: <ulink url="&shadow-url;"/></para>
<para>MD5 sum: <literal>&shadow-md5;</literal></para> <para>MD5 sum: <literal>&shadow-md5;</literal></para>
<!-- Using http://cdn.debian.net/debian/pool/main/s/shadow/
for now since alioth has not reconstituted shadow -->
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -618,7 +618,7 @@
<!ENTITY shadow-size "1,574 KB"> <!ENTITY shadow-size "1,574 KB">
<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz"> <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
<!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45"> <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45">
<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> <!ENTITY shadow-home "https://shadow-maint.github.io/shadow/">
<!ENTITY shadow-fin-du "45 MB"> <!ENTITY shadow-fin-du "45 MB">
<!ENTITY shadow-fin-sbu "0.2 SBU"> <!ENTITY shadow-fin-sbu "0.2 SBU">

View File

@ -11,7 +11,7 @@
<!-- Allow select the dest dir at runtime --> <!-- Allow select the dest dir at runtime -->
<xsl:param name="dest.dir"> <xsl:param name="dest.dir">
<xsl:value-of select="concat('/srv/www/', substring-after('&patches-root;', 'http://'))"/> <xsl:value-of select="concat('/srv/www/', substring-after('&patches-root;', 'https://'))"/>
</xsl:param> </xsl:param>
<xsl:template match="/"> <xsl:template match="/">