Misc updates for 0.5.1

diff --git a/data/global.css b/data/global.css
index f339ce0206d235d546ad006ed0afaf4b382b6650..47d2481a461a7888a401297c01c9236c05135f26 100644 (file)
--- a/data/global.css
+++ b/data/global.css
@@ -48,6 +48,7 @@ ul {
 }
 span.code {
        font-family: monospace;
+       font-size: larger;
 }
 div.code {
        font-family: monospace;
@@ -57,6 +58,7 @@ div.code {
        margin-bottom: 5px;
        color: white;
        font-weight: bold;
+       font-size: larger;
 }
 
 dt {
@@ -221,6 +223,7 @@ body {
        font-size: 11pt;
        text-decoration: none;
        padding: 8px 25px 8px 25px;
+       margin-bottom: 10px;
        background-image: url("../images/dl-bg.png");
        border-radius: 10px;
        -moz-border-radius: 10px;

diff --git a/html.ct b/html.ct
index 9cc8b76bc549a3648b833cba0ee64c7fdf8ab626..f4252f5bf7178691013bfd016ca558ab74090d8d 100644 (file)
--- a/html.ct
+++ b/html.ct
@@ -125,6 +125,16 @@ Content-Type: text/html; charset=UTF-8
 <% void print_news(void) { %>
        <p class="quote">Now that it's spring again, progress on AWeather is continuing.</p>
        <dl class="news">
+               <dt>2011-08-25</dt>
+               <dd>
+                       AWeather 0.5.1 released: <ul>
+                               <li>Bugfix release</li>
+                               <li>Updated sat/map/elev to provide better data</li>
+                               <li>First release with <a href="<%= DEB_HOME %>">Debian packages</a></li>
+                               <li>Ubuntu packaging in progress (hopefully for 11.10)</li>
+                       </ul>
+               </dd>
+
                <dt>2011-06-19</dt>
                <dd>
                        AWeather 0.5 released: <ul>
@@ -224,15 +234,18 @@ Content-Type: text/html; charset=UTF-8
                        </dd>
 
                        <dt>Gentoo</dt>
-                       <dd>Emerge <span class="code">sci-geosciences/aweather</span> from the sunrise overlay</dd>
+                       <dd><span class="code">emerge sci-geosciences/aweather</span> from the sunrise overlay</dd>
 
                        <dt>Debian</dt>
-                       <dd><a href="debian/<%= VERSION_DEBIAN %>/">.deb files</a>, further packaging in progress</dd>
+                       <dd><span class="code">apt-get install aweather</span> from Debian sid</dd>
+
+                       <dt>Ubuntu</dt>
+                       <dd>Packaging in progress for Ubuntu 11.10</dd>
                </dl></li>
                <li class="windows"><dl class="inline">
                        <dt>Windows</dt>
                        <dd><a href="files/aweather-<%= VERSION_WIN32 %>-gtk.exe">aweather-<%= VERSION_WIN32 %>-gtk.exe</a>
-                               (Use this if you know what you're doing)</dd>
+                               (Use this unless you know what you're doing)</dd>
 
                        <dt>Without GTK</dt>
                        <dd><a href="files/aweather-<%= VERSION_WIN32 %>.exe">aweather-<%= VERSION_WIN32 %>.exe</a></dd>
@@ -352,7 +365,7 @@ Content-Type: text/html; charset=UTF-8
                <h3>NASA/TRMM version</h3>
                <ul>
                        <li><a href="<%= RSL_WEB %>">TRMM RSL Website</a></li>
-                       <li><a href="<%= RSL_FTP %>">rsl-v1.41.tar.gz</a></li>
+                       <li><a href="<%= RSL_FTP RSL_TAR %>"><%= RSL_TAR %></a></li>
                </ul>
        </div>
        <div class="col">
@@ -406,6 +419,7 @@ Content-Type: text/html; charset=UTF-8
                <span>AWeather <%= VERSION %></span>
                <img src="images/dl-arrow.png" alt="Download" />
        </a>
+       <p style="text-align: center;"><%= VERSION_DESC %></p>
 <% } %>
 
 <% void print_notfound(void) { %>

diff --git a/html.h b/html.h
index 5f96e4dd5c8b5346d617176c9f6e076e3b69079f..4bc9f736f07bd12dbb51b28cd4790d0e49db7154 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,11 +1,14 @@
 /* Version information */
-#define VERSION        "0.5"
-#define VERSION_LINUX  VERSION
-#define VERSION_GENTOO VERSION
-#define VERSION_DEBIAN VERSION
-#define VERSION_WIN32  VERSION
+#define VERSION        "0.5.1"
+#define VERSION_LINUX  "0.5.1"
+#define VERSION_GENTOO "0.5.1"
+#define VERSION_DEBIAN "0.5.1"
+#define VERSION_UBUNTU "0"
+#define VERSION_WIN32  "0.5.1"
 #define VERSION_MACOS  "0"
 
+#define VERSION_DESC   "Version " VERSION " contains several bug fixes along with updated WMS overlays"
+
 /* Link info */
 #define WIKI_INDEX   "/code/projects/aweather/wiki"
 #define WIKI_INSTALL "/code/projects/aweather/wiki/Install"
@@ -21,8 +24,11 @@
 #define GW_GRITS     "/git/?p=proj/grits"
 #define GW_RSL       "/git/?p=~spenceal/rsl"
 
+#define RSL_TAR      "rsl-v1.42.tar.gz"
 #define RSL_WEB      "http://trmm-fc.gsfc.nasa.gov/trmm_gv/software/rsl/"
-#define RSL_FTP      "ftp://trmm-fc.gsfc.nasa.gov/software/rsl-v1.41.tar.gz"
+#define RSL_FTP      "ftp://trmm-fc.gsfc.nasa.gov/software/"
+
+#define DEB_HOME     "http://packages.debian.org/unstable/aweather"
 
 #define PREFIX       "http://lug.rose-hulman.edu/proj/aweather/"
 

diff --git a/mkfile b/mkfile
index a0db4a4c65d0c6e0a58f5e71b5d1e3da9646b1cd..1f156888129d7a0a378b6f593599db3ae89bf950 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -13,5 +13,16 @@ index.cgi: index.o html.o
 %.c: %.ct
        $CT -o $target $prereq 
 
-clean:
+clean:V:
        rm -f *.o *.cgi html.c
+
+push:V:
+       user=spenceal
+       dest=/home/lug/htdocs/proj/aweather/
+       rsync -uavz .htaccess \
+               $user@lug.rose-hulman.edu:$dest
+       rsync -uavz --delete \
+               --exclude '*~' \
+               --exclude '.*' \
+               index.cgi images screens data \
+               $user@lug.rose-hulman.edu:$dest

diff --git a/push.sh b/push.sh
deleted file mode 100755 (executable)
index cacb466..0000000
--- a/push.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-user=spenceal
-dest="/home/lug/htdocs/proj/aweather/"
-rsync -uavz .htaccess \
-       $user@lug.rose-hulman.edu:$dest
-rsync -uavz --delete \
-       --exclude '*~' \
-       --exclude '.*' \
-       index.cgi images screens data \
-       $user@lug.rose-hulman.edu:$dest