Changeset 3ee9d74


Ignore:
Timestamp:
09/08/2021 04:00:37 PM (21 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
2c1dc23
Parents:
1c517d5 (diff), d761e0a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general/prog/mercurial.xml

    r1c517d5 r3ee9d74  
    77  <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
    88  <!ENTITY mercurial-download-ftp  " ">
    9   <!ENTITY mercurial-md5sum        "47da24d4076609dcc43b9ef76999369c">
     9  <!ENTITY mercurial-md5sum        "8d94e879cb714147b0490feaedb53afc">
    1010  <!ENTITY mercurial-size          "7.7 MB">
    11   <!ENTITY mercurial-buildsize     "77 MB (with docs, add 1.6 GB for tests)">
    12   <!ENTITY mercurial-time          "0.3 SBU (with docs, add 17 SBU for tests using -j4)">
     11  <!ENTITY mercurial-buildsize     "106 MB (with docs, add 1.6 GB for tests)">
     12  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 20 SBU for tests using -j4)">
    1313]>
    1414
    … …  
    252252      <para>
    253253        If you have installed <xref linkend="make-ca"/> and want
    254         <application>Mercurial</application> to use them, as the <systemitem
    255         class="username">root</systemitem> user, issue:
     254        <application>Mercurial</application> to use the certificates,
     255        as the <systemitem class="username">root</systemitem> user, issue:
    256256      </para>
    257257

  • introduction/welcome/changelog.xml

    r1c517d5 r3ee9d74  
    4343    -->
    4444    <listitem>
    45       <para>September 6th, 2021</para>
     45      <para>September 8th, 2021</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[renodr] - Update to Mercurial-5.9.1. Fixes
     49          <ulink url="&blfs-ticket-root;15481">#15481</ulink>.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
     55      <para>September 7th, 2021</para>
    4656      <itemizedlist>
    4757        <listitem>

  • packages.ent

    r1c517d5 r3ee9d74  
    352352<!ENTITY lua-version                  "5.4.3">
    353353<!ENTITY lua52-version                "5.2.4">
    354 <!ENTITY mercurial-version            "5.9">
     354<!ENTITY mercurial-version            "5.9.1">
    355355<!ENTITY nasm-version                 "2.15.05">
    356356<!ENTITY ninja-version                "1.9.0">

  • xsoft/graphweb/firefox-legacy.xml

    r1c517d5 r3ee9d74  
    503503mkdir -pv /usr/share/pixmaps &amp;&amp;
    504504
    505 MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
     505MIMETYPE="text/xml;text/mml;text/html"                                     &amp;&amp;
    506506MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
    507 MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
     507MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https"          &amp;&amp;
    508508
    509509cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;

  • xsoft/graphweb/firefox.xml

    r1c517d5 r3ee9d74  
    501501mkdir -pv /usr/share/pixmaps      &amp;&amp;
    502502
    503 MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
     503MIMETYPE="text/xml;text/mml;text/html"                                     &amp;&amp;
    504504MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
    505 MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
     505MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https"          &amp;&amp;
    506506
    507507cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
Note: See TracChangeset for help on using the changeset viewer.