Synchronized branch-0-12-x (ngIRCd 0.12.0-pre1) with master.

(cherry picked from commit 4ea29329674ff8ec6d772991a57c146b5d78d2ad)

diff --git a/configure.in b/configure.in
index 7dc174241372298cd010a774d70c63b3bea78457..7f1ac4958ba4e5fa5bd888fc2cf57291122f8609 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -8,13 +8,11 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.126 2008/02/26 22:04:15 fw Exp $
-#
 
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, CVSHEAD)
+AC_INIT(ngircd, HEAD)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)

diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog
index dba7d2890b306c1d01b63580d6ae67d51465dfe1..880a5096f27769a5726a56b8f75de0e4c555270b 100644 (file)
--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,3 +1,9 @@
+ngircd (0.12.0-0ab0-pre1) unstable; urgency=low
+
+  * Prereloease of upcoming new "upstrem" release 0.12.0-pre1.
+
+ -- Alexander Barton <alex@barton.de>  Sun, 20 Apr 2008 15:43:34 +0200
+
 ngircd (0.11.0-0ab0-pre2) unstable; urgency=low
 
   * Second prerelease of upcoming new "upstream release".