diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | help/C/Makefile.am | 9 | ||||
| -rw-r--r-- | help/C/evince-C.omf | 30 | ||||
| -rw-r--r-- | help/C/evince.xml | 5 | ||||
| -rw-r--r-- | help/ChangeLog | 5 | ||||
| -rw-r--r-- | help/Makefile.am | 10 | ||||
| -rw-r--r-- | help/evince.omf.in | 11 |
11 files changed, 41 insertions, 45 deletions
@@ -29,3 +29,4 @@ mkinstalldirs omf.make stamp-h1 xmldocs.make +gnome-doc-utils.make @@ -1,3 +1,9 @@ +2005-07-23 Tommi Vainikainen <thv@iki.fi> + + * help/ChangeLog: Started this for translations of manual. + * configure.ac, autogen.sh, .cvsignore: Migrated to + gnome-doc-utils. Patch in bug #311222. + 2005-07-22 Martin Kretzschmar <martink@gnome.org> * backend/ev-document-factory.c (mime_type_supported_by_gdk_pixbuf): diff --git a/Makefile.am b/Makefile.am index ac59141..d748d98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,14 +36,15 @@ SUBDIRS += shell thumbnailer intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in -EXTRA_DIST = $(intltool_extra) +EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make DISTCLEANFILES = \ + gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update -DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install +DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper # Ignore scrollkeeper issues for now. @#*$& scrollkeeper distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf @@ -17,4 +17,4 @@ which gnome-autogen.sh || { exit 1 } -USE_COMMON_DOC_BUILD=yes REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 REQUIRED_GETTEXT_VERSION=0.10.36 . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 REQUIRED_GETTEXT_VERSION=0.10.36 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index 411a5b5..d895c92 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) GNOME_COMMON_INIT +GNOME_DOC_INIT GNOME_MAINTAINER_MODE_DEFINES GNOME_COMPILE_WARNINGS GNOME_CXX_WARNINGS @@ -292,7 +293,6 @@ properties/Makefile shell/Makefile thumbnailer/Makefile help/Makefile -help/C/Makefile ]) AC_OUTPUT diff --git a/help/C/Makefile.am b/help/C/Makefile.am deleted file mode 100644 index 95d493a..0000000 --- a/help/C/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -figdir = figures -docname = evince -lang = C -omffile = evince-C.omf -entities = legal.xml -include $(top_srcdir)/help/xmldocs.make -dist-hook: app-dist-hook - -DISTCLEANFILES = evince-C.omf.out diff --git a/help/C/evince-C.omf b/help/C/evince-C.omf deleted file mode 100644 index 5c05e93..0000000 --- a/help/C/evince-C.omf +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<omf> - <resource> - <creator> - docs@gnome.org (GDP) - </creator> - <maintainer> - docs@gnome.org (GDP) - </maintainer> - <title> - Evince Document Viewer Manual V1.0 - </title> - <date> - 2005-04-06 - </date> - <version identifier="1.0" date="2005-04-06" description="User documentation for version 0.2"/> - <subject category="GNOME|Applications|Graphics"/> - <description> - User manual for the Evince Document Viewer. - </description> - <type> - user's guide - </type> - <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <identifier url="evince.xml"/> - <language code="C"/> - <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/> - <rights type="GNU FDL" license.version="1.1" holder="Nickolay V. Shmyrev"/> - </resource> -</omf> diff --git a/help/C/evince.xml b/help/C/evince.xml index c626a5c..556376a 100644 --- a/help/C/evince.xml +++ b/help/C/evince.xml @@ -23,6 +23,9 @@ <!-- appropriate code --> <articleinfo> <title>&appname; Manual V&manrevision;</title> + <abstract role="description"> + <para>User manual for the Evince Document Viewer.</para> + </abstract> <copyright> <year>2005</year> <holder>Nickolay V. Shmyrev</holder> @@ -80,7 +83,7 @@ <revhistory> <revision> <revnumber>&appname; Manual V1.0</revnumber> - <date>&date;</date> + <date>2005-04-06</date> <revdescription> <para role="author">Nickolay V. Shmyrev</para> <para role="publisher">GNOME Documentation Project</para> diff --git a/help/ChangeLog b/help/ChangeLog new file mode 100644 index 0000000..764ac9f --- /dev/null +++ b/help/ChangeLog @@ -0,0 +1,5 @@ +2005-07-23 Tommi Vainikainen <thv@iki.fi> + + * Makefile.am, evince.omf.in, C/evince.xml: Migrated to use + gnome-doc-utils. + * C/Makefile.am, C/evince-C.omf: Removed in migration. diff --git a/help/Makefile.am b/help/Makefile.am index 42ffacc..3fac084 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1 +1,9 @@ -SUBDIRS = C +include $(top_srcdir)/gnome-doc-utils.make +dist-hook: doc-dist-hook + +DOC_MODULE = evince +DOC_ENTITIES = legal.xml +DOC_INCLUDES = +DOC_FIGURES = figures/evince_start_window.png + +DOC_LINGUAS = diff --git a/help/evince.omf.in b/help/evince.omf.in new file mode 100644 index 0000000..b563866 --- /dev/null +++ b/help/evince.omf.in @@ -0,0 +1,11 @@ +<?xml version="1.0" standalone="no"?> +<omf> + <resource> + <subject category="GNOME|Applications|Graphics"/> + <type> + user's guide + </type> + <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/> + <rights type="GNU FDL" license.version="1.1" holder="Nickolay V. Shmyrev"/> + </resource> +</omf> |