Update master development branch

- use "dev" instead of "HEAD" as "version number",
- update ChangeLog and NEWS to reflect the 0.12.0 release.

4 files changed, 11 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 6213d7a1..74eed80e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,18 +12,16 @@
 
 ngIRCd-dev
 
+  - ...
+
+ngIRCd 0.12.0 (2008-05-13)
+
   - Fix Bug: 85: "WHO #SecretChannel" that user is not a member of now returns
     proper RPL_ENDOFWHO_MSG instead of nothing. (Ali Shemiran)
-  - Implemented IRC commands SERVICE, SERVLIST, and SQUERY as dummy functions
-    to be even more RFC-compliant. Closes bug 74.
-  - Fixed Bug 75: KICK now handles comma-delimited lists.
-    (Brandon Beresini, Bryan Caldwell)
-  - Fixed Bug 83: ngIRCd chokes on 1-character messages.
-  - Add support for modeless channels ("+channels").
-    (Bryan Caldwell, Ali Shemiran)
-
-ngIRCd 0.12.0-pre2 (2008-04-29)
+  - Fix complie on FreeBSD 5.4 and AIX.
+  - If bind() fails, also print ip address and not just the port number.
 
+  ngIRCd 0.12.0-pre2 (2008-04-29)
   - IPv6: Add config options to disabe ipv4/ipv6 support.
   - Don't include doc/CVS.txt in distribution archive, use doc/GIT.txt now!
   - Documentation: get rid of some more references to CVS, switch to GIT.
diff --git a/NEWS b/NEWS
index 17e382e0..47def921 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,9 @@
                                   -- NEWS --
 
 
-ngIRCd 0.12.0-pre2 (2008-04-29)
+ngIRCd 0.12.0 (2008-05-13)
 
+  ngIRCd 0.12.0-pre2 (2008-04-29)
   - IPv6: Add config options to disabe ipv4/ipv6 support.
 
   ngIRCd 0.12.0-pre1 (2008-04-20)
diff --git a/configure.in b/configure.in
index 9b56318b..0f17322a 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, HEAD)
+AC_INIT(ngircd, dev)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)
diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec
index 924b0d1b..276a826f 100644
--- a/contrib/ngircd.spec
+++ b/contrib/ngircd.spec
@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version CVSHEAD
+%define version dev
 %define release 1
 %define prefix  %{_prefix}