]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Remove the CHANGES file
authorMichal Nowak <mnowak@isc.org>
Thu, 24 Oct 2024 15:01:57 +0000 (17:01 +0200)
committerMichal Nowak <mnowak@isc.org>
Thu, 31 Oct 2024 16:47:03 +0000 (16:47 +0000)
With the introduction of the generated changelog, the CHANGES file
became a symlink to doc/arm/changelog.rst. After the changes made in
!9549, the changelog file transitioned from being a wholly generated
file to one that includes versioned changelog files, which are
themselves generated. However, while implementing !9549, we overlooked
that the CHANGES file is copied to a release directory on an FTP server
and contains just "include" directives, not the changelog itself.
Therefore, in the same fashion as the "RELEASE-NOTES*.html" file, create
a "CHANGELOG*.html" file that redirects to the Changelog appendix of the
ARM.

(cherry picked from commit e40bd273e474a0562bcabccbb193ae1074443e3d)

.gitlab-ci.yml
.reuse/dep5
CHANGES [deleted symlink]
Makefile.am
README.md
doc/arm/changelog.rst

index 2c3d596783d35c5c80e8c2d99f4f8b4630e6f480..4645d8363cc1322f0ffa0db722ddb51870b6c53a 100644 (file)
@@ -1386,12 +1386,13 @@ release:
     - pushd "${BIND_DIRECTORY}-release"
     - mv "../${BIND_DIRECTORY}.tar.xz" .
     - tar --extract --file="${BIND_DIRECTORY}.tar.xz"
-    - mv "${BIND_DIRECTORY}"/{CHANGES*,COPYRIGHT,LICENSE,README.md,srcid} .
+    - mv "${BIND_DIRECTORY}"/{COPYRIGHT,LICENSE,README.md,srcid} .
     - rm -rf "${BIND_DIRECTORY}"
     - mv "../doc/arm/_build/html" doc/arm/
     - mv "../doc/arm/_build/latex/Bv9ARM.pdf" doc/arm/
     - mv "../doc/arm/_build/epub/Bv9ARM.epub" doc/arm/
     - echo '<!DOCTYPE HTML><html lang="en"><meta http-equiv="refresh" content="0; url=doc/arm/html/notes.html"><title>Redirect</title></html>' > "RELEASE-NOTES-${BIND_DIRECTORY}.html"
+    - echo '<!DOCTYPE HTML><html lang="en"><meta http-equiv="refresh" content="0; url=doc/arm/html/changelog.html"><title>Redirect</title></html>' > "CHANGELOG-${BIND_DIRECTORY}.html"
     - popd
   needs:
     - job: tarball-create
index afb28c298f92c120edf1172efe8b8c85c44e2a26..e96c40b78e100c25543444fe5b119d1df97a3713 100644 (file)
@@ -26,7 +26,6 @@ Files: **/*.after*
        .gitlab/*
        .mailmap
        AUTHORS
-       CHANGES
        COPYRIGHT
        Makefile
        Makefile.*
diff --git a/CHANGES b/CHANGES
deleted file mode 120000 (symlink)
index d0de56f..0000000
--- a/CHANGES
+++ /dev/null
@@ -1 +0,0 @@
-doc/arm/changelog.rst
\ No newline at end of file
index 2f095616591de8a7e86b119422c47485bb08cdb4..38c1a6f4ac0f0032b8ee863367d8cc2be0250515 100644 (file)
@@ -19,7 +19,6 @@ dist_sysconf_DATA = bind.keys
 EXTRA_DIST =                   \
        util/bindkeys.pl        \
        contrib                 \
-       CHANGES                 \
        COPYRIGHT               \
        LICENSE                 \
        *.md
index 6439c5b32978572291256f78c34b5159b56671b2..7caf130970b73be0b1079d8ba2b6f29cd3c1b9d6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ Additional information on various subjects can be found in other
 
 #### Bug report identifiers
 
-Most notes in the CHANGES file include a reference to a bug report or
+Most notes in the ARM Changelog appendix include a reference to a bug report or
 issue number. Prior to 2018, these were usually of the form `[RT #NNN]`
 and referred to entries in the "bind9-bugs" RT database, which was not open
 to the public. More recent entries use the form `[GL #NNN]` or, less often,
index 4cef4ffa3dd3071a4448d9929f2a9f7010cb8a56..7ad7b321e4c7fdb177070fc1c69d912dc38f7c10 100644 (file)
@@ -14,7 +14,7 @@
 Changelog
 =========
 
-.. note:: The following list contains detailed information about BIND9's
+.. note:: The following list contains detailed information about BIND 9
    development. Regular users should refer to :ref:`Release Notes <relnotes>`
    for changes relevant to them.