]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
projects / thirdparty / bind9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04bdaf6)
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:45:35 +0000 (16:45 +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.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55f58ff3304fa8744aefa4f03eb8f435bf09b488..f580f1ddc22d22ef9e330bf26cd34f92013b5cc6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1455,11 +1455,12 @@ 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/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
diff --git a/.reuse/dep5 b/.reuse/dep5
index e18e08276f418a407d68f31b3ae05bc0a47bdd93..e17eb58f454df70eedc6184c124d8639fe699fe3 100644 (file)
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -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
diff --git a/Makefile.am b/Makefile.am
index df91934e037b10e75cd781d747283365b425abe9..9a81318050ed7df5d753090fd98b949cbbf90fc5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST =                  \
        util/bindkeys.pl        \
        util/dtrace.sh          \
        contrib                 \
-       CHANGES                 \
        COPYRIGHT               \
        LICENSE                 \
        *.md
diff --git a/README.md b/README.md
index 4bfe45ddc11f6fb968f1104c23937e59e7a7d166..16ede04c1792fc6a6a5b3909578c072396340952 100644 (file)
--- a/README.md
+++ b/README.md
@@ -163,7 +163,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,
diff --git a/doc/arm/changelog.rst b/doc/arm/changelog.rst
index 22439522bd3fd98c946bb54f2a8485cf7a8a6ba9..3b0cabef00bd387629f9534a23c5c13bed452893 100644 (file)
--- a/doc/arm/changelog.rst
+++ b/doc/arm/changelog.rst
@@ -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.
 
Mirror of https://gitlab.isc.org/isc-projects/bind9.git