From dfca0da0f05cf2e74727fd71b16f051bc42a7c37 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 22 Feb 2009 23:56:19 +0000
Subject: [PATCH] Update the build script for the manpage/doc split

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9514 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/buildshorewall | 42 +++++---------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

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