Changeset 0929ec5 for general.ent

Timestamp:

04/06/2021 09:14:24 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

6cc8775

Parents:

61385ca (diff), 6b505da (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 multilib

File:

• general.ent (modified) (1 diff)

general.ent

@@ -1 @@
-<!ENTITY version         "SVN-20210326">
+<!-- version info automatically generated by git
+     comment the following two lines for release -->
+<!ENTITY % version-entities SYSTEM "version.ent">
+%version-entities;
+
+<!-- uncomment and edit the following four lines
+     for releases (including -rc) -->
+<!--
+<!ENTITY version         "10.2-rc1">
+<!ENTITY versiond        "10.2-rc1">
+<!ENTITY releasedate     "August 26th, 2021">
+<!ENTITY copyrightdate   "1999-2021">
+-->
+<!-- jhalfs needs a literal dash, not &ndash; -->
+
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20210326-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
-
-<!ENTITY releasedate     "March 26th, 2021">
-
-<!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">