summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--HACKING6
-rw-r--r--SConstruct58
-rw-r--r--doc/explanation.xml2
-rw-r--r--gpscat.xml4
-rw-r--r--gpsctl.xml4
-rw-r--r--gpsd.php.in (renamed from gpsd.php)6
-rw-r--r--gpsd.xml5
-rw-r--r--gpsdctl.xml4
-rw-r--r--gpsdecode.xml4
-rw-r--r--gpsfake.xml4
-rw-r--r--gpsmon.xml5
-rw-r--r--gpspipe.xml4
-rw-r--r--gpsprof.xml4
-rw-r--r--packaging/gpsd.ebuild31
-rw-r--r--packaging/rpm/gpsd.spec.in4
-rw-r--r--www/excellence.html13
-rw-r--r--www/faq.html.in (renamed from www/faq.html)38
-rw-r--r--www/hacking.html.in (renamed from www/hacking.html)14
-rw-r--r--www/hall-of-shame.html6
-rw-r--r--www/hardware-head.html6
-rw-r--r--www/hardware-tail.html6
-rw-r--r--www/index.html.in37
-rw-r--r--www/main.css5
-rw-r--r--www/references.html6
-rwxr-xr-xwww/upload.in2
-rw-r--r--www/upstream-bugs.html6
-rw-r--r--www/wishlist.html52
-rw-r--r--www/writing-a-driver.xml1
29 files changed, 102 insertions, 239 deletions
diff --git a/.gitignore b/.gitignore
index 07eecd6a..1154ca0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ gpsfake
gpsprof
jsongen.py
maskaudit.py
+upload
+gpsd.php
valgrind-audit.py
# Unit tests
test_float
@@ -91,6 +93,7 @@ stamp-python
# Documentation
www/AIVDM.html
www/NMEA.html
+www/faq.html
www/gps.html
www/gpscat.html
www/gpsctl.html
@@ -100,6 +103,7 @@ www/gpsfake.html
www/gpsmon.html
www/gpspipe.html
www/gpsprof.html
+www/hacking.html
www/hardware.html
www/index.html
www/installation.html
diff --git a/HACKING b/HACKING
index e9352abc..18bdeb79 100644
--- a/HACKING
+++ b/HACKING
@@ -1,8 +1,4 @@
For the gpsd project, the information that was traditionally placed in
-this file is on the website:
-
- http://gpsd.berlios.de/hacking.html
-
-and therefore also in the repository as:
+this file is in the repository as:
www/hacking.html
diff --git a/SConstruct b/SConstruct
index fe50b736..577a7371 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,9 +29,20 @@ libgps_age = 0
# Release identification ends here
# Hosting information (mainly used for templating web pages) begins here
-website = "http://catb.org/gpsd"
-mainpage = "https://savannah.nongnu.org/projects/gpsd/"
-uploadto = "login.ibiblio.org:/public/html/catb/gpsd"
+# Each variable foo has a corresponding @FOO@ expanded in .in files.
+sitename = "Savannah"
+sitesearch = "catb.org"
+website = "http://catb.org/gpsd"
+mainpage = "https://savannah.nongnu.org/projects/gpsd/"
+uploadto = "login.ibiblio.org:/public/html/catb/gpsd"
+mailman = "http://lists.nongnu.org/mailman/listinfo/"
+admin = "https://savannah.nongnu.org/project/admin/?group=gpsd"
+download = "http://download.savannah.gnu.org/releases/gpsd/"
+bugtracker = "https://savannah.nongnu.org/bugs/?group=gpsd"
+browserepo = "http://git.savannah.gnu.org/cgit/gpsd.git"
+clonerepo = "https://savannah.nongnu.org/git/?group=gpsd"
+webform = "https://www.mainframe.cx/cgi-bin/gps_report.cgi"
+devmail = "gpsd-dev@lists.nongnu.org"
# Hosting information ends here
EnsureSConsVersion(1,2,0)
@@ -909,13 +920,13 @@ else:
Name: gps
Version: %s
Summary: Python libraries for the gpsd service daemon
-Home-page: http://gpsd.berlios.de/
+Home-page: %s
Author: the GPSD project
-Author-email: gpsd-dev@lists.berlios.de
+Author-email: %s
License: BSD
Description: The gpsd service daemon can monitor one or more GPS devices connected to a host computer, making all data on the location and movements of the sensors available to be queried on TCP port 2947.
Platform: UNKNOWN
-""" %(gpsd_version, )
+""" %(gpsd_version, website, devmail)
python_egg_info = python_env.Textfile(target="gps-%s.egg-info" %(gpsd_version, ), source=python_egg_info_source)
env.Command(target = "packet_names.h", source="packet_states.h", action="""
@@ -953,7 +964,7 @@ revision='#define REVISION "%s"\n' %(rev.strip(),)
env.NoClean(env.Textfile(target="revision.h", source=[revision]))
generated_sources = ['packet_names.h', 'timebase.h', 'gpsd.h', "ais_json.i",
- 'gps_maskdump.c', 'revision.h']
+ 'gps_maskdump.c', 'revision.h', 'gpsd.php']
# leapseconds.cache is a local cache for information on leapseconds issued
# by the U.S. Naval observatory. It gets kept in the repository so we can
@@ -971,24 +982,35 @@ env.Precious(leapseconds_cache)
# but it doesn't seem to work in scons 1.20
def substituter(target, source, env):
substmap = (
- ('@VERSION@', gpsd_version),
- ('@prefix@', env['prefix']),
- ('@libdir@', env['libdir']),
- ('@PYTHON@', sys.executable),
- ('@DATE@', time.asctime()),
- ('@WEBSITE@', website),
- ('@MAINPAGE@',mainpage),
- ('@UPLOADTO@',uploadto),
+ ('@VERSION@', gpsd_version),
+ ('@prefix@', env['prefix']),
+ ('@libdir@', env['libdir']),
+ ('@PYTHON@', sys.executable),
+ ('@DATE@', time.asctime()),
+ ('@MASTER', 'DO NOT HAND_HACK! THIS FILE IS GENERATED@'),
+ ('@SITENAME@', sitename),
+ ('@SITESEARCH@', sitesearch),
+ ('@WEBSITE@', website),
+ ('@MAINPAGE@', mainpage),
+ ('@UPLOADTO@', uploadto),
+ ('@ADMIN@', admin),
+ ('@DOWNLOAD@', download),
+ ('@BUGTRACKER@', bugtracker),
+ ('@BROWSEREPO@', browserepo),
+ ('@CLONEREPO@', clonerepo),
+ ('@DEVMAIL@', devmail),
)
with open(str(source[0])) as sfp:
content = sfp.read()
for (s, t) in substmap:
content = content.replace(s, t)
+ m = re.search("@[A-Z]+@", content)
+ if m and m.group(0) not in map(lambda x: x[0], substmap):
+ print >>sys.stderr, "Unknown subst token %s in %s." % (m.group(0), sfp.name)
with open(str(target[0]), "w") as tfp:
tfp.write(content)
-templated = glob.glob("*.in") + glob.glob("www/*.in") + \
- ["packaging/rpm/gpsd.spec.in"]
+templated = glob.glob("*.in") + glob.glob("*/*.in")
for fn in templated:
builder = env.Command(source=fn, target=fn[:-3], action=substituter)
@@ -1351,7 +1373,7 @@ env.Alias('website', Split('''www/installation.html
www/index.html www/hardware.html
www/performance/performance.html
www/internals.html
- '''))
+ ''') + map(lambda f: f[:-3], glob.glob("www/*.in")))
# asciidoc documents
if env.WhereIs('asciidoc'):
diff --git a/doc/explanation.xml b/doc/explanation.xml
index 90f52d18..cf33a535 100644
--- a/doc/explanation.xml
+++ b/doc/explanation.xml
@@ -2,8 +2,6 @@
<!DOCTYPE article PUBLIC
"-//OASIS//DTD DocBook XML V4.1.2//EN"
"docbook/docbookx.dtd" [
-<!ENTITY homepage "http://gpsd.berlios.de">
-
<!ENTITY bits.h SYSTEM "explan_bits.h.xml">
<!ENTITY dbusexport.c SYSTEM "explan_dbusexport.c.xml">
<!ENTITY driver_nmea.c SYSTEM "explan_driver_nmea.c.xml">
diff --git a/gpscat.xml b/gpscat.xml
index b2ce257b..6508af7c 100644
--- a/gpscat.xml
+++ b/gpscat.xml
@@ -129,8 +129,6 @@ devices.</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
</refentry>
diff --git a/gpsctl.xml b/gpsctl.xml
index 54cc76c5..ea5ed557 100644
--- a/gpsctl.xml
+++ b/gpsctl.xml
@@ -255,8 +255,6 @@ these running in NMEA will change its behavior.</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
</refentry>
diff --git a/gpsd.php b/gpsd.php.in
index 27bb29da..ea0466f6 100644
--- a/gpsd.php
+++ b/gpsd.php.in
@@ -1,7 +1,5 @@
<?php
-#$CSK: gpsd.php,v 1.39 2006/11/21 22:31:10 ckuethe Exp $
-
# Copyright (c) 2006,2010 Chris Kuethe <chris.kuethe@gmail.com>
#
# Permission to use, copy, modify, and distribute this software for any
@@ -482,7 +480,7 @@ EOF;
{$footer}
<hr/>
<p class="administrivia">This script is distributed by the
-<a href="http://gpsd.berlios.de">GPSD project</a>.</p>
+<a href="@WEBSITE@">GPSD project</a>.</p>
</body>
</html>
@@ -529,7 +527,7 @@ function write_config(){
\$footer = '';
\$blurb = <<<EOT
This is a
-<a href="http://gpsd.berlios.de">gpsd</a>
+<a href="@WEBSITE@">gpsd</a>
server <blink><font color="red">located someplace</font></blink>.
The hardware is a
diff --git a/gpsd.xml b/gpsd.xml
index 597ca044..581f0c28 100644
--- a/gpsd.xml
+++ b/gpsd.xml
@@ -79,9 +79,8 @@ that <application>gpsd</application> knows how to speak,
<application>gpsd</application> and then
<application>xgps</application>, the X windows test client.</para>
-<para>If you have problems, the GPSD project maintains a <ulink
-url="http://gpsd.berlios.de/faq.html">FAQ</ulink> to assist
-troubleshooting.</para>
+<para>If you have problems, the GPSD project maintains a >FAQ to
+assist troubleshooting.</para>
</refsect1>
<refsect1 id='description'><title>DESCRIPTION</title>
diff --git a/gpsdctl.xml b/gpsdctl.xml
index 8fad2a83..12269ccf 100644
--- a/gpsdctl.xml
+++ b/gpsdctl.xml
@@ -66,8 +66,6 @@ when this tool launches it. It defaults to an empty string.</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
</refentry>
diff --git a/gpsdecode.xml b/gpsdecode.xml
index 68131ae3..f5aae92d 100644
--- a/gpsdecode.xml
+++ b/gpsdecode.xml
@@ -127,9 +127,7 @@ dump.</para>
</refsect1>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
</refentry>
diff --git a/gpsfake.xml b/gpsfake.xml
index 3617d9bb..2f490232 100644
--- a/gpsfake.xml
+++ b/gpsfake.xml
@@ -209,9 +209,7 @@ to the PATH environment variable</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
diff --git a/gpsmon.xml b/gpsmon.xml
index ea5b45cb..a33fe343 100644
--- a/gpsmon.xml
+++ b/gpsmon.xml
@@ -352,10 +352,7 @@ mode.
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. This code is
-part of the gpsd toolset; there is a project page for
-<application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
</refentry>
diff --git a/gpspipe.xml b/gpspipe.xml
index e82dd329..5e3d3b5d 100644
--- a/gpspipe.xml
+++ b/gpspipe.xml
@@ -144,9 +144,7 @@ standard output, then exit.</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Gary E. Miller <email>gem@rellim.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Gary E. Miller <email>gem@rellim.com</email>.</para>
</refsect1>
diff --git a/gpsprof.xml b/gpsprof.xml
index dfa957d2..107c4e76 100644
--- a/gpsprof.xml
+++ b/gpsprof.xml
@@ -182,9 +182,7 @@ a usage message and exit.</para>
<refsect1 id='maintainer'><title>AUTHOR</title>
-<para>Eric S. Raymond <email>esr@thyrsus.com</email>. There is a
-project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+<para>Eric S. Raymond <email>esr@thyrsus.com</email>.</para>
</refsect1>
diff --git a/packaging/gpsd.ebuild b/packaging/gpsd.ebuild
deleted file mode 100644
index a2d1cc69..00000000
--- a/packaging/gpsd.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2005 Amaury Jacquot
-# Author: Amaury Jacquot <sxpert@esitcom.org>
-#
-# WARNING: This is out of date! GPSD uses an scons build now.
-
-DESCRIPTION="gpsd is a daemon that listens to a GPS or Loran receiver and
-translates the positional data into a simplified format that can be more easily
-used by other programs like chart plotters. The package comes with a sample
-client that plots the location of the currently visible GPS satellites (if
-available) and a speedometer. It can also use DGPS/ip, and run as a DGPS/ip
-server, and, if the PPS signal is available, be used for NTP synchronization"
-HOMEPAGE="http://gpsd.berlios.de"
-SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 alpha"
-
-IUSE="motif"
-DEPEND="motif? (=x11-libs/openmotif)"
-
-src_compile() {
- econf \
- $(use_with motif x) \
- || die "econf failed"
- emake || die "compile failed"
-}
-
-src_install() {
- make DESTDIR=${D} install
-}
diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in
index adcce08b..5dc72404 100644
--- a/packaging/rpm/gpsd.spec.in
+++ b/packaging/rpm/gpsd.spec.in
@@ -7,8 +7,8 @@ Summary: Service daemon for mediating access to a GPS
Group: System Environment/Daemons
License: BSD
-URL: http://developer.berlios.de/projects/gpsd/
-Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
+URL: @MAINPAGE@
+Source0: @DOWNLOAD@/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bluez-libs-devel
diff --git a/www/excellence.html b/www/excellence.html
index 8ee35c55..e2d71570 100644
--- a/www/excellence.html
+++ b/www/excellence.html
@@ -74,10 +74,10 @@ software authors to write essays on how their projects drive out
bad code, offering $500 dollar prizes.</p>
<p>I sat down to write an essay about GPSD in the same vein of high
-drollery as the Alliance's site, then realized that <a
-href="http://gpsd.berlios.de/">GPSD</a> actually has a serious case to
-make. We really do drive out bad code, in both direct and indirect
-ways, and we supply examples of good practice for emulation.</p>
+drollery as the Alliance's site, then realized that GPSD actually has
+a serious case to make. We really do drive out bad code, in both
+direct and indirect ways, and we supply examples of good practice for
+emulation.</p>
<p>GPSD is a service daemon and device multiplexer that is the
open-source world's basic piece of infrastructure for communicating
@@ -242,8 +242,3 @@ real hardware is vital to fully learn their quirks.</p>
<script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
</body>
</html>
-<!--
-Local Variables:
-compile-command: "(scp excellence.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/faq.html b/www/faq.html.in
index fb5e7bea..39c550b7 100644
--- a/www/faq.html
+++ b/www/faq.html.in
@@ -1,4 +1,5 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!-- @MASTER@ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -169,12 +170,10 @@ have a real <code>gpsd</code> bug.</p>
<p>If you are using an old version of <code>gpsd</code>, it is
possible your bug has already been fixed. Download the latest public
-version from the <a
-href='http://developer.berlios.de/projects/gpsd/'>project page</a> and
-test it. To be really helpful, check out the <a
-href='https://developer.berlios.de/git/?group_id=2116'>git
-head</a> and test that. We don't mind getting bug reports that say
-"I saw version foo had the following bug, but you've fixed it."</p>
+version from the <a href='@MAINPAGE@'>project page</a> and test it.
+To be really helpful, check out the <a href='@REPOVIEW@'>git head</a>
+and test that. We don't mind getting bug reports that say "I saw
+version foo had the following bug, but you've fixed it."</p>
<h3>5. Capture a log that triggers the problem</h3>
@@ -215,11 +214,8 @@ all, is the firmware version. You will want that for your report.</p>
<h3 id="logformat">8. Annotate the capture log and send us a copy</h3>
-<!-- Note: his is also linked on the hardware page -->
<p>We'll describe the annotation steps here for completeness, but the
-easiest way to do this is with <a
-href="https://www.mainframe.cx/cgi-bin/gps_report.cgi">our web
-form</a>
+easiest way to do this is with <a href="@WEBFORM">our web form</a>
<p>A logfile should consist of an identifying header followed by a
straight unencoded dump of receiver data, whether NMEA or binary. The
@@ -317,9 +313,8 @@ far more helpful to us and will get your bug fixed faster, so we'll
describe that procedure here.</p>
<ol>
-<li><p>Follow <a
-href='http://developer.berlios.de/git/?group_id=2116'>these
-instructions</a> to check out a copy of the software.</p></li>
+<li><p>Follow <a href='@CLONEREPO@'>these instructions</a> to clone
+a copy of the source repository.</p></li>
<li><p>Use <a
href="http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html">git
@@ -341,10 +336,10 @@ too long to fit, let the daemon run for a few minutes and issue an "I"
command to it. Alternatively, running the daemon at -D 4 may reveal
the version.</p>
-<h3>13. Report it on the Berlios bugtracker</h3>
+<h3>13. Report it on the GPSD bugtracker</h3>
<p>There is a <a
-href="http://developer.berlios.de/bugs/?group_id=2116">gpsd bug tracker</a>.
+href="@BUGTRACKER">GPSD bug tracker</a>.
Use that. If your bug narrative does not fit the tracker template well,
it's acceptable to send an email report to the gpsd-dev list.</p>
</blockquote>
@@ -354,10 +349,10 @@ it's acceptable to send an email report to the gpsd-dev list.</p>
<p>On a Linux machine, the <code>gpsd</code> daemon normally takes
between 0.1 and 0.6 seconds to handshake with your hardware. After
that you will receive GPS reports within a second of when the sensor
-issues them. GPSD itself adds <a
-href="http://gpsd.berlios.de/performance.html">almost no measurable
-latency</a>, but RS-232 transmission time to <code>gpsd</code> can be
-more significant; you can cut this time by increasing the baud rate.</p>
+issues them. GPSD itself adds <a href="performance.html">almost no
+measurable latency</a>, but RS-232 transmission time to
+<code>gpsd</code> can be more significant; you can cut this time by
+increasing the baud rate.</p>
<p>Longer handshake delays have been reported from other platforms.
Under OpenBSD, time to handshake with some binary GPSes (including
@@ -823,8 +818,3 @@ at steadily less than 1% on a low-power, low-speed ARM SBC.</p>
<script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
</body>
</html>
-<!--
-Local Variables:
-compile-command: "(scp faq.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hacking.html b/www/hacking.html.in
index ae602ac8..6bb74be4 100644
--- a/www/hacking.html
+++ b/www/hacking.html.in
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- @MASTER@ -->
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1358,9 +1359,8 @@ at state 2 -- you must notify the dev list.</p>
the following order:</p>
<dl>
-<dt>1. Check the <a
-href="http://developer.berlios.de/bugs/?group_id=2116">Berlios bug
-tracker</a> for release blockers.</dt> <dd></dd>
+<dt>1. Check the <a href="@BUGTRACKER@">bug tracker</a> for
+release blockers.</dt> <dd></dd>
<dt>2. Issue the pre-release heads-up</dt>
<dd>About 48 hours before release, announce that it's coming so people
@@ -1399,10 +1399,10 @@ gpsd.spec.in is up-to-date and properly timestamped.</dd>
</ol>
</dd>
-<dt>9. Ship to Berlios</dt>
-<dd>Make the tarball (scons dist) and upload to berlios.de (scons upload-ftp),
-and do Berlios's
-<a href="https://developer.berlios.de/project/admin/?group_id=2116">release procedure</a>.</dd>
+<dt>9. Ship to our hosting site</dt>
+<dd>Make the tarball (scons dist), upload it to @SITENAME@,
+(scons upload-ftp), and do <a href="@ADMIN@">release
+procedure</a>.</dd>
<dt>10. Tag the release in git</dt>
<dd>Do this:
diff --git a/www/hall-of-shame.html b/www/hall-of-shame.html
index 3bc87a50..3d76dd4d 100644
--- a/www/hall-of-shame.html
+++ b/www/hall-of-shame.html
@@ -152,9 +152,3 @@ way to query the offset.</p></li>
<script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
</body>
</html>
-
-<!--
-Local Variables:
-compile-command: "(scp hall-of-shame.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hardware-head.html b/www/hardware-head.html
index 547fdd25..4d1abac2 100644
--- a/www/hardware-head.html
+++ b/www/hardware-head.html
@@ -175,7 +175,6 @@ bug), poor ratings reflect problems not in <tt>gpsd</tt> but rather in
device design and firmware so badly botched that <tt>gpsd</tt> cannot
compensate.</p>
-<!-- Note: The CGI lives offsite because Berlios blocks outbound mail -->
<p>This table is generated from a capability database in the
<code>gpsd</code> source tree. Please help us enrich the database with
new devices by filling out <a
@@ -185,8 +184,3 @@ form</a>.</p>
<div>&nbsp;</div>
<!-- hardware-head.html ends here -->
-<!--
-Local Variables:
-compile-command: "(make hardware.html; scp hardware.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hardware-tail.html b/www/hardware-tail.html
index 1f0c6d61..dbada9ef 100644
--- a/www/hardware-tail.html
+++ b/www/hardware-tail.html
@@ -211,9 +211,3 @@ serial data accurate to about 250mS.</p>
<script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
</body>
</html>
-
-<!--
-Local Variables:
-compile-command: "(make hardware.html; scp hardware.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/index.html.in b/www/index.html.in
index 9f59a803..0c55e684 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -203,10 +203,10 @@ version) rather than the latest released stable version.</p>
<dd>The main project page</dd>
<dt><a
-href="http://developer.berlios.de/project/showfiles.php?group_id=2116">Releases</a>
+href="@DOWNLOAD@">Releases</a>
<dd>Where to get release tarballs</dd>
-<dt><a href="http://developer.berlios.de/git/?group_id=2116">Browse Code</a></dt>
+<dt><a href="@VIEWREPO@">Browse Code</a></dt>
<dd>Developer access to master git repository</dd>
<dt><a
@@ -224,27 +224,22 @@ line.</p>
<p>There are four project mailing lists:</p>
<ul>
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-announce">gpsd-announce</a>
+<li><a href="@MAILMAN@/gpsd-announce">gpsd-announce</a>
is for release announcements and project news.</li>
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-users">gpsd-users</a>
+<li><a href="@MAILMAN@/gpsd-users">gpsd-users</a>
is for questions and technical support on <code>gpsd</code>, including support
for application builders using <code>gpsd</code> as a component.</li>
-
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-dev">gpsd-dev</a>
+<li><a href="@MAILMAN@/gpsd-dev">gpsd-dev</a>
is for <code>gpsd</code> developers.</li>
-
-<li><a
-href="https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch">gpsd-commit-watch</a>
+<li><a href="@MAILMAN@/gpsd-commit-watch">gpsd-commit-watch</a>
sends automatic broadcast notifications of commits to the <code>gpsd</code>
repository.</li>
-<li>We also have searchable archives at <a href="http://marc.info">MARC</a>:
-<a href="http://marc.info/?l=gpsd-users">gpsd-users</a>,
-<a href="http://marc.info/?l=gpsd-dev">gpsd-dev</a> and
-<a href="http://marc.info/?l=gpsd-commit-watch">gpsd-commit-watch</a>.</li>
+<li>There are searchable archives of the old GPSD mailing lists from
+Berlios at <a href="http://marc.info">MARC</a>: <a
+href="http://marc.info/?l=gpsd-users">gpsd-users</a>, <a
+href="http://marc.info/?l=gpsd-dev">gpsd-dev</a> and <a
+href="http://marc.info/?l=gpsd-commit-watch">gpsd-commit-watch</a>.</li>
</ul>
<h1 id='documentation'>Documentation</h1>
@@ -417,9 +412,7 @@ of the setup steps and caveats will be the same.</p>
href="http://code.google.com/p/qtgpsc/">Qt-based client</a>, basically
<code>xgps</code> with a Qt look and feel.
-<p>We supply a Gentoo Linux ebuild script in the source distribution.</p>
-
-<p>You can find Debian-unstable packages
+0<p>You can find Debian-unstable packages
<a href='http://packages.debian.org/unstable/misc/gpsd'>here</a>.</p>
<p>There's a Perl client library <a
@@ -510,7 +503,7 @@ Here</a>.</font></td></tr></table></td></tr></table></noscript>
<img src="http://www.google.com/logos/Logo_25wht.gif" border="0" alt="Google" align="middle"></img></a>
</td>
<td nowrap="nowrap">
-<input type="hidden" name="domains" value="gpsd.berlios.de"></input>
+<input type="hidden" name="domains" value="@SITESEARCH@"></input>
<input type="text" name="q" size="31" maxlength="255" value=""></input>
<input type="submit" name="sa" value="Search"></input>
</td></tr>
@@ -524,8 +517,8 @@ Here</a>.</font></td></tr></table></td></tr></table></noscript>
<font size="-1" color="#000000">Web</font>
</td>
<td>
-<input type="radio" name="sitesearch" value="gpsd.berlios.de"></input>
-<font size="-1" color="#000000">gpsd.berlios.de</font>
+<input type="radio" name="sitesearch" value="@SITESEARCH@"></input>
+<font size="-1" color="#000000">@SITESEARCH@</font>
</td>
</tr>
</table>
diff --git a/www/main.css b/www/main.css
index 58defc05..89a4bc97 100644
--- a/www/main.css
+++ b/www/main.css
@@ -111,8 +111,3 @@ div.strike {
font-size:small;
text-indent: 0;
}
-/*
-Local Variables:
-compile-command: "(scp main.css esr@shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
-*/
diff --git a/www/references.html b/www/references.html
index f5ac2523..21525d7d 100644
--- a/www/references.html
+++ b/www/references.html
@@ -524,9 +524,3 @@ Formulary</a></dt>
<script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
</body>
</html>
-
-<!--
-Local Variables:
-compile-command: "(scp references.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/upload.in b/www/upload.in
index 19069216..e1b7ee61 100755
--- a/www/upload.in
+++ b/www/upload.in
@@ -6,7 +6,6 @@
# No CGI copy yet, hosting site won't let us send mail
#
webdir=@UPLOADTO@
-#cgidir=shell.berlios.de:/home/groups/gpsd/cgi-bin
# Ensure all derived HTML and checksums are up to date.
(cd ..; scons website)
@@ -29,7 +28,6 @@ else
else
scp $eligible $webdir && touch .upload-stamp
fi
- #scp gps_report.cgi $cgidir
fi
# End
diff --git a/www/upstream-bugs.html b/www/upstream-bugs.html
index 4dc58249..adb318e8 100644
--- a/www/upstream-bugs.html
+++ b/www/upstream-bugs.html
@@ -381,10 +381,6 @@ Apple and is reported fixed.</p>
</div>
<hr>
-<script language="JavaScript" src="datestamp.js" type="text/javascript"></script><!--
-Local Variables:
-compile-command: "(scp upstream-bugs.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
+<script language="JavaScript" src="datestamp.js" type="text/javascript"></script>
</body>
</html>
diff --git a/www/wishlist.html b/www/wishlist.html
index d17dea44..e08c9d9e 100644
--- a/www/wishlist.html
+++ b/www/wishlist.html
@@ -279,6 +279,7 @@ purchased.</p>
<div>&nbsp;</div>
+<div>
<table border="1" cellpadding="2" cellspacing="2">
<tbody>
<tr align="center">
@@ -317,58 +318,9 @@ purchased.</p>
help us get the standards and test hardware we need so we can do a better
job on behalf of everyone.</p>
-<div>&nbsp;</div>
-
-<div style="text-align: center;">
-<span>Search for GPS-related information here:</span>
-<!-- SiteSearch Google -->
-<form method="get" action="http://www.google.com/custom" target="_top">
- <table bgcolor="#ffffff" border="0">
- <tbody>
- <tr>
- <td align="left" height="32" nowrap="nowrap" valign="top"><a
- href="http://www.google.com/"> <img
- src="http://www.google.com/logos/Logo_25wht.gif" alt="Google"
- align="middle" border="0"></a></td>
- <td nowrap="nowrap"> <input name="domains"
- value="gpsd.berlios.de" type="hidden"><input name="q" size="31"
- maxlength="255" value="" type="text"> <input name="sa" value="Search"
- type="submit"></td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td nowrap="nowrap">
- <table>
- <tbody>
- <tr>
- <td> <input name="sitesearch" value="" type="radio"><font
- color="#000000" size="-1">Web</font> </td>
- <td> <input name="sitesearch" value="gpsd.berlios.de"
- checked="checked" type="radio"><font color="#000000" size="-1">gpsd.berlios.de</font>
- </td>
- </tr>
- </tbody>
- </table>
- <input name="client" value="pub-1458586455084261" type="hidden">
- <input name="forid" value="1" type="hidden"><input name="ie"
- value="ISO-8859-1" type="hidden"> <input name="oe" value="ISO-8859-1"
- type="hidden"><input name="flav" value="0000" type="hidden"> <input
- name="sig" value="BCQudoNGuH3P6MJe" type="hidden"><input name="cof"
- value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1"
- type="hidden"> <input name="hl" value="en" type="hidden"></td>
- </tr>
- </tbody>
- </table>
-</form>
-<!-- SiteSearch Google -->
-</div>
</div>
<hr>
-<script language="JavaScript" src="datestamp.js" type="text/javascript"></script><!--
-Local Variables:
-compile-command: "(scp wishlist.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
+<script language="JavaScript" src="datestamp.js" type="text/javascript"></script>
</body>
</html>
diff --git a/www/writing-a-driver.xml b/www/writing-a-driver.xml
index 1782cb1a..ab624354 100644
--- a/www/writing-a-driver.xml
+++ b/www/writing-a-driver.xml
@@ -2,7 +2,6 @@
<!DOCTYPE article PUBLIC
"-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY homepage "http://gpsd.berlios.de">
]>
<article>
<title>Notes on Writing a GPSD Driver</title>