call util/check-changes in setup

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4651f823a1d21c64690e65c20ea8033c61eb8734..db1ace50d0f39ea215ea0380c6eca95e7aa5a2a4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,6 +140,7 @@ precheck:debian:sid:amd64:
   <<: *debian_sid_amd64_image
   stage: precheck
   script:
+    - perl util/check-changes CHANGES
     - perl -w util/merge_copyrights
     - diff -urNap util/copyrights util/newcopyrights
     - rm util/newcopyrights

diff --git a/CHANGES b/CHANGES
index aa4605c315e908ae254eece0666f0736bf6cabb2..0ab651160ebc2bec4865570a7a4362df0d0d4b2e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -104,6 +104,7 @@
                        server cookies.  [RT #45672]
 
        --- 9.11.3 released ---
+
        --- 9.11.3rc2 released ---
 
 4904.  [bug]           Temporarily revert change #4859. [GL #124]

diff --git a/util/check-changes b/util/check-changes
index ee79da23b5c2ad3533672e596d5f887e134d2357..85eec0e6a882b58113e0b04d82e9950d76a96319 100644 (file)
--- a/util/check-changes
+++ b/util/check-changes
@@ -14,7 +14,7 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
                        # this emulates #! processing on NIH machines.
                        # (remove #! line above if indigestible)
 
-$master = 1;
+$master = 0;
 
 eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
                        # process any FOO=bar switches