PolicyKit: Branch 'master' - 3 commits

[Colin Walters]

 .gitignore              |   26 ++++++++++++++++++++++++++
 docs/polkit/Makefile.am |   11 +++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 46b99351ed8e3c8690a3f346a1999d8f34c25111
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Wed Apr 10 01:28:03 2013 +0200

    Fix DOC_SOURCE_DIR for builddir != srcdir
    
    This snippet comes from gtk-doc 1.18 examples/Makefile.am; we might want
    to update all of the file but that's not strictly necessary.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=63479

diff --git a/docs/polkit/Makefile.am b/docs/polkit/Makefile.am
index bc90178..e0b669a 100644
--- a/docs/polkit/Makefile.am
+++ b/docs/polkit/Makefile.am
@@ -12,8 +12,11 @@ DOC_MAIN_SGML_FILE=polkit-1-docs.xml
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--ignore-headers=config.h
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../src
+# Directories containing the source code.
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
+DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/src/polkit*/*.h
commit 6c2c3f20e655e8b20d72a6fe929d4ae0321b4b49
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Wed Apr 10 01:24:50 2013 +0200

    Fix build with srcdir!=builddir
    
    gtk-doc.make is attempting to add --path automatically but there is a
    bug in the script in gtk-doc 1.18
    
    https://bugs.freedesktop.org/show_bug.cgi?id=63479

diff --git a/docs/polkit/Makefile.am b/docs/polkit/Makefile.am
index 8c6e58a..bc90178 100644
--- a/docs/polkit/Makefile.am
+++ b/docs/polkit/Makefile.am
@@ -45,6 +45,10 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=polkit
 # Extra options to supply to gtkdoc-mktmpl
 MKTMPL_OPTIONS=
 
+# Extra options to supply to gtkdoc-mkhtml - workaround for incorrect check
+# in gtk-doc-1.18
+MKHTML_OPTIONS=--path=$(srcdir)
+
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files =  			    								\
 	overview.xml											\
commit 1f47d30aead0acb88912af3f889db0aa8bffc61b
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Wed Apr 10 00:38:29 2013 +0200

    Clean (git status) after autogen.sh
    
    Ignore most automatically created files.  Add empty ChangeLog (to avoid
    surprises if anyone wanted to add content later).
    
    https://bugs.freedesktop.org/show_bug.cgi?id=63479

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d8b6f2e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+/INSTALL
+/autom4te.cache
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/depcomp
+/gtk-doc.make
+/install-sh
+/ltmain.sh
+/missing
+/po/Makefile.in.in
+/test/mocklibc/aclocal.m4
+/test/mocklibc/autom4te.cache
+/test/mocklibc/config.guess
+/test/mocklibc/config.h.in
+/test/mocklibc/config.sub
+/test/mocklibc/configure
+/test/mocklibc/depcomp
+/test/mocklibc/install-sh
+/test/mocklibc/ltmain.sh
+/test/mocklibc/missing
+Makefile.in
+*~
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29