Merge branch 'master' into next

Conflicts:
	NEWS

diff --git a/NEWS b/NEWS
index bf45722a9b9619b88cd63f6887cd0db74e715bd8..cf24914c8461bd0ad176d74c70e4dc8f34fd266b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,9 +21,9 @@ provided for conversion of the 0.3 database to the new 0.4 format.
        - new mood methods: artist_matches, title_matches, comment_matches,
          album_matches, year_maches, year.
 
--------------------------------------------------
-0.3.5 (to be announced) "symplectic separability"
--------------------------------------------------
+--------------------------------------------
+0.3.5 (2009-09-21) "symplectic separability"
+--------------------------------------------
 
 Full client support for *BSD Unixes, complete re-write of the ogg
 vorbis audio format handler, various improvements all over the place

diff --git a/configure.ac b/configure.ac
index a1cba833e9041437958c17725dc1aff1db59355c..e28bce30aa3e11c3aafa4484cea6ec291e93ac73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [git], maan@systemlinux.org)
+AC_INIT(paraslash, [0.3.5], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)

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

diff --git a/versions/paraslash-0.3.5.tar.bz2.asc b/versions/paraslash-0.3.5.tar.bz2.asc
new file mode 100644 (file)
index 0000000..5cc75b3
--- /dev/null
+++ b/versions/paraslash-0.3.5.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBKt1rtWto1QDEAkw8RAocZAJ4jQn5teInn3jBrsSBE/PSsXnMOpgCfYBLG
+hWkgGqWO7yoN/ek1MF55Muo=
+=66a4
+-----END PGP SIGNATURE-----

diff --git a/web/index.in.html b/web/index.in.html
index 14464e72129c56079958eff7d2b2e7d2b5ff1858..8460f841f20cd409f96c42b3489690a1e7808369 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
 <h1>Events</h1>
 <hr>
 <ul>
+       <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"
+       </li>
        <li>2009-05-07: <a href="versions/paraslash-0.3.4.tar.bz2">paraslash-0.3.4</a>
                <a href="versions/paraslash-0.3.4.tar.bz2.asc">(sig)</a>
                "elliptic inheritance"