Imported from archive.

* Release 1.2.

* FAQ, README: Updated for inclsuion of weather-util in Debian.

* weather.py: Upped the version to 1.2.

* weatherrc: Added more default aliases PAO and SJC (requested by
Russ Allbery).

diff --git a/FAQ b/FAQ
index 9a26624..45ffcfd 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -42,30 +42,3 @@ likely to be published in a non-English language, requiring some
 additional input from speakers of that language for how to handle
 filtering and formatting of the text.
 
-
-5. I get a warning when using apt-get to install on Debian Etch
-or later...
-
-If you're getting a warning from apt-get update like:
-
-   W: GPG error: http://fungi.yuggoth.org ./ Release: The
-      following signatures couldn't be verified because the
-      public key is not available: NO_PUBKEY 29ABF7441FB84657
-
-...it means my PGP key is not recognized by apt-get. Since this
-isn't an official Debian package repository, the Release.gpg
-file can't be signed by a key on the default keyring. To add my
-personal key to the list of trusted package repository Release
-signers, run (as root):
-
-   finger fungi@yuggoth.org | apt-key add -
-
-...or if you want to be a little paranoid, retrieve it from a
-public keyserver instead (all one line):
-
-   wget -O- "http://subkeys.pgp.net:11371/pks
-   /lookup?op=get&search=0x29ABF7441FB84657" | apt-key add -
-
-Though if you're really, truly paranoid, you'll re-write the
-program from scratch anyway, right?
-

diff --git a/README b/README
index 235a508..29baf3d 100644 (file)
--- a/README
+++ b/README
@@ -47,17 +47,6 @@ be had here:
 
    http://fungi.yuggoth.org/weather/src/
 
-Alternatively, Debian users can grab a pre-built DEB package
-here:
-
-   http://fungi.yuggoth.org/weather/debian/
-
-...or add these lines for binary and, optionally, source packages
-to /etc/apt/sources.list:
-
-   deb http://fungi.yuggoth.org/weather/debian ./
-   deb-src http://fungi.yuggoth.org/weather/debian ./
-
-...then 'apt-get update && apt-get install weather-util' as root
-to get the current package installed and working.
+Alternatively, Debian Etch (testing) and Sid (unstable) users can
+install the weather-util package from any mirror.
 

diff --git a/weather b/weather
index 1110ea0..bf5129a 100755 (executable)
--- a/weather
+++ b/weather
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# weather version 1.1, http://fungi.yuggoth.org/weather/
+# weather version 1.2, http://fungi.yuggoth.org/weather/
 # Copyright (c) 2006 Jeremy Stanley <fungi@yuggoth.org>, all rights reserved.
 # Licensed per terms in the LICENSE file distributed with this software.
 

diff --git a/weather.py b/weather.py
index a93f1ed..9d4b0e0 100644 (file)
--- a/weather.py
+++ b/weather.py
@@ -1,10 +1,10 @@
-# weather.py version 1.1, http://fungi.yuggoth.org/weather/
+# weather.py version 1.2, http://fungi.yuggoth.org/weather/
 # Copyright (c) 2006 Jeremy Stanley <fungi@yuggoth.org>, all rights reserved.
 # Licensed per terms in the LICENSE file distributed with this software.
 
 """Contains various object definitions needed by the weather utility."""
 
-version = "1.1"
+version = "1.2"
 
 class Selections:
        """An object to contain selection data."""

diff --git a/weatherrc b/weatherrc
index a850add..85f0b3c 100644 (file)
--- a/weatherrc
+++ b/weatherrc
@@ -793,6 +793,11 @@ City = Paducah
 ID = KPAH
 St = KY
 
+[PAO]
+City = San Francisco
+ID = KPAO
+St = CA
+
 [PBI]
 City = West Palm Beach
 ID = KPBI
@@ -973,6 +978,11 @@ City = Shreveport
 ID = KSHV
 St = LA
 
+[SJC]
+City = San Jose
+ID = KSJC
+St = CA
+
 [SJT]
 City = San Angelo
 ID = KSJT