diff -pruN 0.6.92-6/aclocal.m4 12.10.1-0ubuntu5/aclocal.m4
--- 0.6.92-6/aclocal.m4	2012-03-21 20:40:19.000000000 +0000
+++ 12.10.1-0ubuntu5/aclocal.m4	2012-08-22 04:52:41.000000000 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -340,7 +340,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -356,7 +356,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -pruN 0.6.92-6/bindings/Makefile.in 12.10.1-0ubuntu5/bindings/Makefile.in
--- 0.6.92-6/bindings/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/bindings/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -65,6 +82,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -498,13 +520,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -pruN 0.6.92-6/bindings/mono/indicate/Makefile.in 12.10.1-0ubuntu5/bindings/mono/indicate/Makefile.in
--- 0.6.92-6/bindings/mono/indicate/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/bindings/mono/indicate/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -68,6 +85,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -408,8 +430,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-assemblyDATA: $(assembly_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
 	@list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(assemblydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(assemblydir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -426,8 +451,11 @@ uninstall-assemblyDATA:
 	dir='$(DESTDIR)$(assemblydir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -610,13 +638,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -pruN 0.6.92-6/bindings/mono/indicate-gtk/Makefile.in 12.10.1-0ubuntu5/bindings/mono/indicate-gtk/Makefile.in
--- 0.6.92-6/bindings/mono/indicate-gtk/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/bindings/mono/indicate-gtk/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -69,6 +86,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -409,8 +431,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-assemblyDATA: $(assembly_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
 	@list='$(assembly_DATA)'; test -n "$(assemblydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(assemblydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(assemblydir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -427,8 +452,11 @@ uninstall-assemblyDATA:
 	dir='$(DESTDIR)$(assemblydir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -611,13 +639,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -pruN 0.6.92-6/bindings/mono/Makefile.in 12.10.1-0ubuntu5/bindings/mono/Makefile.in
--- 0.6.92-6/bindings/mono/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/bindings/mono/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,6 +80,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -496,13 +518,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -pruN 0.6.92-6/bindings/python/Makefile.in 12.10.1-0ubuntu5/bindings/python/Makefile.in
--- 0.6.92-6/bindings/python/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/bindings/python/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -122,6 +139,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(_indicate_la_SOURCES) $(nodist__indicate_la_SOURCES)
 DIST_SOURCES = $(_indicate_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
 py_compile = $(top_srcdir)/py-compile
 DATA = $(defs_DATA)
@@ -381,7 +403,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 $(am__aclocal_m4_deps):
 install-indicateLTLIBRARIES: $(indicate_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(indicatedir)" || $(MKDIR_P) "$(DESTDIR)$(indicatedir)"
 	@list='$(indicate_LTLIBRARIES)'; test -n "$(indicatedir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -389,6 +410,8 @@ install-indicateLTLIBRARIES: $(indicate_
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(indicatedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(indicatedir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(indicatedir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(indicatedir)"; \
 	}
@@ -450,8 +473,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-pkgindicatePYTHON: $(pkgindicate_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgindicatedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgindicatedir)"
 	@list='$(pkgindicate_PYTHON)'; dlist=; list2=; test -n "$(pkgindicatedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgindicatedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgindicatedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
@@ -466,8 +492,12 @@ install-pkgindicatePYTHON: $(pkgindicate
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgindicatedir)" || exit $$?; \
 	done || exit $$?; \
 	if test -n "$$dlist"; then \
-	  $(am__py_compile) --destdir "$(DESTDIR)" \
-	                    --basedir "$(pkgindicatedir)" $$dlist; \
+	  if test -z "$(DESTDIR)"; then \
+	    $(am__py_compile) --basedir "$(pkgindicatedir)" $$dlist; \
+	  else \
+	    $(am__py_compile) --destdir "$(DESTDIR)" \
+	                      --basedir "$(pkgindicatedir)" $$dlist; \
+	  fi; \
 	else :; fi
 
 uninstall-pkgindicatePYTHON:
@@ -485,8 +515,11 @@ uninstall-pkgindicatePYTHON:
 	exit $$st
 install-defsDATA: $(defs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)"
 	@list='$(defs_DATA)'; test -n "$(defsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(defsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(defsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -pruN 0.6.92-6/ChangeLog 12.10.1-0ubuntu5/ChangeLog
--- 0.6.92-6/ChangeLog	2012-03-21 20:43:34.000000000 +0000
+++ 12.10.1-0ubuntu5/ChangeLog	2012-08-22 04:53:30.000000000 +0000
@@ -1,5 +1,109 @@
 # Generated by Makefile. Do not edit.
 
+2012-08-21  Charles Kerr  <charles.kerr@canonical.com>
+
+	12.10.1
+
+2012-07-24  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~charlesk/libindicate/lp-1026722 to fix bug #1026722's memory leaks
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	copyediting: fix misspelled comment
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	copyediting: fix misspelled function name
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener's proxy_signal_cb()'s IndicatorModified handler, don't leak the variant's property string
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener's proxy_signal_cb()'s IndicatorRemoved handler, don't leak the variant's type string
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener's proxy_signal_cb()'s IndicatorAdded handler, don't leak the variant's type string
+
+2012-07-20  Charles Kerr  <charles.kerr@canonical.com>
+
+	In indicate_server_finalize(), fix a memory leak by being sure to free the icon_theme string
+
+2012-07-19  Charles Kerr  <charles.kerr@canonical.com>
+
+	IndicateIndicator's set_property() method should sink floating values
+
+2012-07-19  Charles Kerr  <charles.kerr@canonical.com>
+
+	omit unnecessary NULL tests before calling g_free()
+
+2012-07-19  Charles Kerr  <charles.kerr@canonical.com>
+
+	in indicate_indicator_finalize(), destroy the internal hashtable
+
+2012-07-24  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~charlesk/libindicate/lp-1028184 to bug #1028184's memory leaks
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	copyediting: fix a misspelled comment
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	copyediting: fix misspelled function name
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener.c's proxy_signal_cb() IndicatorModified handler, don't leak the property string
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener.c's proxy_signal_cb() IndicatorRemoved handler, don't leak the type string
+
+2012-07-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	in listener.c's proxy_signal_cb() IndicatorAdded handler, don't leak the type string
+
+2012-07-11  Charles Kerr  <charles.kerr@canonical.com>
+
+	bump version to 12.10.0
+
+2012-07-11  Charles Kerr  <charles.kerr@canonical.com>
+
+	fix glib #include error -- gmessages.h can't be included directly.
+
+2012-06-18  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~evgeni/libindicate/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files.
+
+2012-06-10  Evgeni Golov  <evgeni@debian.org>
+
+	don't include build-time filenames in comments of the enum header files
+	
+	If we do, the header files may be different on each build.
+	This is especially harmful when building multiple times for multiple
+	architectures and expecting the files to be identical.
+
+2012-04-23  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~charlesk/libindicate/lp-986890 to make IndicateServer's dispose() method call its superclass' dispose().
+
+2012-04-22  Charles Kerr  <charles.kerr@canonical.com>
+
+	indicate_server_dispose() needs to call its superclass' dispose() method.
+
+2012-04-12  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~allanlesage/libindicate/TDD to remove a dependency on gcovr, move gcov targets to their own makefile, and clean up .gcno files.
+
+2012-03-27  Allan LeSage  <allanlesage@gmail.com>
+
+	Removed gcovr dependency, moved coverage targets to own makefile, cleaning up *.gcno.
+
 2012-03-21  Ted Gould  <ted@gould.cx>
 
 	0.6.92
diff -pruN 0.6.92-6/compile 12.10.1-0ubuntu5/compile
--- 0.6.92-6/compile	2012-03-09 21:55:35.000000000 +0000
+++ 12.10.1-0ubuntu5/compile	2012-08-22 04:52:43.000000000 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
 # Software Foundation, Inc.
@@ -79,6 +79,48 @@ func_file_conv ()
   esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +151,34 @@ func_cl_wrapper ()
 	      ;;
 	  esac
 	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
 	-l*)
-	  lib=${1#-l}
-	  found=no
-	  save_IFS=$IFS
-	  IFS=';'
-	  for dir in $lib_path $LIB
-	  do
-	    IFS=$save_IFS
-	    if $shared && test -f "$dir/$lib.dll.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.dll.lib"
-	      break
-	    fi
-	    if test -f "$dir/$lib.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.lib"
-	      break
-	    fi
-	  done
-	  IFS=$save_IFS
-
-	  test "$found" != yes && set x "$@" "$lib.lib"
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
 	  shift
 	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
 	-L*)
-	  func_file_conv "${1#-L}"
-	  if test -z "$lib_path"; then
-	    lib_path=$file
-	  else
-	    lib_path="$lib_path;$file"
-	  fi
-	  linker_opts="$linker_opts -LIBPATH:$file"
+	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false
diff -pruN 0.6.92-6/config.sub 12.10.1-0ubuntu5/config.sub
--- 0.6.92-6/config.sub	2012-03-09 21:55:35.000000000 +0000
+++ 12.10.1-0ubuntu5/config.sub	2012-08-22 04:52:43.000000000 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -1537,6 +1543,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
diff -pruN 0.6.92-6/configure 12.10.1-0ubuntu5/configure
--- 0.6.92-6/configure	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/configure	2012-08-22 04:52:42.000000000 +0000
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libindicate 0.6.92.
+# Generated by GNU Autoconf 2.69 for libindicate 12.10.1.
 #
 # Report bugs to <ted@canonical.com>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libindicate'
 PACKAGE_TARNAME='libindicate'
-PACKAGE_VERSION='0.6.92'
-PACKAGE_STRING='libindicate 0.6.92'
+PACKAGE_VERSION='12.10.1'
+PACKAGE_STRING='libindicate 12.10.1'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -698,6 +718,12 @@ INTROSPECTION_SCANNER
 COVERAGE_LDFLAGS
 COVERAGE_CXXFLAGS
 COVERAGE_CFLAGS
+HAVE_GCOVR_FALSE
+HAVE_GCOVR_TRUE
+HAVE_LCOV_FALSE
+HAVE_LCOV_TRUE
+HAVE_GCOV_FALSE
+HAVE_GCOV_TRUE
 GCOVR
 GENHTML
 LCOV
@@ -1348,8 +1374,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1435,7 +1459,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libindicate 0.6.92 to adapt to many kinds of systems.
+\`configure' configures libindicate 12.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1505,7 +1529,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicate 0.6.92:";;
+     short | recursive ) echo "Configuration of libindicate 12.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,10 +1685,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicate configure 0.6.92
-generated by GNU Autoconf 2.68
+libindicate configure 12.10.1
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1740,7 +1764,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1939,8 +1963,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libindicate $as_me 0.6.92, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by libindicate $as_me 12.10.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2360,7 +2384,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2529,7 +2553,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2569,7 +2593,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2620,7 +2644,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2673,7 +2697,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2759,7 +2783,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libindicate
- VERSION=0.6.92
+ VERSION=12.10.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2948,7 +2972,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2988,7 +3012,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3041,7 +3065,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3082,7 +3106,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3140,7 +3164,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3184,7 +3208,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3630,8 +3654,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3923,7 +3946,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3963,7 +3986,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4016,7 +4039,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4057,7 +4080,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4115,7 +4138,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4159,7 +4182,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4355,8 +4378,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4849,7 +4871,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4915,7 +4937,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5262,7 +5284,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -5341,7 +5363,7 @@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5597,7 +5619,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5641,7 +5663,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6065,7 +6087,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6105,7 +6127,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6411,7 +6433,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6451,7 +6473,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6554,7 +6576,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6598,7 +6620,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6723,7 +6745,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6763,7 +6785,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6822,7 +6844,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6862,7 +6884,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7511,7 +7533,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7551,7 +7573,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7631,7 +7653,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7671,7 +7693,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7723,7 +7745,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7763,7 +7785,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7815,7 +7837,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7855,7 +7877,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7907,7 +7929,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7947,7 +7969,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7999,7 +8021,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8039,7 +8061,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12354,7 +12376,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12394,7 +12416,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12477,7 +12499,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -12520,7 +12542,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13042,13 +13064,7 @@ fi
  # AC_TDD_GCOV
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5
-$as_echo_n "checking whether code coverage tools are available... " >&6; }
-if ${ac_cv_check_gcov+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# Check whether --enable-gcov was given.
+  # Check whether --enable-gcov was given.
 if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov; use_gcov=$enableval
 else
@@ -13079,7 +13095,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_SHTOOL="shtool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13126,7 +13142,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LCOV="lcov"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13163,7 +13179,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GENHTML="genhtml"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13184,43 +13200,6 @@ $as_echo "no" >&6; }
 fi
 
 
-  # Extract the first word of "gcovr", so it can be a program name with args.
-set dummy gcovr; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GCOVR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCOVR"; then
-  ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCOVR="gcovr"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GCOVR=$ac_cv_prog_GCOVR
-if test -n "$GCOVR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
-$as_echo "$GCOVR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 
   if test "$LCOV"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
@@ -13257,10 +13236,8 @@ $as_echo "$glib_cv_lcov_version" >&6; }
     as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
   fi
 
-  if test -z "$GCOVR"; then
-    as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5
-  fi
-
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
 
   # Remove all optimization flags from CFLAGS
 
@@ -13272,11 +13249,76 @@ $as_echo "$glib_cv_lcov_version" >&6; }
   COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
   COVERAGE_LDFLAGS="-lgcov"
 
+  # Check availability of gcovr
+  # Extract the first word of "gcovr", so it can be a program name with args.
+set dummy gcovr; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GCOVR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCOVR"; then
+  ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_GCOVR="gcovr"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCOVR=$ac_cv_prog_GCOVR
+if test -n "$GCOVR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
+$as_echo "$GCOVR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+
+ if test "x$ac_cv_check_gcov" = xyes; then
+  HAVE_GCOV_TRUE=
+  HAVE_GCOV_FALSE='#'
+else
+  HAVE_GCOV_TRUE='#'
+  HAVE_GCOV_FALSE=
 fi
 
+ if test "x$ac_cv_check_lcov" = xyes; then
+  HAVE_LCOV_TRUE=
+  HAVE_LCOV_FALSE='#'
+else
+  HAVE_LCOV_TRUE='#'
+  HAVE_LCOV_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5
-$as_echo "$ac_cv_check_gcov" >&6; }
+
+ if test "x$ac_cv_check_gcovr" = xyes; then
+  HAVE_GCOVR_TRUE=
+  HAVE_GCOVR_FALSE='#'
+else
+  HAVE_GCOVR_TRUE='#'
+  HAVE_GCOVR_FALSE=
+fi
+
 
 
 
@@ -13401,7 +13443,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_VALA_API_GEN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13519,7 +13561,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_AL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13567,7 +13609,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RUNTIME="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13613,7 +13655,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CSC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13663,7 +13705,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GACUTIL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13863,7 +13905,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GAPI_PARSER="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13905,7 +13947,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GAPI_CODEGEN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13947,7 +13989,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GAPI_FIXUP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14076,7 +14118,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14382,7 +14424,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14424,7 +14466,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14468,7 +14510,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14685,6 +14727,11 @@ fi
 if test "x$enable_doc" != "xno"; then :
 
 
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
 gdu_cv_version_required=0.3.2
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
@@ -14778,6 +14825,11 @@ else
 
 # The initialisation is still needed for certain conditionals to be defined, just make it not output any error
 
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
 gdu_cv_version_required=0.3.2
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
@@ -15234,6 +15286,18 @@ if test -z "${USE_GTK3_TRUE}" && test -z
   as_fn_error $? "conditional \"USE_GTK3\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15592,16 +15656,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -15661,28 +15725,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15703,8 +15755,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libindicate $as_me 0.6.92, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by libindicate $as_me 12.10.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15769,11 +15821,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libindicate config.status 0.6.92
-configured by $0, generated by GNU Autoconf 2.68,
+libindicate config.status 12.10.1
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15864,7 +15916,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff -pruN 0.6.92-6/configure.ac 12.10.1-0ubuntu5/configure.ac
--- 0.6.92-6/configure.ac	2012-03-21 20:40:05.000000000 +0000
+++ 12.10.1-0ubuntu5/configure.ac	2012-08-22 04:52:22.000000000 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicate, 0.6.92, ted@canonical.com)
+AC_INIT(libindicate, 12.10.1, ted@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicate, 0.6.92)
+AM_INIT_AUTOMAKE(libindicate, 12.10.1)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -117,6 +117,9 @@ AM_CONDITIONAL(USE_GTK3, [test "x$with_g
 
 m4_include([m4/gcov.m4])
 AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
 AC_SUBST(COVERAGE_CFLAGS)
 AC_SUBST(COVERAGE_CXXFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
diff -pruN 0.6.92-6/debian/changelog 12.10.1-0ubuntu5/debian/changelog
--- 0.6.92-6/debian/changelog	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/changelog	2017-09-30 15:41:40.000000000 +0000
@@ -1,71 +1,44 @@
-libindicate (0.6.92-6) unstable; urgency=medium
+libindicate (12.10.1-0ubuntu5) xenial; urgency=high
 
-  * QA upload.
-  * Stop passing --nogtkinit to gtkdoc-scangobj and run gtkdocize
-    to fix FTBFS with gtk-doc-tools 1.26. (Closes: #876609)
-  * libindicate-dev: depend on gir1.2-indicate-0.7
+  * Ignore unused-functions error.
 
- -- Adrian Bunk <bunk@debian.org>  Sat, 30 Sep 2017 11:51:58 +0300
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 15 Dec 2015 08:17:08 +0000
 
-libindicate (0.6.92-5) unstable; urgency=low
+libindicate (12.10.1-0ubuntu4) xenial; urgency=high
 
-  * QA upload.
-  * Stop installing several files to the same destination during
-    the build.
-  * Add missing dh-python build dependency.
+  * Change build-dependency from mono-gmcs to mono-mcs.
 
- -- Adrian Bunk <bunk@debian.org>  Fri, 30 Jun 2017 17:45:51 +0300
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 14 Dec 2015 12:01:13 +0000
 
-libindicate (0.6.92-4) unstable; urgency=medium
+libindicate (12.10.1-0ubuntu3) saucy; urgency=low
 
-  * QA upload.
+  * Bump dh compat to 8
+  * debian/control:
+    - Don't explicitly build-depend on gir- packages
+    - Build with default valac 
 
-  [ Andreas Beckmann ]
-  * libindicate-gtk3-dev: Depend on libindicate-gtk3-3 instead of
-    libindicate-gtk3.  (Closes: #715066)
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 13 Aug 2013 22:44:53 -0400
 
- -- Adam Borowski <kilobyte@angband.pl>  Mon, 03 Apr 2017 03:39:26 +0200
+libindicate (12.10.1-0ubuntu2) raring; urgency=low
 
-libindicate (0.6.92-3) unstable; urgency=medium
+  * Fix FTBFS (LP: #1111865):
+      - do no include non-existed documentation file.
+      - do not use deprecated and now not-needed g_type_init. 
+  * Fold direct changes into a patch.
 
-  * QA upload.
-  * Set maintainer to the QA group.
-  * Remove build-dependency on mono-gmcs. (Closes: #812632)
-  * Fix FTBFS with clang. (Closes: #751446)
-  * Use debhelper compat 9.
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Tue, 02 Apr 2013 12:57:25 +0100
 
- -- Adam Borowski <kilobyte@angband.pl>  Wed, 20 Apr 2016 14:28:54 +0200
+libindicate (12.10.1-0ubuntu1) quantal; urgency=low
 
-libindicate (0.6.92-2) unstable; urgency=low
-
-  * Team upload.
-
-  [ gregor herrmann ]
-  * Non-maintainer upload.
-  * Fix "Including individual glib headers no longer supported":
-    add patch glib-single-include.patch from Michael Biebl.
-    (Closes: #665571)
-  * Fix "FTBFS: Indicate-0.7.gir:137.11-137.38: error: expected start
-    element of `parameter'":
-    build-depend on valac (>= 0.20)
-    (Closes: #707412)
-    This also fixes "Upcoming vala 0.16 removal". (Closes: #709696)
-
-  [ Andrew Starr-Bochicchio ]
-  * debian/patches/fix_doc_includes.patch:
-   - Do not include non-existing documentation file.
-  * debian/patches/drop-g_type_init.patch:
-   - Do not use deprecated and now not-needed g_type_init.
+  * New upstream release.
 
- -- Andrew Starr-Bochicchio <asb@debian.org>  Sat, 30 Nov 2013 14:38:57 -0500
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 22 Aug 2012 10:34:33 +0200
 
-libindicate (0.6.92-1) unstable; urgency=low
+libindicate (12.10.0-0ubuntu1) quantal; urgency=low
 
-  * Import new upstream release from Ubuntu.
-  * Disable tests, we do not have dbus test runner in Debian.
-  * Standards-Version: 3.9.3
+  * New upstream release.
 
- -- Evgeni Golov <evgeni@debian.org>  Sun, 20 May 2012 16:56:19 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 11 Jul 2012 21:36:51 +0200
 
 libindicate (0.6.92-0ubuntu1) precise; urgency=low
 
@@ -101,12 +74,6 @@ libindicate (0.6.90-0ubuntu1) precise; u
 
  -- Ted Gould <ted@ubuntu.com>  Fri, 10 Feb 2012 12:23:45 -0500
 
-libindicate (0.6.1-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Evgeni Golov <evgeni@debian.org>  Sun, 19 Feb 2012 10:59:04 +0100
-
 libindicate (0.6.1-1ubuntu1) precise; urgency=low
 
   * debian/control
@@ -191,13 +158,6 @@ libindicate (0.5.90-0ubuntu1) oneiric; u
 
  -- Ken VanDine <ken.vandine@canonical.com>  Wed, 10 Aug 2011 21:46:13 -0400
 
-libindicate (0.5.0-4) unstable; urgency=low
-
-  * Sourcefull rebuild for the Mono transition.
-    Closes: #657258
-
- -- Evgeni Golov <evgeni@debian.org>  Wed, 25 Jan 2012 12:11:05 +0100
-
 libindicate (0.5.0-3) unstable; urgency=low
 
   * Drop libmono-dev B-D, it's not needed.
diff -pruN 0.6.92-6/debian/compat 12.10.1-0ubuntu5/debian/compat
--- 0.6.92-6/debian/compat	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/compat	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-9
+8
diff -pruN 0.6.92-6/debian/control 12.10.1-0ubuntu5/debian/control
--- 0.6.92-6/debian/control	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/control	2017-09-30 15:41:40.000000000 +0000
@@ -1,9 +1,10 @@
 Source: libindicate
 Section: libs
 Priority: optional
-XS-Python-Version: >= 2.6
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 9~),
+XS-Python-Version: >= 2.7
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 8.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 3.0),
@@ -15,23 +16,21 @@ Build-Depends: debhelper (>= 9~),
                gtk-doc-tools,
                gobject-introspection,
                libgirepository1.0-dev,
-               gir1.2-glib-2.0,
-               gir1.2-gtk-2.0,
-               gir1.2-dbusmenu-glib-0.4 (>=0.4.90),
                python-all-dev (>= 2.6.6-3~),
                python-gtk2-dev,
-               dh-python,
                dh-autoreconf,
-               valac (>= 0.20),
+               valac,
+               dbus-test-runner
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.3),
+               mono-mcs,
                gtk-sharp2-gapi,
                libnunit-cil-dev,
                libgtk2.0-cil-dev,
-Standards-Version: 3.9.8
+Standards-Version: 3.9.2
 Homepage: https://launchpad.net/libindicate
-Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicate/debian
-Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicate/debian
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
 
 Package: python-indicate
 Section: python
@@ -68,7 +67,6 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-indicate-0.7 (= ${binary:Version}),
          libindicate5 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (>= 0.3.1)
@@ -94,7 +92,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate-gtk3-3 (= ${binary:Version}),
+         libindicate-gtk3 (= ${binary:Version}),
          libindicate-dev (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 3.0)
diff -pruN 0.6.92-6/debian/gir1.2-indicate-0.7.install 12.10.1-0ubuntu5/debian/gir1.2-indicate-0.7.install
--- 0.6.92-6/debian/gir1.2-indicate-0.7.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/gir1.2-indicate-0.7.install	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/girepository-1.0/Indicate-0.7.typelib /usr/lib/girepository-1.0/
+debian/tmp/*/usr/lib/girepository-1.0/Indicate-0.7.typelib /usr/lib/girepository-1.0/
diff -pruN 0.6.92-6/debian/libindicate0.1-cil-dev.install 12.10.1-0ubuntu5/debian/libindicate0.1-cil-dev.install
--- 0.6.92-6/debian/libindicate0.1-cil-dev.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate0.1-cil-dev.install	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/pkgconfig/indicate-sharp-0.1.pc /usr/lib/pkgconfig/
+debian/tmp/*/usr/lib/pkgconfig/indicate-sharp-0.1.pc /usr/lib/pkgconfig/
diff -pruN 0.6.92-6/debian/libindicate0.1-cil.install 12.10.1-0ubuntu5/debian/libindicate0.1-cil.install
--- 0.6.92-6/debian/libindicate0.1-cil.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate0.1-cil.install	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/indicate-sharp-0.1/* /usr/lib/cli/indicate-sharp-0.1/
+debian/tmp/*/usr/lib/indicate-sharp-0.1/* /usr/lib/cli/indicate-sharp-0.1/
diff -pruN 0.6.92-6/debian/libindicate5.install 12.10.1-0ubuntu5/debian/libindicate5.install
--- 0.6.92-6/debian/libindicate5.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate5.install	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libindicate.so.* /usr/lib/
+debian/tmp/*/usr/lib/libindicate.so.* /usr/lib/
diff -pruN 0.6.92-6/debian/libindicate-dev.install 12.10.1-0ubuntu5/debian/libindicate-dev.install
--- 0.6.92-6/debian/libindicate-dev.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate-dev.install	2017-09-30 15:41:40.000000000 +0000
@@ -1,6 +1,6 @@
 debian/tmp/*/usr/include/libindicate-0.7/libindicate /usr/include/libindicate-0.7/
-debian/tmp/gtk3/usr/lib/pkgconfig/indicate-0.7.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libindicate.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libindicate.so /usr/lib/
-debian/tmp/gtk3/usr/share/gir-1.0/Indicate-0.7.gir /usr/share/gir-1.0/
-debian/tmp/gtk3/usr/share/vala/vapi/Indicate-0.7.vapi /usr/share/vala/vapi/
+debian/tmp/*/usr/lib/pkgconfig/indicate-0.7.pc /usr/lib/pkgconfig/
+debian/tmp/*/usr/lib/libindicate.a /usr/lib/
+debian/tmp/*/usr/lib/libindicate.so /usr/lib/
+debian/tmp/*/usr/share/gir-1.0/Indicate-0.7.gir /usr/share/gir-1.0/
+debian/tmp/*/usr/share/vala/vapi/Indicate-0.7.vapi /usr/share/vala/vapi/
diff -pruN 0.6.92-6/debian/libindicate-doc.install 12.10.1-0ubuntu5/debian/libindicate-doc.install
--- 0.6.92-6/debian/libindicate-doc.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate-doc.install	2017-09-30 15:41:40.000000000 +0000
@@ -1,2 +1,2 @@
-debian/tmp/gtk3/usr/share/gtk-doc/html/libindicate/* /usr/share/gtk-doc/html/libindicate/
-debian/tmp/gtk3/usr/share/doc/libindicate/examples/* /usr/share/doc/libindicate/examples/
+debian/tmp/*/usr/share/gtk-doc/html/libindicate/* /usr/share/gtk-doc/html/libindicate/
+debian/tmp/*/usr/share/doc/libindicate/examples/* /usr/share/doc/libindicate/examples/
diff -pruN 0.6.92-6/debian/libindicate-gtk0.1-cil-dev.install 12.10.1-0ubuntu5/debian/libindicate-gtk0.1-cil-dev.install
--- 0.6.92-6/debian/libindicate-gtk0.1-cil-dev.install	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/libindicate-gtk0.1-cil-dev.install	2017-09-30 15:41:40.000000000 +0000
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/pkgconfig/indicate-gtk-sharp-0.1.pc /usr/lib/pkgconfig/
+debian/tmp/*/usr/lib/pkgconfig/indicate-gtk-sharp-0.1.pc /usr/lib/pkgconfig/
diff -pruN 0.6.92-6/debian/patches/00-fix-ftbfs.patch 12.10.1-0ubuntu5/debian/patches/00-fix-ftbfs.patch
--- 0.6.92-6/debian/patches/00-fix-ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/patches/00-fix-ftbfs.patch	2017-09-30 15:41:40.000000000 +0000
@@ -0,0 +1,115 @@
+Description: fix FTBFS
+ * Fix FTBFS:
+     - do no include non-existed documentation file.
+     - do not use deprecated and now not-needed g_type_init.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+
+--- libindicate-12.10.1.orig/Makefile.am
++++ libindicate-12.10.1/Makefile.am
+@@ -26,7 +26,7 @@ EXTRA_DIST = \
+ 	xmldocs.make \
+ 	autogen.sh
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper --disable-introspection
++DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+ 
+ DISTCLEANFILES = \
+ 	libindicate-*.tar.gz \
+--- libindicate-12.10.1.orig/examples/indicate-and-crash.c
++++ libindicate-12.10.1/examples/indicate-and-crash.c
+@@ -28,8 +28,6 @@ gboolean crashfunc (gpointer data) { *(i
+ int
+ main (int argc, char ** argv)
+ {
+-	g_type_init();
+-
+ 	IndicateIndicator * indicator = indicate_indicator_new();
+ 	indicate_indicator_show(indicator);
+ 
+--- libindicate-12.10.1.orig/examples/listen-and-print.c
++++ libindicate-12.10.1/examples/listen-and-print.c
+@@ -128,8 +128,6 @@ server_removed (IndicateListener * liste
+ int
+ main (int argc, char ** argv)
+ {
+-	g_type_init();
+-
+ 	IndicateListener * listener = indicate_listener_ref_default();
+ 
+ 	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED, G_CALLBACK(indicator_added), NULL);
+--- libindicate-12.10.1.orig/examples/im-client.c
++++ libindicate-12.10.1/examples/im-client.c
+@@ -87,8 +87,6 @@ menuitem_click (DbusmenuMenuitem * menui
+ int
+ main (int argc, char ** argv)
+ {
+-	g_type_init();
+-
+ 	IndicateServer * server = indicate_server_ref_default();
+ 	indicate_server_set_type(server, "message.im");
+ 	indicate_server_set_desktop_file(server, "/usr/share/applications/empathy.desktop");
+--- libindicate-12.10.1.orig/examples/indicate-alot.c
++++ libindicate-12.10.1/examples/indicate-alot.c
+@@ -29,8 +29,6 @@ with this program.  If not, see <http://
+ int
+ main (int argc, char ** argv)
+ {
+-	g_type_init();
+-
+ 	IndicateIndicator * indicators[ALOT];
+ 	int i;
+ 
+--- libindicate-12.10.1.orig/examples/show-hide-server.c
++++ libindicate-12.10.1/examples/show-hide-server.c
+@@ -29,8 +29,6 @@ timeout_cb (gpointer data)
+ int
+ main (int argc, char ** argv)
+ {
+-	g_type_init();
+-
+ 	IndicateServer * server = indicate_server_ref_default();
+ 	indicate_server_set_type(server, "message.im");
+ 	indicate_server_set_desktop_file(server, "/usr/share/applications/empathy.desktop");
+--- libindicate-12.10.1.orig/docs/reference/libindicate-docs.sgml
++++ libindicate-12.10.1/docs/reference/libindicate-docs.sgml
+@@ -13,11 +13,6 @@
+ 	<xi:include href="xml/server.xml" />
+ </part>
+ 
+-<part id="subclass">
+-	<title>Subclasses for specific indicators</title>
+-	<xi:include href="xml/indicator-message.xml" />
+-</part>
+-
+ <part id="listeners">
+ 	<title>Classes for Listeners</title>
+ 	<xi:include href="xml/listener.xml" />
+--- libindicate-12.10.1.orig/docs/reference/tmpl/libindicate-unused.sgml
++++ libindicate-12.10.1/docs/reference/tmpl/libindicate-unused.sgml
+@@ -35,10 +35,26 @@ IndicateIndicatorMessage
+ 
+ @parent_class: 
+ 
++<!-- ##### SIGNAL IndicateServer::indicator-added ##### -->
++<para>
++
++</para>
++
++@indicateserver: the object which received the signal.
++@arg1: 
++
+ <!-- ##### SIGNAL IndicateServer::indicator-not-shown ##### -->
+ <para>
+ 
+ </para>
++
++@indicateserver: the object which received the signal.
++@arg1: 
++
++<!-- ##### SIGNAL IndicateServer::indicator-removed ##### -->
++<para>
++
++</para>
+ 
+ @indicateserver: the object which received the signal.
+ @arg1: 
diff -pruN 0.6.92-6/debian/patches/drop-g_type_init.patch 12.10.1-0ubuntu5/debian/patches/drop-g_type_init.patch
--- 0.6.92-6/debian/patches/drop-g_type_init.patch	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/patches/drop-g_type_init.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-Description: Do not use deprecated and now not-needed g_type_init.
-Origin: Ubuntu
-Bug: https://bugs.launchpad.net/libindicate/+bug/1111865
-
-diff -Nur -x '*.orig' -x '*~' libindicate/examples/im-client.c libindicate.new/examples/im-client.c
---- libindicate/examples/im-client.c	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/examples/im-client.c	2013-11-30 14:37:16.937809517 -0500
-@@ -87,8 +87,6 @@
- int
- main (int argc, char ** argv)
- {
--	g_type_init();
--
- 	IndicateServer * server = indicate_server_ref_default();
- 	indicate_server_set_type(server, "message.im");
- 	indicate_server_set_desktop_file(server, "/usr/share/applications/empathy.desktop");
-diff -Nur -x '*.orig' -x '*~' libindicate/examples/indicate-alot.c libindicate.new/examples/indicate-alot.c
---- libindicate/examples/indicate-alot.c	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/examples/indicate-alot.c	2013-11-30 14:37:16.937809517 -0500
-@@ -29,8 +29,6 @@
- int
- main (int argc, char ** argv)
- {
--	g_type_init();
--
- 	IndicateIndicator * indicators[ALOT];
- 	int i;
- 
-diff -Nur -x '*.orig' -x '*~' libindicate/examples/indicate-and-crash.c libindicate.new/examples/indicate-and-crash.c
---- libindicate/examples/indicate-and-crash.c	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/examples/indicate-and-crash.c	2013-11-30 14:37:16.937809517 -0500
-@@ -28,8 +28,6 @@
- int
- main (int argc, char ** argv)
- {
--	g_type_init();
--
- 	IndicateIndicator * indicator = indicate_indicator_new();
- 	indicate_indicator_show(indicator);
- 
-diff -Nur -x '*.orig' -x '*~' libindicate/examples/listen-and-print.c libindicate.new/examples/listen-and-print.c
---- libindicate/examples/listen-and-print.c	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/examples/listen-and-print.c	2013-11-30 14:37:16.937809517 -0500
-@@ -128,8 +128,6 @@
- int
- main (int argc, char ** argv)
- {
--	g_type_init();
--
- 	IndicateListener * listener = indicate_listener_ref_default();
- 
- 	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED, G_CALLBACK(indicator_added), NULL);
-diff -Nur -x '*.orig' -x '*~' libindicate/examples/show-hide-server.c libindicate.new/examples/show-hide-server.c
---- libindicate/examples/show-hide-server.c	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/examples/show-hide-server.c	2013-11-30 14:37:16.937809517 -0500
-@@ -29,8 +29,6 @@
- int
- main (int argc, char ** argv)
- {
--	g_type_init();
--
- 	IndicateServer * server = indicate_server_ref_default();
- 	indicate_server_set_type(server, "message.im");
- 	indicate_server_set_desktop_file(server, "/usr/share/applications/empathy.desktop");
diff -pruN 0.6.92-6/debian/patches/fix_doc_includes.patch 12.10.1-0ubuntu5/debian/patches/fix_doc_includes.patch
--- 0.6.92-6/debian/patches/fix_doc_includes.patch	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/patches/fix_doc_includes.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Description: Do not include non-existing documentation file.
-Origin: Ubuntu
-Bug: https://bugs.launchpad.net/libindicate/+bug/1111865
-
-diff -Nur -x '*.orig' -x '*~' libindicate/docs/reference/libindicate-docs.sgml libindicate.new/docs/reference/libindicate-docs.sgml
---- libindicate/docs/reference/libindicate-docs.sgml	2013-11-30 14:09:00.275160000 -0500
-+++ libindicate.new/docs/reference/libindicate-docs.sgml	2013-11-30 14:14:27.409866795 -0500
-@@ -13,11 +13,6 @@
- 	<xi:include href="xml/server.xml" />
- </part>
- 
--<part id="subclass">
--	<title>Subclasses for specific indicators</title>
--	<xi:include href="xml/indicator-message.xml" />
--</part>
--
- <part id="listeners">
- 	<title>Classes for Listeners</title>
- 	<xi:include href="xml/listener.xml" />
diff -pruN 0.6.92-6/debian/patches/glib-single-include.patch 12.10.1-0ubuntu5/debian/patches/glib-single-include.patch
--- 0.6.92-6/debian/patches/glib-single-include.patch	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/patches/glib-single-include.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Index: libindicate-0.6.92/libindicate/indicator.c
-===================================================================
---- libindicate-0.6.92.orig/libindicate/indicator.c	2012-03-21 21:37:56.000000000 +0100
-+++ libindicate-0.6.92/libindicate/indicator.c	2012-12-16 06:25:15.787861782 +0100
-@@ -27,8 +27,7 @@
- <http://www.gnu.org/licenses/>
- */
- 
--#include "glib.h"
--#include "glib/gmessages.h"
-+#include <glib.h>
- #include "indicator.h"
- #include "server.h"
- 
diff -pruN 0.6.92-6/debian/rules 12.10.1-0ubuntu5/debian/rules
--- 0.6.92-6/debian/rules	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/debian/rules	2017-09-30 15:41:40.000000000 +0000
@@ -7,7 +7,7 @@ PY_VERSIONS = $(shell pyversions --reque
 export MONO_SHARED_DIR=$(CURDIR)
 export CSC=/usr/bin/mono-csc
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --disable-tests
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 # -z,defs breaks linking with bin/python instead of libpython, for #638882
 #LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
@@ -34,12 +34,6 @@ DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
 debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
 
-DEB_DH_AUTORECONF_ARGS += debian/rules autoreconf
-
-autoreconf:
-	gtkdocize --copy
-	autoreconf -f -i
-
 common-binary-post-install-indep::
 	dh_clistrip
 	dh_clifixperms
@@ -86,3 +80,5 @@ binary-fixup/python-indicate::
 clean::
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -rf build-python*
+	rm -rf configure-stamp-*
+	rm -rf build
diff -pruN 0.6.92-6/depcomp 12.10.1-0ubuntu5/depcomp
--- 0.6.92-6/depcomp	2012-03-09 21:55:36.000000000 +0000
+++ 12.10.1-0ubuntu5/depcomp	2012-08-22 04:52:44.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # 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
@@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@ EOF
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@ gcc)
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
@@ -203,18 +214,15 @@ sgi)
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -226,10 +234,17 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@ aix)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@ aix)
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -300,15 +317,21 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -344,7 +367,7 @@ hp2)
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -359,9 +382,9 @@ hp2)
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@ tru64)
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -443,11 +465,11 @@ msvc7)
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/\(.*\)/	\1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
-  s/.*/	/
+  s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
@@ -478,7 +500,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -498,15 +520,14 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -652,8 +672,8 @@ msvisualcpp)
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff -pruN 0.6.92-6/docs/Makefile.in 12.10.1-0ubuntu5/docs/Makefile.in
--- 0.6.92-6/docs/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,6 +80,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -496,13 +518,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -pruN 0.6.92-6/docs/reference/html/IndicateServer.html 12.10.1-0ubuntu5/docs/reference/html/IndicateServer.html
--- 0.6.92-6/docs/reference/html/IndicateServer.html	2012-03-21 20:43:34.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/html/IndicateServer.html	2012-08-22 04:53:30.000000000 +0000
@@ -464,7 +464,7 @@ so it's signals are no longer watched an
 <pre class="programlisting"><span class="returnvalue">void</span>                indicate_server_set_default         (<em class="parameter"><code><a class="link" href="IndicateServer.html" title="IndicateServer"><span class="type">IndicateServer</span></a> *server</code></em>);</pre>
 <p>
 This function is used to set the default <a class="link" href="IndicateServer.html" title="IndicateServer"><span class="type">IndicateServer</span></a> that will
-be used when creating <a href="/usr/share/gtk-doc/html/libindicate/IndicateIndicator.html"><span class="type">IndicateIndicators</span></a> or for anyone else that
+be used when creating <a href="../libindicate/IndicateIndicator.html"><span class="type">IndicateIndicators</span></a> or for anyone else that
 calls <a class="link" href="IndicateServer.html#indicate-server-ref-default" title="indicate_server_ref_default ()"><code class="function">indicate_server_ref_default()</code></a>.  Typically this is just an
 instance of <a class="link" href="IndicateServer.html" title="IndicateServer"><span class="type">IndicateServer</span></a> but applications that create a subclass
 of <a class="link" href="IndicateServer.html" title="IndicateServer"><span class="type">IndicateServer</span></a> should set this as well.
diff -pruN 0.6.92-6/docs/reference/html/ix01.html 12.10.1-0ubuntu5/docs/reference/html/ix01.html
--- 0.6.92-6/docs/reference/html/ix01.html	2012-03-21 20:43:34.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/html/ix01.html	2012-08-22 04:53:30.000000000 +0000
@@ -20,7 +20,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp3173344"></a>Index of all Symbols</h2></div></div></div>
+<a name="idp464008"></a>Index of all Symbols</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>I</h3>
 <dl>
diff -pruN 0.6.92-6/docs/reference/Makefile.am 12.10.1-0ubuntu5/docs/reference/Makefile.am
--- 0.6.92-6/docs/reference/Makefile.am	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/Makefile.am	2012-07-11 17:59:02.000000000 +0000
@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sg
 DOC_SOURCE_DIR=../../libindicate
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
@@ -71,7 +71,7 @@ INCLUDES=-I$(top_srcdir) $(LIBINDICATE_C
 GTKDOC_LIBS=$(top_builddir)/libindicate/libindicate.la $(LIBINDICATEGTK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
+include $(top_srcdir)/gtk-doc.local.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
diff -pruN 0.6.92-6/docs/reference/Makefile.in 12.10.1-0ubuntu5/docs/reference/Makefile.in
--- 0.6.92-6/docs/reference/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21,6 +21,23 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,6 +80,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AL = @AL@
diff -pruN 0.6.92-6/docs/reference/tmpl/libindicate-unused.sgml 12.10.1-0ubuntu5/docs/reference/tmpl/libindicate-unused.sgml
--- 0.6.92-6/docs/reference/tmpl/libindicate-unused.sgml	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/tmpl/libindicate-unused.sgml	2012-08-22 04:53:30.000000000 +0000
@@ -35,26 +35,10 @@ IndicateIndicatorMessage
 
 @parent_class: 
 
-<!-- ##### SIGNAL IndicateServer::indicator-added ##### -->
-<para>
-
-</para>
-
-@indicateserver: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL IndicateServer::indicator-not-shown ##### -->
 <para>
 
 </para>
-
-@indicateserver: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL IndicateServer::indicator-removed ##### -->
-<para>
-
-</para>
 
 @indicateserver: the object which received the signal.
 @arg1: 
diff -pruN 0.6.92-6/docs/reference/version.xml 12.10.1-0ubuntu5/docs/reference/version.xml
--- 0.6.92-6/docs/reference/version.xml	2012-03-21 20:40:25.000000000 +0000
+++ 12.10.1-0ubuntu5/docs/reference/version.xml	2012-08-22 04:52:50.000000000 +0000
@@ -1 +1 @@
-0.6.92
+12.10.1
diff -pruN 0.6.92-6/examples/Makefile.in 12.10.1-0ubuntu5/examples/Makefile.in
--- 0.6.92-6/examples/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/examples/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -136,6 +153,11 @@ SOURCES = $(im_client_SOURCES) $(indicat
 DIST_SOURCES = $(im_client_SOURCES) $(indicate_alot_SOURCES) \
 	$(indicate_and_crash_SOURCES) $(listen_and_print_SOURCES) \
 	$(show_hide_server_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -618,8 +640,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-examplesDATA: $(examples_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
 	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -pruN 0.6.92-6/libindicate/indicate-enum-types.c 12.10.1-0ubuntu5/libindicate/indicate-enum-types.c
--- 0.6.92-6/libindicate/indicate-enum-types.c	2012-03-09 21:55:43.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/indicate-enum-types.c	2012-08-22 04:53:06.000000000 +0000
@@ -5,7 +5,7 @@
 #include <glib-object.h>
 
 
-/* enumerations from \"../libindicate/interests.h\" */
+/* enumerations from \"interests.h\" */
 
 
 GType
diff -pruN 0.6.92-6/libindicate/indicate-enum-types.c.in 12.10.1-0ubuntu5/libindicate/indicate-enum-types.c.in
--- 0.6.92-6/libindicate/indicate-enum-types.c.in	2012-03-09 21:55:27.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/indicate-enum-types.c.in	2012-07-11 17:59:02.000000000 +0000
@@ -5,7 +5,7 @@
 /*** END file-header ***/
 /*** BEGIN file-production ***/
 
-/* enumerations from \"@filename@\" */
+/* enumerations from \"@basename@\" */
 
 /*** END file-production ***/
 /*** BEGIN value-header ***/
diff -pruN 0.6.92-6/libindicate/indicate-enum-types.h 12.10.1-0ubuntu5/libindicate/indicate-enum-types.h
--- 0.6.92-6/libindicate/indicate-enum-types.h	2012-03-09 21:55:43.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/indicate-enum-types.h	2012-08-22 04:53:06.000000000 +0000
@@ -8,7 +8,7 @@
 
 G_BEGIN_DECLS
 
-/* enumerations from "../libindicate/interests.h" */
+/* enumerations from "interests.h" */
 
 GType indicate_interests_get_type(void);
 #define INDICATE_TYPE_INTERESTS (indicate_interests_get_type())
diff -pruN 0.6.92-6/libindicate/indicate-enum-types.h.in 12.10.1-0ubuntu5/libindicate/indicate-enum-types.h.in
--- 0.6.92-6/libindicate/indicate-enum-types.h.in	2012-03-09 21:55:27.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/indicate-enum-types.h.in	2012-07-11 17:59:02.000000000 +0000
@@ -16,7 +16,7 @@ G_END_DECLS
 /*** END file-tail ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 
 /*** END file-production ***/
 
diff -pruN 0.6.92-6/libindicate/indicator.c 12.10.1-0ubuntu5/libindicate/indicator.c
--- 0.6.92-6/libindicate/indicator.c	2012-03-21 20:37:56.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/indicator.c	2012-08-01 16:10:10.000000000 +0000
@@ -27,8 +27,7 @@ License version 3 and version 2.1 along
 <http://www.gnu.org/licenses/>
 */
 
-#include "glib.h"
-#include "glib/gmessages.h"
+#include <glib.h>
 #include "indicator.h"
 #include "server.h"
 
@@ -202,6 +201,8 @@ indicate_indicator_finalize (GObject * o
 	IndicateIndicator * indicator = INDICATE_INDICATOR(obj);
 	IndicateIndicatorPrivate * priv = INDICATE_INDICATOR_GET_PRIVATE(indicator);
 
+	g_hash_table_destroy (priv->properties);
+
 	indicate_server_remove_indicator(priv->server, indicator);
 	g_object_unref(priv->server);
 	priv->server = NULL;
@@ -569,7 +570,7 @@ set_property (IndicateIndicator * indica
 
 	gchar * newkey = g_strdup(key);
 	if (data != NULL) {
-		g_variant_ref(data);
+		g_variant_ref_sink(data);
 	}
 
 	g_hash_table_replace(priv->properties, newkey, data);
diff -pruN 0.6.92-6/libindicate/listener.c 12.10.1-0ubuntu5/libindicate/listener.c
--- 0.6.92-6/libindicate/listener.c	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/listener.c	2012-08-01 16:10:10.000000000 +0000
@@ -106,9 +106,9 @@ static gboolean todo_idle (gpointer data
 static void set_max_indicators_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 static void get_type_initial_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * type, gpointer data);
 static void get_type_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * type, gpointer data);
-static void proxy_indicator_added_legacy (guint id, gchar * type, proxy_t * proxyt);
+static void proxy_indicator_added_legacy (guint id, const gchar * type, proxy_t * proxyt);
 static void proxy_indicator_added (guint id, proxy_t * proxyt);
-static void proxy_indicator_removed_legacy (guint id, gchar * type, proxy_t * proxyt);
+static void proxy_indicator_removed_legacy (guint id, const gchar * type, proxy_t * proxyt);
 static void proxy_indicator_removed (guint id, proxy_t * proxyt);
 static void proxy_indicator_modified (guint id, const gchar * property, proxy_t * proxyt);
 static void proxy_server_count_changed (guint count, proxy_t * proxyt);
@@ -117,7 +117,7 @@ static void proxy_destroyed (GObject * p
 static void bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data);
 static void bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 static void bus_filter_show_server (GDBusConnection * connection, const gchar * sender, const gchar * object, const gchar * interface, const gchar * signal, GVariant * params, gpointer user_data);
-static void prox_ready_cb (GObject * object, GAsyncResult * res, gpointer user_data);
+static void proxy_ready_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 static void proxy_signal_cb (GDBusProxy * proxy, gchar * sender, gchar * signal, GVariant * params, gpointer user_data);
 
 /* Bus Stuff */
@@ -126,9 +126,9 @@ static GDBusInterfaceInfo *       bus_in
 static GDBusNodeInfo *            bus_listener_node_info = NULL;
 static GDBusInterfaceInfo *       bus_listener_interface_info = NULL;
 static const GDBusInterfaceVTable bus_interface_table = {
-	.method_call = bus_method_call,
-	.get_property = NULL, /* No properties that can be get */
-	.set_property = NULL  /* No properties that can be set */
+	method_call:    bus_method_call,
+	get_property:   NULL, /* No properties that can be get */
+	set_property:   NULL  /* No properties that can be set */
 };
 
 
@@ -382,7 +382,7 @@ bus_get_cb (GObject * object, GAsyncResu
 	return;
 }
 
-/* Handle a metho call from dbus */
+/* Handle a method call from dbus */
 static void
 bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data)
 {
@@ -486,21 +486,10 @@ proxy_struct_destroy (gpointer data)
 		proxy_data->dbus_listener_sub = 0;
 	}
 
-	if (proxy_data->proxy != NULL) {
-		g_object_unref(G_OBJECT(proxy_data->proxy));
-	}
-
-	if (proxy_data->name != NULL) {
-		g_free(proxy_data->name);
-	}
-
-	if (proxy_data->path != NULL) {
-		g_free(proxy_data->path);
-	}
-
-	if (proxy_data->type != NULL) {
-		g_free(proxy_data->type);
-	}
+	g_clear_object(&proxy_data->proxy);
+	g_free(proxy_data->name);
+	g_free(proxy_data->path);
+	g_free(proxy_data->type);
 	g_free(proxy_data);
 
 	return;
@@ -612,10 +601,10 @@ todo_idle (gpointer data)
 	                 G_DBUS_PROXY_FLAGS_NONE,
 	                 bus_indicate_interface_info,
 	                 proxyt->name,
-	                 todo->path,
+	                 proxyt->path,
 	                 INDICATE_DBUS_IFACE,
 	                 NULL, /* cancel */
-	                 prox_ready_cb,
+	                 proxy_ready_cb,
 	                 proxyt);
 
 	return TRUE; /* do the next entry */
@@ -623,7 +612,7 @@ todo_idle (gpointer data)
 
 /* Async result of building a proxy */
 static void
-prox_ready_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+proxy_ready_cb (GObject * object, GAsyncResult * res, gpointer user_data)
 {
 	proxy_t * proxyt = (proxy_t *)user_data;
 	GError * error = NULL;
@@ -697,24 +686,24 @@ proxy_signal_cb (GDBusProxy * proxy, gch
 	proxy_t * proxyt = (proxy_t *)user_data;
 
 	if (g_strcmp0(signal, "IndicatorAdded") == 0) {
-		guint id; gchar * type;
-		g_variant_get(params, "(us)", &id, &type);
+		guint id; const gchar * type;
+		g_variant_get(params, "(u&s)", &id, &type);
 		proxy_indicator_added_legacy(id, type, proxyt);
 	} else if (g_strcmp0(signal, "IndicatorNew") == 0) {
 		guint id;
 		g_variant_get(params, "(u)", &id);
 		proxy_indicator_added(id, proxyt);
 	} else if (g_strcmp0(signal, "IndicatorRemoved") == 0) {
-		guint id; gchar * type;
-		g_variant_get(params, "(us)", &id, &type);
+		guint id; const gchar * type;
+		g_variant_get(params, "(u&s)", &id, &type);
 		proxy_indicator_removed_legacy(id, type, proxyt);
 	} else if (g_strcmp0(signal, "IndicatorDelete") == 0) {
 		guint id;
 		g_variant_get(params, "(u)", &id);
 		proxy_indicator_removed(id, proxyt);
 	} else if (g_strcmp0(signal, "IndicatorModified") == 0) {
-		guint id; gchar * property;
-		g_variant_get(params, "(us)", &id, &property);
+		guint id; const gchar * property;
+		g_variant_get(params, "(u&s)", &id, &property);
 		proxy_indicator_modified(id, property, proxyt);
 	} else if (g_strcmp0(signal, "ServerCountChanged") == 0) {
 		guint count;
@@ -761,11 +750,7 @@ get_type_cb (IndicateListener * listener
 	}
 
 	proxy_t * proxyt = (proxy_t *)data;
-
-	if (proxyt->type != NULL) {
-		g_free(proxyt->type);
-		proxyt->type = NULL;
-	}
+	g_free (proxyt->type);
 	proxyt->type = g_strdup(type);
 
 	return;
@@ -825,7 +810,7 @@ proxy_get_indicator_list (GObject * obje
    signals on the indicator v1 interface.  It just drops
    the type and calls the new function. */
 static void
-proxy_indicator_added_legacy (guint id, gchar * type, proxy_t * proxyt)
+proxy_indicator_added_legacy (guint id, const gchar * type, proxy_t * proxyt)
 {
 	return proxy_indicator_added(id, proxyt);
 }
@@ -853,7 +838,7 @@ proxy_indicator_added (guint id, proxy_t
    signals on the indicator v1 interface.  It just drops
    the type and calls the new function. */
 static void
-proxy_indicator_removed_legacy (guint id, gchar * type, proxy_t * proxyt)
+proxy_indicator_removed_legacy (guint id, const gchar * type, proxy_t * proxyt)
 {
 	return proxy_indicator_removed(id, proxyt);
 }
diff -pruN 0.6.92-6/libindicate/Makefile.in 12.10.1-0ubuntu5/libindicate/Makefile.in
--- 0.6.92-6/libindicate/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/Makefile.in	2012-08-22 04:52:44.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -55,6 +55,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -172,6 +189,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libindicate_la_SOURCES)
 DIST_SOURCES = $(libindicate_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) $(vapi_DATA)
 HEADERS = $(libindicateinclude_HEADERS)
 ETAGS = etags
@@ -530,7 +552,6 @@ indicate-0.7.pc: $(top_builddir)/config.
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -538,6 +559,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -653,8 +676,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-girDATA: $(gir_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -671,8 +697,11 @@ uninstall-girDATA:
 	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -689,8 +718,11 @@ uninstall-pkgconfigDATA:
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-typelibDATA: $(typelib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
 	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -707,8 +739,11 @@ uninstall-typelibDATA:
 	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
 install-vapiDATA: $(vapi_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)"
 	@list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -725,8 +760,11 @@ uninstall-vapiDATA:
 	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
 install-libindicateincludeHEADERS: $(libindicateinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libindicateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicateincludedir)"
 	@list='$(libindicateinclude_HEADERS)'; test -n "$(libindicateincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libindicateincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libindicateincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -pruN 0.6.92-6/libindicate/server.c 12.10.1-0ubuntu5/libindicate/server.c
--- 0.6.92-6/libindicate/server.c	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate/server.c	2012-08-01 16:10:10.000000000 +0000
@@ -211,9 +211,9 @@ enum {
 static GDBusNodeInfo *            bus_node_info = NULL;
 static GDBusInterfaceInfo *       bus_interface_info = NULL;
 static const GDBusInterfaceVTable bus_interface_table = {
-	.method_call = bus_method_call,
-	.get_property = bus_get_prop,
-	.set_property = NULL /* No properties that can be set */
+	method_call:    bus_method_call,
+	get_property:   bus_get_prop,
+	set_property:   NULL /* No properties that can be set */
 };
 static method_table_t             bus_method_table[METHOD_COUNT];
 
@@ -576,6 +576,7 @@ indicate_server_dispose (GObject * obj)
 		priv->interest_timer = 0;
 	}
 
+	G_OBJECT_CLASS (indicate_server_parent_class)->dispose (obj);
 	return;
 }
 
@@ -585,15 +586,10 @@ indicate_server_finalize (GObject * obj)
 	IndicateServer * server = INDICATE_SERVER(obj);
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
 
-	if (priv->path) {
-		g_free(priv->path);
-	}
-	if (priv->desktop) {
-		g_free(priv->desktop);
-	}
-	if (priv->type) {
-		g_free(priv->type);
-	}
+	g_free(priv->path);
+	g_free(priv->desktop);
+	g_free(priv->type);
+	g_free(priv->icon_theme);
 
 	G_OBJECT_CLASS (indicate_server_parent_class)->finalize (obj);
 
@@ -608,15 +604,11 @@ set_property (GObject * obj, guint id, c
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(obj);
 	switch (id) {
 	case PROP_DESKTOP:
-		if (priv->desktop != NULL) {
-			g_free(priv->desktop);
-		}
+		g_free(priv->desktop);
 		priv->desktop = g_value_dup_string(value);
 		break;
 	case PROP_TYPE:
-		if (priv->type != NULL) {
-			g_free(priv->type);
-		}
+		g_free(priv->type);
 		priv->type = g_value_dup_string(value);
 		break;
 	case PROP_COUNT: {
@@ -637,15 +629,11 @@ set_property (GObject * obj, guint id, c
 		break;
 	}
 	case PROP_PATH:
-	        if (priv->path != NULL) {
-	                g_free(priv->path);
-	        }
-	        priv->path = g_value_dup_string(value);
-	        break;
+		g_free(priv->path);
+		priv->path = g_value_dup_string(value);
+		break;
 	case PROP_ICON_THEME:
-		if (priv->icon_theme != NULL) {
-			g_free (priv->icon_theme);
-		}
+		g_free (priv->icon_theme);
 		priv->icon_theme = g_value_dup_string(value);
 		break;
 	default:
diff -pruN 0.6.92-6/libindicate-gtk/Makefile.am 12.10.1-0ubuntu5/libindicate-gtk/Makefile.am
--- 0.6.92-6/libindicate-gtk/Makefile.am	2012-03-09 21:55:27.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate-gtk/Makefile.am	2017-09-30 15:41:40.000000000 +0000
@@ -43,7 +43,7 @@ libindicate_gtk_la_LDFLAGS = \
 libindicate_gtk_la_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	-I $(top_srcdir) \
-	-Wall -Werror \
+	-Wall -Werror -Wno-error=unused-function \
 	$(LIBINDICATEGTK_CFLAGS)
 
 libindicate_gtk_la_LIBADD = \
diff -pruN 0.6.92-6/libindicate-gtk/Makefile.in 12.10.1-0ubuntu5/libindicate-gtk/Makefile.in
--- 0.6.92-6/libindicate-gtk/Makefile.in	2012-03-21 20:40:20.000000000 +0000
+++ 12.10.1-0ubuntu5/libindicate-gtk/Makefile.in	2012-08-22 04:52:43.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -147,6 +164,11 @@ am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libindicate_gtk_la_SOURCES) $(libindicate_gtk3_la_SOURCES)
 DIST_SOURCES = $(libindicate_gtk_la_SOURCES) \
 	$(libindicate_gtk3_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) $(vapi_DATA)
 HEADERS = $(libindicate_gtk3include_HEADERS) \
 	$(libindicate_gtkinclude_HEADERS)
@@ -500,7 +522,6 @@ indicate-gtk3-0.7.pc: $(top_builddir)/co
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -508,6 +529,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -601,8 +624,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-girDATA: $(gir_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -619,8 +645,11 @@ uninstall-girDATA:
 	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -637,8 +666,11 @@ uninstall-pkgconfigDATA:
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-typelibDATA: $(typelib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
 	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -655,8 +687,11 @@ uninstall-typelibDATA:
 	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
 install-vapiDATA: $(vapi_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)"
 	@list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -673,8 +708,11 @@ uninstall-vapiDATA:
 	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
 install-libindicate_gtk3includeHEADERS: $(libindicate_gtk3include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libindicate_gtk3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicate_gtk3includedir)"
 	@list='$(libindicate_gtk3include_HEADERS)'; test -n "$(libindicate_gtk3includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libindicate_gtk3includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libindicate_gtk3includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -691,8 +729,11 @@ uninstall-libindicate_gtk3includeHEADERS
 	dir='$(DESTDIR)$(libindicate_gtk3includedir)'; $(am__uninstall_files_from_dir)
 install-libindicate_gtkincludeHEADERS: $(libindicate_gtkinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libindicate_gtkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicate_gtkincludedir)"
 	@list='$(libindicate_gtkinclude_HEADERS)'; test -n "$(libindicate_gtkincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libindicate_gtkincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libindicate_gtkincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -pruN 0.6.92-6/m4/gcov.m4 12.10.1-0ubuntu5/m4/gcov.m4
--- 0.6.92-6/m4/gcov.m4	2012-03-09 21:55:27.000000000 +0000
+++ 12.10.1-0ubuntu5/m4/gcov.m4	2012-07-11 17:59:02.000000000 +0000
@@ -5,11 +5,10 @@
 #  * gcovr
 # 
 # Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML. 
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
 AC_DEFUN([AC_TDD_GCOV],
-[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov,
 [
-AC_ARG_ENABLE(gcov,
+  AC_ARG_ENABLE(gcov,
   AS_HELP_STRING([--enable-gcov],
 		 [enable coverage testing with gcov]),
   [use_gcov=$enableval], [use_gcov=no])
@@ -34,7 +33,6 @@ AC_ARG_ENABLE(gcov,
   lcov_version_list="1.6 1.7 1.8 1.9"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
 
   if test "$LCOV"; then
     AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
@@ -63,10 +61,8 @@ AC_ARG_ENABLE(gcov,
     AC_MSG_ERROR([Could not find genhtml from the lcov package])
   fi
 
-  if test -z "$GCOVR"; then
-    AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
-  fi
-
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
 
   # Remove all optimization flags from CFLAGS
   changequote({,})
@@ -78,6 +74,13 @@ AC_ARG_ENABLE(gcov,
   COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
   COVERAGE_LDFLAGS="-lgcov"
 
-fi
-])]) # AC_TDD_GCOV
+  # Check availability of gcovr
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
 
+fi
+]) # AC_TDD_GCOV
diff -pruN 0.6.92-6/m4/gnome-doc-utils.m4 12.10.1-0ubuntu5/m4/gnome-doc-utils.m4
--- 0.6.92-6/m4/gnome-doc-utils.m4	2012-03-09 21:55:32.000000000 +0000
+++ 12.10.1-0ubuntu5/m4/gnome-doc-utils.m4	2012-08-22 04:52:39.000000000 +0000
@@ -38,6 +38,11 @@ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[t
 AC_DEFUN([GNOME_DOC_INIT],
 [AC_REQUIRE([AC_PROG_LN_S])dnl
 
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
 ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
 
 AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
diff -pruN 0.6.92-6/Makefile.am 12.10.1-0ubuntu5/Makefile.am
--- 0.6.92-6/Makefile.am	2017-09-30 15:41:40.000000000 +0000
+++ 12.10.1-0ubuntu5/Makefile.am	2012-07-11 17:59:02.000000000 +0000
@@ -26,7 +26,7 @@ EXTRA_DIST = \
 	xmldocs.make \
 	autogen.sh
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper --disable-introspection
 
 DISTCLEANFILES = \
 	libindicate-*.tar.gz \
@@ -59,37 +59,4 @@ dist-hook:
 	fi
 
 
-# Coverage targets
-
-.PHONY: clean-gcda
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-
-.PHONY: coverage-html generate-coverage-html clean-coverage-html
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
-coverage-xml: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
-
-generate-coverage-xml:
-	@echo Generating coverage XML report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-
-clean-coverage-xml: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-clean-local: clean-coverage-html clean-coverage-xml
+include $(top_srcdir)/Makefile.am.coverage
diff -pruN 0.6.92-6/Makefile.am.coverage 12.10.1-0ubuntu5/Makefile.am.coverage
--- 0.6.92-6/Makefile.am.coverage	1970-01-01 00:00:00.000000000 +0000
+++ 12.10.1-0ubuntu5/Makefile.am.coverage	2012-07-11 17:59:02.000000000 +0000
@@ -0,0 +1,48 @@
+
+# Coverage targets
+
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+if HAVE_GCOV
+
+clean-gcno:
+	@echo Removing old coverage instrumentation
+	-find -name '*.gcno' -print | xargs -r rm
+
+clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+  
+coverage-html: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+  
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+  
+clean-coverage-html: clean-gcda
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf coverage.info coveragereport
+
+if HAVE_GCOVR
+
+coverage-gcovr: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+	
+generate-coverage-gcovr:
+	@echo Generating coverage GCOVR report
+	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+	
+clean-coverage-gcovr: clean-gcda
+	-rm -rf $(top_builddir)/coverage.xml
+
+endif # HAVE_GCOVR
+
+endif # HAVE_GCOV
diff -pruN 0.6.92-6/Makefile.in 12.10.1-0ubuntu5/Makefile.in
--- 0.6.92-6/Makefile.in	2012-03-21 20:40:21.000000000 +0000
+++ 12.10.1-0ubuntu5/Makefile.in	2012-08-22 04:52:44.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,7 +14,26 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# Coverage targets
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,12 +53,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WANT_TESTS_TRUE@am__append_1 = tests
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing py-compile
+	$(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
+	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing py-compile
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -70,6 +89,11 @@ RECURSIVE_TARGETS = all-recursive check-
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -332,7 +356,7 @@ all: config.h
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -355,6 +379,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/Makefile.am.coverage:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -558,13 +583,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -870,40 +892,43 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
-# Coverage targets
-
-.PHONY: clean-gcda
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-
-.PHONY: coverage-html generate-coverage-html clean-coverage-html
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
-coverage-xml: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
-
-generate-coverage-xml:
-	@echo Generating coverage XML report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-
-clean-coverage-xml: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+@HAVE_GCOV_TRUE@clean-gcno:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage instrumentation
+@HAVE_GCOV_TRUE@	-find -name '*.gcno' -print | xargs -r rm
+
+@HAVE_GCOV_TRUE@clean-gcda:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage results
+@HAVE_GCOV_TRUE@	-find -name '*.gcda' -print | xargs -r rm
+
+@HAVE_GCOV_TRUE@coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+@HAVE_GCOV_TRUE@generate-coverage-html:
+@HAVE_GCOV_TRUE@	@echo Collecting coverage data
+@HAVE_GCOV_TRUE@	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+@HAVE_GCOV_TRUE@	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+
+@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(LCOV) --directory $(top_builddir) -z
+@HAVE_GCOV_TRUE@	-rm -rf coverage.info coveragereport
+
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr:
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	@echo Generating coverage GCOVR report
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
 
-clean-local: clean-coverage-html clean-coverage-xml
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-rm -rf $(top_builddir)/coverage.xml
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -pruN 0.6.92-6/NEWS 12.10.1-0ubuntu5/NEWS
--- 0.6.92-6/NEWS	2012-03-09 21:55:27.000000000 +0000
+++ 12.10.1-0ubuntu5/NEWS	2012-08-22 04:52:05.000000000 +0000
@@ -0,0 +1,18 @@
+
+12.10.1
+
+ - Fix a pair of memory leaks (LP #1026722) (LP #1028184)
+
+12.10.0
+
+ - IndicateServer's dispose() method should call it its superclass'
+   dispose(). (LP #986890)
+
+ - Don't include build-time filenames in comments of the enum header files
+   If we do, the header files may be different on each build.
+   This is especially harmful when building multiple times for multiple
+   architectures and expecting the files to be identical.
+
+ - merge lp:~allanlesage/libindicate/TDD to remove a dependency on gcovr,
+   move gcov targets to their own makefile, and clean up .gcno files.
+
diff -pruN 0.6.92-6/tests/Makefile.in 12.10.1-0ubuntu5/tests/Makefile.in
--- 0.6.92-6/tests/Makefile.in	2012-03-21 20:40:21.000000000 +0000
+++ 12.10.1-0ubuntu5/tests/Makefile.in	2012-08-22 04:52:44.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -357,6 +374,11 @@ DIST_SOURCES = $(test_icon_theme_client_
 	$(test_simple_client_SOURCES) $(test_simple_server_SOURCES) \
 	$(test_thousand_indicators_client_SOURCES) \
 	$(test_thousand_indicators_server_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \