Tweak release files

diff --git a/bacula/release/makebacularel b/bacula/release/makebacularel
index 7e20acfdae14ec7d69002cca6b8a585cadf44ee7..aee0eda21b7d99dfde3c7a3ed7824d29d7350be6 100755 (executable)
--- a/bacula/release/makebacularel
+++ b/bacula/release/makebacularel
@@ -96,7 +96,8 @@ cd ${cwd}
 tar xfz $base_pkg-$ver.tar.gz 
 # First remove Enterprise Win32 plugin source
 cd $base_pkg-$ver/bacula
-cp -fp ReleaseNotes ${cwd}/ReleaseNotes
+cp -fp ReleaseNotes ChangeLog src/version.h ${cwd}/
+cp -fp LICENSE* ${cwd}/
 
 cd ${cwd}/$base_pkg-$ver
 # Move directories to release names including version

diff --git a/bacula/release/upload b/bacula/release/upload
index 184408e3ba9dd7fa8bbdfe59ba8787db835c0511..a5407c5fbee54c7f8a0888f94498afbe049516cf 100755 (executable)
--- a/bacula/release/upload
+++ b/bacula/release/upload
@@ -8,29 +8,29 @@
 . ./config
 
 ver="7.2.0"
-fullver="bacula-7.2.0"
 RSYNC="rsync -av --no-g --progress $upload_opt"
 
 do_upload()
 {
 where=$1
-echo "Creating ${where}:/var/www/bacula/downloads/$fullver"
+echo "Creating ${where}:/home/src/$fullver"
 ssh ${where} <<EOF
-cd /var/www/bacula/downloads/
-mkdir -p $fullver
+cd /home/src/
+mkdir -p $ver
 EOF
 
 echo "Uploading source"
-for i in bacula-*-$ver*; do \
-   echo "Uplod $i to ${where}:/var/www/bacula/downloads/$fullver"
-   $RSYNC $i ${where}:/var/www/bacula/downloads/$fullver/; \
+for i in bacula-$ver* bacula-*-$ver*; do \
+   echo "Uplod $i to ${where}:/home/src/$ver"
+   $RSYNC $i ${where}:/home/src/$ver/; \
 done
 
 # Upload release notes
-echo "Uplod ReleaseNote to ${where}:/var/www/bacula/downloads/$fullver"
-$RSYNC ReleaseNotes ${where}:/var/www/bacula/downloads/$fullver/
-echo "Uplod ChangeLog to ${where}:/var/www/bacula/downloads/$fullver"
-$RSYNC ChangeLog ${where}:/var/www/bacula/downloads/$fullver/
+echo "Uplod ReleaseNotes to ${where}:/home/src/$ver"
+$RSYNC ReleaseNotes ${where}:/home/src/$ver/
+echo "Uplod ChangeLog to ${where}:/home/src/$ver"
+$RSYNC ChangeLog ${where}:/home/src/$ver/
+$RSYNC LICENSE* ${where}:/home/src/$ver/
 
 
 }