diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index a3c008e8c..bf0de9e47 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -322,38 +322,6 @@ touch $LOGFILE progress_message "Build of Shorewall $VERSION on $(date)" case $VERSION in - 4.3.*) - SVNBRANCH="trunk/Shorewall-common" - SVN6BRANCH="trunk/Shorewall6" - LITESVNBRANCH="trunk/Shorewall-lite" - LITE6SVNBRANCH="trunk/Shorewall6-lite" - PERLBRANCH="trunk/Shorewall-perl" - SHELLBRANCH="trunk/Shorewall-shell" - DOCTAG="trunk/docs" - XMLPROJ="docs-4.3" - SAMPLESTAG="trunk/Samples" - SAMPLES6TAG="trunk/Samples6" - MANPAGETAG=trunk/manpages - MANPAGE6TAG=trunk/manpages6 - LITEMANPAGETAG=trunk/manpages-lite - LITE6MANPAGETAG=trunk/manpages6-lite - ;; - 4.2.*-*) - SVNBRANCH="trunk/Shorewall-common" - SVN6BRANCH="trunk/Shorewall6" - LITESVNBRANCH="trunk/Shorewall-lite" - LITE6SVNBRANCH="trunk/Shorewall6-lite" - PERLBRANCH="trunk/Shorewall-perl" - SHELLBRANCH="trunk/Shorewall-shell" - DOCTAG="trunk/docs" - XMLPROJ="docs-4.2" - SAMPLESTAG="trunk/Samples" - SAMPLES6TAG="trunk/Samples6" - MANPAGETAG=trunk/manpages - MANPAGE6TAG=trunk/manpages6 - LITEMANPAGETAG=trunk/manpages-lite - LITE6MANPAGETAG=trunk/manpages6-lite - ;; 4.2.*.*) PATCHRELEASE=Yes PATCHNUM=${VERSION##*.} @@ -380,14 +348,14 @@ case $VERSION in LITE6SVNBRANCH="branches/4.2/Shorewall6-lite" PERLBRANCH="branches/4.2/Shorewall-perl" SHELLBRANCH="branches/4.2/Shorewall-shell" - DOCTAG="trunk/docs" + DOCTAG="branches/4.2/docs" XMLPROJ="docs-4.2" SAMPLESTAG="trunk/Samples" SAMPLES6TAG="trunk/Samples6" - MANPAGETAG=trunk/manpages - MANPAGE6TAG=trunk/manpages6 - LITEMANPAGETAG=trunk/manpages-lite - LITE6MANPAGETAG=trunk/manpages6-lite + MANPAGETAG=branches/4.2/manpages + MANPAGE6TAG=branches/4.2/manpages6 + LITEMANPAGETAG=branches/4.2/manpages-lite + LITE6MANPAGETAG=branches/4.2/manpages6-lite ;; 4.0.*.*) PATCHRELEASE=Yes