[glibmm/glibmm-2-20-mm-common: 171/179] Merge commit '3a2e7d1767b486e977e4b1891c696566adac54a5' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit 6014f0327a982089940414c25ed0c53241f4a8f4
Merge: f4bfd27... 3a2e7d1...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 11:19:25 2009 +0200

    Merge commit '3a2e7d1767b486e977e4b1891c696566adac54a5' into glibmm-2-20-mm-common

 ChangeLog                                  |   23 +++++++++++++++++++++++
 configure.ac                               |    2 +-
 docs/Makefile.am                           |    4 ----
 docs/reference/glibmm_header.html_fragment |    4 ++--
 gio/giomm-uninstalled.pc.in                |    2 +-
 gio/giomm.pc.in                            |    2 +-
 glib/glibmm-uninstalled.pc.in              |    2 +-
 glib/glibmm.pc.in                          |    2 +-
 tools/enum.pl                              |   21 ++++++++++-----------
 9 files changed, 40 insertions(+), 22 deletions(-)
---
diff --cc ChangeLog
index e310673,b87235a..782157a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,39 +1,28 @@@
+ 2009-08-25  Daniel Elstner  <danielk openismus com>
+ 
+ 	Change documentation host to library.gnome.org
+ 
+ 	* docs/Makefile.am (htmlrefpub): Remove override and use the
+ 	updated mm-common default value.
+ 	* docs/reference/glibmm_header.html_fragment: Adjust links to
+ 	the main page and the gtkmm book.
+ 	* {glib,gio}/{glib,gio}mm{,-uninstalled}.pc.in (htmlrefpub):
+ 	Adjust variable values.
+ 	* configure.ac (MM_PREREQ): Require mm-common 0.6.1.
+ 
+ 2009-08-24  Daniel Elstner  <danielk openismus com>
+ 
+ 	Strip directory from filenames in enum.pl output
+ 
+ 	* tools/enum.pl: Use File::Spec module.  Reduce the backslashitis
+ 	in a number of regular expressions by replacing the slash used as
+ 	the delimiter with a less troublesome character.
+ 	(parse): Only print the basename component of the filename.
+ 	(process): Put \Q...\E quoting escapes around a variable reference
+ 	within a regular expression to protect meta-characters.
+ 
  2009-08-21  Daniel Elstner  <danielk openismus com>
  
 -	Deprecate wrapper methods of deprecated functions
 -
 -	* gio/src/file.{ccg,hg} (File::{eject,unmount}_mountable*),
 -	gio/src/volumemonitor.hg (VolumeMonitor::adopt_orphan_mount):
 -	Enclose within deprecation guards since the corresponding C API
 -	functions have been deprecated in API version 2.22 of GIO.
 -	Insert #undef G_DISABLE_DEPRECATED at the top of the source files
 -	so that giomm builds again at warning level fatal.
 -
 -2009-08-21  Daniel Elstner  <danielk openismus com>
 -
  	Move #undef G_DISABLE_DEPRECATED out of header
  
  	* glib/src/date.hg: Push the #undef G_DISABLE_DEPRECATED into the
diff --cc tools/enum.pl
index f1b6cbe,357931d..357931d
mode 100644,100755..100644
--- a/tools/enum.pl
+++ b/tools/enum.pl