Merge branch 'master' into next

diff --git a/Makefile.in b/Makefile.in
index 6794efedf7c5a31cbb8be27b1cb28fec2515a5b8..a24ba6bae03256033d394119dec43e02550b6b7d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := simultaneous independence
+codename := concurrent eternalty
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls

diff --git a/NEWS b/NEWS
index c5b1f6782c33a084b0724744f6582ee001330719..bbf62950d17fa24f1405fe8878c9ab9ec91ce94e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
 NEWS
 ====
 
----------------------------------------------------
-0.4.0 (to be announced) "simultaneous independence"
----------------------------------------------------
+----------------------------------------------
+0.4.1 (to be announced) "concurrent eternalty"
+----------------------------------------------
+
+----------------------------------------------
+0.4.0 (2009-11-10) "simultaneous independence"
+----------------------------------------------
 
 Two significant changes which require the new version number: The
 improved authentication dialog and the fact that the database code

diff --git a/versions/paraslash-0.4.0.tar.bz2 b/versions/paraslash-0.4.0.tar.bz2
new file mode 100644 (file)
index 0000000..b4bd7fd
Binary files /dev/null and b/versions/paraslash-0.4.0.tar.bz2 differ

diff --git a/versions/paraslash-0.4.0.tar.bz2.asc b/versions/paraslash-0.4.0.tar.bz2.asc
new file mode 100644 (file)
index 0000000..c97337d
--- /dev/null
+++ b/versions/paraslash-0.4.0.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBK+ZoEWto1QDEAkw8RAnNWAJ918+nDTCYHpYNyDiYiOg42QyfPIACZAWAI
+a3yaR7ISQ9Fl5RGNkcnU3ms=
+=1J9B
+-----END PGP SIGNATURE-----

diff --git a/web/index.in.html b/web/index.in.html
index 8460f841f20cd409f96c42b3489690a1e7808369..b685ac9d162d7c3eb8a5b2eb6a011c411ab74d9e 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
 <h1>Events</h1>
 <hr>
 <ul>
+       <li>2009-11-10: <a href="versions/paraslash-0.4.0.tar.bz2">paraslash-0.4.0</a>
+               <a href="versions/paraslash-0.4.0.tar.bz2.asc">(sig)</a>
+               "simultaneous independence"
+       </li>
        <li>2009-09-21: <a href="versions/paraslash-0.3.5.tar.bz2">paraslash-0.3.5</a>
                <a href="versions/paraslash-0.3.5.tar.bz2.asc">(sig)</a>
                "symplectic separability"