o Remove two gsi_openssh* packages from bundle module.

diff --cc bundle/mdist.conf
index 6342a4c20403a1022b3b2780b04ec7824946fcab,0000000000000000000000000000000000000000..bbfec6906072298c9110c6e8a240a2c29c770112
mode 100644,000000..100644
--- 1/bundle/mdist.conf
--- /dev/null
+++ b/bundle/mdist.conf
@@@ -1,37 -1,0 +1,43 @@@
 +<Package name="gsi_openssh_bundle">
 +    <Depends>
 +        <Package name="gsi_openssh">
 +            Module openssh
 +            Root :pserver:anonymous@cvs.ncsa.uiuc.edu:/CVS/gssapi-openssh
 +            Tag OPENSSH_GSI_GPT_2_6
 +            Directory ./
 +        </Package>
++        <Package name="gsi_openssh_setup">
++            Module setup
++            Root :pserver:anonymous@cvs.ncsa.uiuc.edu:/CVS/gssapi-openssh
++            Tag OPENSSH_GSI_GPT_2_6
++            Directory ./
++        </Package>
 +    </Depends>
 +
 +    <Dist>
 +        <Tools>
 +            <Tool>gpt-3.0</Tool>
 +        </Tools>
 +
 +        <File name="gsi_openssh_bundle-2.6-src.tar.gz" />
 +
 +        <Steps>
 +            <Step>
 +                <Description>
 +                    Collating packages...
 +                </Description>
 +                <Command>
 +                    ./scripts/collate-packages
 +                </Command>
 +            </Step>
 +            <Step>
 +                <Description>
 +                    Creating bundle...
 +                </Description>
 +                <Command>
 +                    ./scripts/make-src-bundle
 +                </Command>
 +            </Step>
 +        </Steps>
 +    </Dist>
 +</Package>

diff --cc bundle/scripts/collate-packages
index dc3fb9bcdab8e8229f1ad24354391ca0d4548f40,0000000000000000000000000000000000000000..af76fc92a263627cd731de20ca5a56adaa17e6bd
mode 100755,000000..100755
--- 1/bundle/scripts/collate-packages
--- /dev/null
+++ b/bundle/scripts/collate-packages
@@@ -1,10 -1,0 +1,12 @@@
- if [ ! -e sources/ ]; then
-     mkdir -p sources/
 +#!/bin/sh
 +#
 +
 +source ./scripts/version.sh
 +
- cp ../packages-harvest/gsi_openssh-$VERSION-src.tar.gz
++if [ ! -e work/sources/ ]; then
++    mkdir -p work/sources/
 +fi
 +
++cp ../packages-harvest/gsi_openssh-$VERSION-src.tar.gz ./work/sources/
++cp ../packages-harvest/gsi_openssh_setup-$VERSION-src.tar.gz ./work/sources/
++

diff --cc bundle/scripts/make-src-bundle
index a5907bacb9ce8ae41c61d52cf9a6d5b25f31aee5,0000000000000000000000000000000000000000..d30cde3f30e5c7d4aead667c78c1e9e757113c48
mode 100755,000000..100755
--- 1/bundle/scripts/make-src-bundle
--- /dev/null
+++ b/bundle/scripts/make-src-bundle
@@@ -1,41 -1,0 +1,20 @@@
- if [ ! -e output/$NAME ]; then
-     if [ ! -e output/ ]; then
-         mkdir -p output/
-     fi
 +#!/bin/sh
 +#
 +# Usage:
 +#
 +#   1) Run the src-bundle creation script:
 +#
 +#        ./make-src-bundle
 +#
 +
 +source ./scripts/version.sh
 +
 +NAME="gsi_openssh_bundle-$VERSION-src.tar.gz"
 +XML="gsi_openssh_bundle-src.xml"
 +
-     if [ ! -e work/ ]; then
-         WORK_SCRIPTCREATED="1"
-         mkdir -p work/
-         cp scripts/$XML work/
-     fi
- 
-     if [ ! -e work/sources/ ]; then
-         cp -a sources work/sources
-     fi
- 
-     cd work/
-     $GPT_LOCATION/sbin/gpt-bundle -nodeps -nosetups -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
-     mv $NAME ../
-     cd ../
- 
-     if [ "x$WORK_SCRIPTCREATED" != "x" ]; then
-         rm -rf work/
-     fi
- else
-     echo "Please remove output/$NAME before running this script."
-     exit;
- fi
++cp scripts/$XML work/
 +
++cd work/
++$GPT_LOCATION/sbin/gpt-bundle -nodeps -nosetups -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
++mv $NAME ../
++cd ../