diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:48:23 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:48:23 -0800 |
| commit | 7b8f050e160bc4a640568f827762b9f7711fa984 (patch) | |
| tree | 8dcdd608a930fa2482ca59b63aef432cbdf491fe | |
| parent | 107af596cce261e6bc9285fffb04d7971975ef3f (diff) | |
| parent | 2f4e68b25471b1aa57e7566556691205f9ccaf3b (diff) | |
| download | mate-polkit-7b8f050e160bc4a640568f827762b9f7711fa984.tar.bz2 mate-polkit-7b8f050e160bc4a640568f827762b9f7711fa984.tar.xz | |
Merge pull request #12 from infirit/1.6
Cherrypick usefull commits from master
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/polkit-gtk-mate-1-docs.xml | 74 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
4 files changed, 77 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dee3a67..427eea0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([polkit-mate],[1.6.0],[http://www.mate-desktop.org/],[mate-polkit]) -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip]) AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/Makefile.am b/docs/Makefile.am index c3b8217..45dd77f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -25,7 +25,7 @@ IGNORE_HFILES= \ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ $(POLKIT_GOBJECT_CFLAGS) \ $(GTK_CFLAGS) \ -I$(top_srcdir)/polkitgtkmate \ diff --git a/docs/polkit-gtk-mate-1-docs.xml b/docs/polkit-gtk-mate-1-docs.xml new file mode 100644 index 0000000..1db29c1 --- /dev/null +++ b/docs/polkit-gtk-mate-1-docs.xml @@ -0,0 +1,74 @@ +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ +<!ENTITY version SYSTEM "version.xml"> +]> +<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> + <bookinfo> + <title>PolicyKit-GTK+ Reference Manual</title> + <releaseinfo>Version &version;</releaseinfo> + <authorgroup> + <author> + <firstname>David</firstname> + <surname>Zeuthen</surname> + <affiliation> + <address> + <email>[email protected]</email> + </address> + </affiliation> + </author> + </authorgroup> + + <copyright> + <year>2008-2009</year> + <holder>The PolicyKit Authors</holder> + </copyright> + + <legalnotice id="polkit-legal-notice"> + <para> + Permission is granted to copy, distribute and/or modify this + document under the terms of the <citetitle>GNU Free + Documentation License</citetitle>, Version 1.1 or any later + version published by the Free Software Foundation with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. You may obtain a copy of the <citetitle>GNU Free + Documentation License</citetitle> from the Free Software + Foundation by visiting <ulink type="http" + url="http://www.fsf.org">their Web site</ulink> or by writing + to: + + <address> + The Free Software Foundation, Inc., + <street>59 Temple Place</street> - Suite 330, + <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>, + <country>USA</country> + </address> + </para> + + <para> + Many of the names used by companies to distinguish their + products and services are claimed as trademarks. Where those + names appear in any GNOME documentation, and those + trademarks are made aware to the members of the + GNOME Documentation Project, the names have been + printed in caps or initial caps. + </para> + </legalnotice> + </bookinfo> + + <part id="ref-gtk-api"> + <title>API Reference</title> + <xi:include href="xml/polkitlockbutton.xml"/> + </part> + + + <chapter id="polkit-gtk-hierarchy"> + <title>Object Hierarchy</title> + <xi:include href="xml/tree_index.sgml"/> + </chapter> + + <index id="polkit-gtk-index"> + <title>Index</title> + </index> + +</book> diff --git a/po/POTFILES.skip b/po/POTFILES.skip index e487dbc..0cec32c 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1,2 @@ polkitgtkmate/example.c +src/polkit-mate-authentication-agent-1.desktop.in |