Merge from 4.0 branch

diff --git a/CHANGES.html b/CHANGES.html
index b0f27e0..a1a0b9a 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -57,6 +57,14 @@ span.command {
 
 <p>This file documents recent user-visible changes to DisOrder.</p>
 
+<h2>Changes up to version 4.0.2</h2>
+
+<div class=section>
+
+  <p>Corrected web browser linked from Disobedience.</p>
+  
+</div>
+
 <h2>Changes up to version 4.0.1</h2>
 
 <div class=section>

diff --git a/debian/changelog b/debian/changelog
index 7e0c0b6..9a4bb40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (4.0.2) unstable; urgency=low
+
+  * Correct web browser linkage from Disobedience.
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Sun, 15 Jun 2008 14:44:22 +0100
+
 disorder (4.0.1) unstable; urgency=low
 
   * Version 4.0.1

diff --git a/debian/rules b/debian/rules
index 113f989..0c14444 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ httpdir=/var/www
 browser=x-www-browser
 
 # Options to configure.  This can be overridden by the caller if necessary.
-CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=$browser cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
+CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
 
 # Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))