r2096: *** empty log message ***

diff --git a/src/views.cpp b/src/views.cpp
index 5c3c0d095e5ffea4249bcd9ea9b8ce06c798aa66..1b54cbb93ef99314a0e0780fa7b42e552ebc6ca6 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: views.cpp,v 1.155 2002/05/05 14:22:44 kevin Exp $
+**  $Id: views.cpp,v 1.156 2002/05/30 17:02:32 kevin Exp $

 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as


@@ -1987,7 +1987,7 @@ PhantomCanvas::GetBestSize() const
 #ifdef CTSIM_MDI
   ySize = xSize = (xSize / 4);
 #else
 #ifdef CTSIM_MDI
   ySize = xSize = (xSize / 4);
 #else

-  xSize = ySize = ySize * .7;
+  xSize = ySize = static_cast<int>(ySize * .7);

 #endif
 
   return wxSize (xSize, ySize);
 #endif
 
   return wxSize (xSize, ySize);

diff --git a/upload.sh b/upload.sh
index e6c546ee4a94fb1d4a92dfd38f649d9f7d964059..47d128095c552f8f725e01b7e83ed97a74833431 100755 (executable)
--- a/upload.sh
+++ b/upload.sh
@@ -56,6 +56,8 @@ fi
 scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}

+scp ${DEBPKG}-doc_${DEBVERSION}_*.deb ${DEBIAN_DIR}
+scp ${DEBPKG}-help_${DEBVERSION}_*.deb ${DEBIAN_DIR}

 scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
 
 popd > /dev/null
 scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
 
 popd > /dev/null