Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

	configure.ac
	debian/changelog

ChangeLog

@@ -16,6 +16,10 @@
 	* scripts/t/*: Added some non-regression test on many parts of the
 	newly introduced perl modules.
 
+2007-10-08  Guillem Jover  <guillem@debian.org>
+
+	* configure.ac: Bump version to 1.14.8~.
+
 2007-10-08  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Release 1.14.7.

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.8], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.14.8~], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])