From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 11 Jun 2020 13:04:58 +0000 (+0200)
Subject: release: add code to detect Bacula Systems copyrights and fail release
X-Git-Tag: Release-9.6.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a452755b346c99c2a86dcd9f7c42fda9f90b17b;p=thirdparty%2Fbacula.git

release: add code to detect Bacula Systems copyrights and fail release
---

diff --git a/bacula/release/config b/bacula/release/config
index a12c603fa..5afc44d6f 100644
--- a/bacula/release/config
+++ b/bacula/release/config
@@ -1,12 +1,12 @@
 #
 # Configuration for release scripts
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Set to the Branch you are working on
 #
-branch=${branch:-Branch-7.9}
+branch=${branch:-Branch-9.6}
 #
 # set reltype to release or beta -- for upload and setting DEVELOPER
 reltype=release
@@ -14,7 +14,8 @@ reltype=release
 repo=$reltype
 
 # Bacula git repos
-bacula=${bacula:-${HOME}/bee/bacula}
+drivers=${bacula:-${HOME}/bacula/drivers}
+bacula=${bacula:-${HOME}/bacula/k}
 docs=${docs:-${HOME}/bacula/docs}
 
 # Limit bw to upload on the website
diff --git a/bacula/release/makeall b/bacula/release/makeall
index e179d821f..42f664eb4 100755
--- a/bacula/release/makeall
+++ b/bacula/release/makeall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2018 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Make full release
diff --git a/bacula/release/makebacularel b/bacula/release/makebacularel
index f15daee45..e3b1b33a6 100755
--- a/bacula/release/makebacularel
+++ b/bacula/release/makebacularel
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2018 Kern Sibbald
+# Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # This script is used to make a Bacula release
@@ -98,6 +98,11 @@ tar xfz $base_pkg-$ver.tar.gz
 cd $base_pkg-$ver/bacula
 cp -fp ReleaseNotes ChangeLog src/version.h ${cwd}/
 cp -fp LICENSE* ${cwd}/
+grep -R -a --exclude-dir=testprogs "Copyright.*Bacula Systems" *
+if [ $? = 0 ] ; then
+  echo "fatal: !!!!! Bacula Systems Copyrights detected !!!!!"
+  exit
+fi
 
 cd ${cwd}/$base_pkg-$ver
 # Move directories to release names including version