Changeset 8307474 for general.ent

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (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' into lazarus

File:

• general.ent (modified) (3 diffs)

general.ent

@@ -1 @@
-<!-- version info generated from git commit,
-     comment out the following two lines for release. -->
+<!-- Editing  up to the line of ==== should be enough
+     to generate a book for development, release, or rc-->
+<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
+                                      set to IGNORE for release or rc -->
+<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
+                                      set to IGNORE for development or rc -->
+<!ENTITY % relyear    "2022">
+<!ENTITY % relnum     "11.1">
+<!ENTITY % reldate    "March 1st, 2022">
+<!ENTITY % relpubdate "2022-03-01">
+<!-- ================================================================== -->
+<!-- Do not change anything below unless the www or book layouts change -->
+
+<!-- Automatically generated by git-version.sh. Used for release or dev -->
+<!ENTITY % conditional-entities SYSTEM "conditional.ent">
+%conditional-entities;
+
+<![ %development; [
+<!-- version info automatically generated by git -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
+<![ %sysv; [
+<!ENTITY lfs-version  "development">
+<!ENTITY blfs-version "svn">
+]]>
+<![ %systemd; [
+<!ENTITY lfs-version  "systemd">
+<!ENTITY blfs-version "systemd">
+]]>
+]]><!-- End %development -->
 
-<!-- uncomment the following entities and modify them for release,
-     month and year should be always 2 digits. -->
-<!--
-<!ENTITY day            "01">
-<!ENTITY month          "09">
-<!ENTITY year           "2021">
-<!ENTITY copyrightdate  "2001-2021">
-<!ENTITY version        "11.0">
-<!ENTITY releasedate    "September 1st, &year;">
-<!ENTITY pubdate        "&year;-&month;-&day;">
--->
+<![ %release; [
+<![ %sysv; [
+<!ENTITY lfs-version  "%relnum;">
+<!ENTITY blfs-version "%relnum;">
+]]>
+<![ %systemd; [
+<!ENTITY lfs-version  "%relnum;-systemd">
+<!ENTITY blfs-version "%relnum;-systemd">
+]]>
 
-<!ENTITY copyholder   "The BLFS Development Team">
-<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
-<!ENTITY lfs-version  "development">          <!-- x.y|development -->
-<!ENTITY lfs-versiond "systemd">              <!-- x.y-systemd|systemd -->
-<!ENTITY lfs-domainname       "linuxfromscratch.org">
+<!ENTITY year           "%relyear;">
+<!ENTITY version        "%relnum">
+<!ENTITY releasedate    "%reldate;">
+<!ENTITY pubdate        "%relpubdate;">
+]]><!-- End %release -->
+
+<!ENTITY copyrightdate  "1999-&year;">
+<!ENTITY copyholder     "The BLFS Development Team">
+<!ENTITY lfs-domainname "linuxfromscratch.org">
 
 <!ENTITY maintainer-fullname  "The BLFS Team">
@@ -46 +74 @@
 
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
-<!ENTITY lfs-rootd            "../../../../lfs/view/&lfs-versiond;">
 <!ENTITY lfs-dev              "../../../../lfs/view/development">
 <!ENTITY gnu-http             "https://ftp.gnu.org/gnu">
@@ -96 +123 @@
 
 <!ENTITY blfs-bootscripts-version     "20210826">
-<!ENTITY systemd-units-version        "20210819">
+<!ENTITY systemd-units-version        "20211123">
 
 <!ENTITY blfs-wiki                    "https://wiki.&lfs-domainname;/blfs/wiki">