diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | help/C/Makefile.am | 7 | ||||
| -rw-r--r-- | help/C/zenity-C.omf | 30 | ||||
| -rw-r--r-- | help/C/zenity.xml | 6 | ||||
| -rw-r--r-- | help/ChangeLog | 3 | ||||
| -rw-r--r-- | help/Makefile.am | 12 | ||||
| -rw-r--r-- | help/zenity.omf.in | 11 |
10 files changed, 55 insertions, 46 deletions
@@ -26,3 +26,4 @@ missing install-sh depcomp INSTALL +gnome-doc-utils.make @@ -1,3 +1,22 @@ +2005-07-24 Lucas Rocha <lucasr@cvs.gnome.org> + + * .cvsignore: added gnome-doc-utils.make. + * configure.in: added GNOME_DOC_INIT and + removed help/C/Makefile and help/sr/Makefile + from AC_OUTPUT. + * Makefile.am: added gnome-doc-utils.make to + EXTRA_DIST and DISTCLEANFILES. Added + DISTCHECK_CONFIGURE_FLAGS. + * help/Makefile.am: migration to gnome-doc-utils. + * help/zenity.omf.in: new OMF file to be used by + gnome-doc-utils. + * help/C/Makefile.am, help/C/zenity-C.omf: No + longer needed. Removed. + * help/C/zenity.xml: updates to be gnome-doc-utils + compliant. + * help/ChangeLog: new ChangeLog to keep track + of doc updates. + 2005-07-14 Yair Hershkovitz <yairhr@gmail.com> * configure.in: Added Hebrew translation. diff --git a/Makefile.am b/Makefile.am index cf93789c..961adbc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,13 @@ EXTRA_DIST = \ ChangeLog \ NEWS \ README \ - AUTHORS + AUTHORS \ + gnome-doc-utils.make DISTCLEANFILES = \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + gnome-doc-utils.make + +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --git a/configure.in b/configure.in index f9e5c9fb..eb7e2c20 100644 --- a/configure.in +++ b/configure.in @@ -3,6 +3,8 @@ AC_INIT(src) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(zenity, 2.11.2) +GNOME_DOC_INIT + AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.29]) @@ -93,6 +95,4 @@ src/Makefile src/gdialog data/Makefile help/Makefile -help/C/Makefile -help/sr/Makefile ]) diff --git a/help/C/Makefile.am b/help/C/Makefile.am deleted file mode 100644 index d935337a..00000000 --- a/help/C/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -figdir = figures -docname = zenity -lang = C -omffile = zenity-C.omf -entities = legal.xml -include $(top_srcdir)/xmldocs.make -dist-hook: app-dist-hook diff --git a/help/C/zenity-C.omf b/help/C/zenity-C.omf deleted file mode 100644 index 1c0c646a..00000000 --- a/help/C/zenity-C.omf +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<omf> - <resource> - <creator> - Sun Java Desktop System Documentation Team - </creator> - <maintainer> - Sun Java Desktop System Documentation Team - </maintainer> - <title> - Zenity - </title> - <date> - 2004-08-17 - </date> - <version identifier="2.0" date="2004-08-17" description="Updated for Sun Java Desktop System Release 3, program version 2.6.0"/> - <subject category="GNOME|Desktop"/> - <description> - User manual for the Zenity desktop application. - </description> - <type> - user's guide - </type> - <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <identifier url="zenity.xml"/> - <language code="C"/> - <relation seriesid="1e4f989c-287a-11d7-84e2-b1f3b939ba73"/> - <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/> - </resource> -</omf> diff --git a/help/C/zenity.xml b/help/C/zenity.xml index 3b06c7d5..c9147c0e 100644 --- a/help/C/zenity.xml +++ b/help/C/zenity.xml @@ -38,14 +38,13 @@ &legal; - <authorgroup> <author> <firstname>&author1;</firstname> <surname>&author2;</surname> <affiliation><orgname>&publisher;</orgname></affiliation> </author> - <author> + <author role="maintainer"> <firstname>Glynn</firstname> <surname>Foster</surname> <affiliation> @@ -92,6 +91,9 @@ <!-- Translators may also add here feedback address for translations --> </legalnotice> + <abstract role="description"> + <para>User manual for the Zenity desktop application.</para> + </abstract> </articleinfo> <indexterm> diff --git a/help/ChangeLog b/help/ChangeLog new file mode 100644 index 00000000..a1ae0cce --- /dev/null +++ b/help/ChangeLog @@ -0,0 +1,3 @@ +2005-07-24 Lucas Rocha <lucasr@cvs.gnome.org> + + * ChangeLog: added ChangeLog here. diff --git a/help/Makefile.am b/help/Makefile.am index df5070d8..11b01059 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,3 +1,9 @@ -SUBDIRS = \ - C \ - sr +include $(top_srcdir)/gnome-doc-utils.make +dist-hook: doc-dist-hook + +DOC_MODULE = zenity +DOC_ENTITIES = legal.xml +DOC_INCLUDES = +DOC_FIGURES = figures/zenity-calendar-screenshot.png figures/zenity-entry-screenshot.png figures/zenity-error-screenshot.png figures/zenity-fileselection-screenshot.png figures/zenity-information-screenshot.png figures/zenity-list-screenshot.png figures/zenity-notification-screenshot.png figures/zenity-progress-screenshot.png figures/zenity-question-screenshot.png figures/zenity-text-screenshot.png figures/zenity-warning-screenshot.png + +DOC_LINGUAS = diff --git a/help/zenity.omf.in b/help/zenity.omf.in new file mode 100644 index 00000000..6edd2d7c --- /dev/null +++ b/help/zenity.omf.in @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<omf> + <resource> + <subject category="GNOME|Desktop"/> + <type> + user's guide + </type> + <relation seriesid="1e4f989c-287a-11d7-84e2-b1f3b939ba73"/> + <rights type="GNU FDL" license.version="1.1" holder="Sun Microsystems"/> + </resource> +</omf> |