Update README* for current situation

diff --git a/README b/README
index acd06ee5b2ee690269849eaa0194b37259be5a8c..91a78976a990dd28b316896e9ff5c4d5db47327d 100644 (file)
--- a/README
+++ b/README
@@ -34,9 +34,9 @@ Build dependencies:
   libao            0.8.6
   libasound        1.0.13
   libFLAC          1.1.2
   libao            0.8.6
   libasound        1.0.13
   libFLAC          1.1.2

-  GNU C            4.1.2
-  GNU Make         3.81
-  GNU Sed          4.1.5
+  GNU C            4.1.2               }
+  GNU Make         3.81                } Non-GNU versions will NOT work
+  GNU Sed          4.1.5               }

   Python           2.4.4               (optional)
   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)
   Python           2.4.4               (optional)
   GTK+             2.8.20              (if you want the GTK+ client)
   GLIB             2.12.4              (if you want the GTK+ client)

diff --git a/README.developers b/README.developers
index 5a5dd8908acba9035dc3aea11ccc4f3d2d9ffbd9..e1045981b5366c5096869138cedc6bdfe84cd994 100644 (file)
--- a/README.developers
+++ b/README.developers
@@ -14,6 +14,8 @@ Dependencies:
                     libao-dev libmad0-dev libasound2-dev libdb4.3-dev \
                     libflac-dev
 
                     libao-dev libmad0-dev libasound2-dev libdb4.3-dev \
                     libflac-dev
 

+     (Use the bzr from backports, the one in etch is obsolete.)
+

    * On FreeBSD you'll need at least these packages:
         autotools
         bash
    * On FreeBSD you'll need at least these packages:
         autotools
         bash


@@ -138,10 +140,7 @@ Web Interface:
      keep it that way.  Clever use of CSS is OK provided it works well on the
      mainstream browsers.
 
      keep it that way.  Clever use of CSS is OK provided it works well on the
      mainstream browsers.
 

-   * I know that the web template syntax is rather nasty.  Perhaps it will be
-     improved in a future version.
-
-   * Update templates/help.html for any changes you make.
+   * Update templates/help.tmpl for any changes you make.

 
 Disobedience:
 
 
 Disobedience:
 


@@ -188,12 +187,10 @@ Code And Patches:
      (But if your new feature only makes sense on a given platform then
      obviously its new dependencies don't need to be available elsewhere.)
 
      (But if your new feature only makes sense on a given platform then
      obviously its new dependencies don't need to be available elsewhere.)
 

-   * GCC is stated as a dependency.  In fact the code is mostly standard C,
-     with C99 initializers, long long and possibly the occasional // comment as
-     the main departures from C89.  Additional GCCisms will be accepted if it's
-     impractical to avoid them.  At least one active user is still using GCC
-     2.95, so extensions that only appear in later versions are to be avoided
-     for the time being.
+   * GCCisms such as typeof are used; the configure script asks for -std=gnu99
+     by default.  At least one active user is still using GCC 2.95, so
+     extensions that only appear in later versions are to be avoided for the
+     time being.

 
    * Please submit patches either using 'diff -u', or by publishing a bzr
      branch somewhere I can get at it.
 
    * Please submit patches either using 'diff -u', or by publishing a bzr
      branch somewhere I can get at it.

diff --git a/configure.ac b/configure.ac
index 87430a3b7479ab363a1d39f1e43862481331bea4..d1895dc1607fb9370339ef8c0c17a0231bf4f935 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,9 @@
 # USA
 #
 
 # USA
 #
 

-AC_INIT([disorder], [4.0], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [4.0+], [richard+disorder@sfere.greenend.org.uk])

 AC_CONFIG_AUX_DIR([config.aux])
 AC_CONFIG_AUX_DIR([config.aux])

-AM_INIT_AUTOMAKE(disorder, [4.0])
+AM_INIT_AUTOMAKE(disorder, [4.0+])

 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])