[passepartout] migrate to gnome-doc-utils

[Sven Herzberg <herzi src gnome org>]

commit bdcfe293ec674bce963f7da2baa7f076df5d4856
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 23 14:30:30 2009 +0200

    migrate to gnome-doc-utils
    
    * configure.ac: depend on gnome-doc-utils
    * help/Makefile.am: updated build system
    * help/passepartout-C.omf.in: dropped old file
    * help/passepartout.omf.in: added new file
    * help/C/passepartout.xml: added a maintainer and an abstract
---
 configure.ac               |    6 +-----
 help/C/passepartout.xml    |    5 ++++-
 help/Makefile.am           |   33 ++++++++++++++++-----------------
 help/passepartout-C.omf.in |   21 ---------------------
 help/passepartout.omf.in   |   13 +++++++++++++
 5 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/configure.ac b/configure.ac
index 390dd96..887cfce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,11 +129,7 @@ dnl  ---------------
 dnl | documentation |
 dnl  ---------------
 
-AC_CHECK_PROG(SCROLLKEEPER_UPDATE,[scrollkeeper-update],[scrollkeeper-update],[no])
-
-if test "$SCROLLKEEPER_UPDATE" = "no"; then
-	AC_MSG_ERROR([please install scrollkeeper])
-fi
+GNOME_DOC_INIT
 
 AC_CONFIG_FILES([doc/Makefile
 		 doc/examples/Makefile
diff --git a/help/C/passepartout.xml b/help/C/passepartout.xml
index acfc5f0..809a5cc 100644
--- a/help/C/passepartout.xml
+++ b/help/C/passepartout.xml
@@ -10,7 +10,7 @@
       for version &version;
     </releaseinfo>
     <authorgroup>
-      <author>
+      <author role="maintainer">
 	<firstname>Fredrik</firstname> <surname>Arnerup</surname>
 	<affiliation>
 	  <address>
@@ -32,6 +32,9 @@
         <date>2009-04-13</date>
       </revision>
     </revhistory>
+    <abstract role="description"><para>
+	Passepartout is a desktop publishing (DTP) application
+    </para></abstract>
   </bookinfo>
 
   <xi:include href="users_guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
diff --git a/help/Makefile.am b/help/Makefile.am
index 1178bfc..c02db73 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,13 +1,21 @@
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
 
 DOC_MODULE=passepartout
+DOC_INCLUDES=\
+	faq.xml \
+	legal.xml \
+	nsfaq.xml \
+	users_guide.xml \
+	../version.txt \
+	$(NULL)
+
+DOC_LINGUAS=\
+	$(NULL)
+
 dist_help_DATA=\
-	C/faq.xml \
-	C/legal.xml \
-	C/nsfaq.xml \
-	C/users_guide.xml \
 	$(top_srcdir)/logotype/pptout.png \
 	$(NULL)
-dist_help_DATA+=C/$(DOC_MODULE).xml
 
 nodist_doc_DATA=\
 	C/passepartout.html \
@@ -15,7 +23,7 @@ nodist_doc_DATA=\
 	$(NULL)
 dist_built_in=version.txt.in
 nodist_help_DATA=$(dist_built_in:.in=)
-helpdir=$(datadir)/gnome/help/passepartout/C
+helpdir=$(HELPDIR)/$(DOC_MODULE)/C
 
 check-local: check-manual
 
@@ -24,14 +32,6 @@ check-manual: C/passepartout.xml
 	@echo "[TEST] $<"
 	(cd C && $(XMLLINT) --xinclude `basename $<` | $(XMLLINT) --valid --noout -)
 
-omf_in_files=passepartout-C.omf.in
-omf_DATA=$(omf_in_files:.in=)
-omfdir=$(datadir)/omf/passepartout
-
-passepartout-C.omf: passepartout-C.omf.in Makefile
-	@echo "[GEN]  $@"
-	@sed 's&@DATADIR@&$(datadir)&' $< > $@
-
 # Make symbolic links to the stylesheets:
 # (Remove existing stylesheets first; the -f flag for ln is not portable.)
 # Todo: is basename really portable?
@@ -67,7 +67,6 @@ SUFFIXES=.txt .xml .html
 	@echo "[GEN]  $@"
 	xsltproc -o $@ --path "$(builddir)/C" $(srcdir)/$(DOCBOOK2HTML) $<
 
-EXTRA_DIST=$(dist_built_in) $(DOCBOOK2TXT) $(DOCBOOK2HTML) $(omf_in_files)
-CLEANFILES=$(omf_DATA) $(nodist_doc_DATA)
+EXTRA_DIST=$(dist_built_in) $(DOCBOOK2TXT) $(DOCBOOK2HTML)
+CLEANFILES=$(nodist_doc_DATA)
 DISTCLEANFILES=$(nodist_help_DATA)
-
diff --git a/help/passepartout-C.omf.in b/help/passepartout-C.omf.in
deleted file mode 100644
index c892ad8..0000000
--- a/help/passepartout-C.omf.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
-<omf>
-  <resource>
-    <creator>
-      farnerup src gnome org (Fredrik Arnerup)
-    </creator>
-    <title>
-      Passepartout Manual
-    </title>
-    <date>
-      2009-04-10
-    </date>
-    <subject category="Applications|Office|Publishing"/>
-    <format mime="text/xml"/>
-    <identifier url="file://@DATADIR@/gnome/help/passepartout/C/passepartout.xml"/>
-    <language code="C"/>
-    <relation seriesid="77c90ca6-25e3-11de-98e2-c5239981ef22"/>
-  </resource>
-</omf>
-
diff --git a/help/passepartout.omf.in b/help/passepartout.omf.in
new file mode 100644
index 0000000..1ab2f30
--- /dev/null
+++ b/help/passepartout.omf.in
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";>
+<omf>
+  <resource>
+    <subject category="Applications|Office|Publishing"/>
+    <type>manual</type>
+    <relation seriesid="77c90ca6-25e3-11de-98e2-c5239981ef22"/>
+    <rights type="CC BY-SA" license.version="3.0"
+	    license="http://creativecommons.org/licenses/by-sa/3.0/";
+	    holder="Fredrik Arnerup"/>
+  </resource>
+</omf>
+