Merge r1889806 from trunk:

* Correctly record changes for the latest release in case there have been no
  changes at all for this release so far.

Reviewed by: rpluem, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1890381 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 9ae3c9760f913fd46b0297b5e0c5c0c508812482..e822b045f2cc5c4042656cd6c93b482f4e815a78 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,9 +158,9 @@ docs:
 update-changes:
        @for i in `find changes-entries -type f`; do \
            cp CHANGES CHANGES.tmp ; \
-           awk -v fname=$$i 'BEGIN{done = 0} \
-                           done == 0 && /^Changes with Apache /{ active = 1; print; next}; \
-                           /^ *\*/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
+           awk -v fname=$$i 'BEGIN{done = 0; active = 0} \
+                           done == 0 && active == 0 && /^Changes with Apache /{ active = 1; print; next}; \
+                           /^( *\*|Changes with Apache )/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
            CHANGES.tmp > CHANGES ; \
            rm CHANGES.tmp ; \
            if [ -n "$(SVN)" ] ; then \

diff --git a/STATUS b/STATUS
index 3d4b91d0755a7e41f5971472ea4c0b5d5c9d9042..88f7737b2d10c907326fc4e8829bf52f26290d87 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -142,14 +142,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Buildsystem: Correctly record changes for the latest release in case
-     there have been no changes at all for this release so far.
-     Trunk version of patch:
-        https://svn.apache.org/r1889806
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1889806 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, ylavic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]