[pan2: 8/14] Tweak the help support

[Heinrich MÃller <henmull src gnome org>]

commit bb12ef1bc5d41c9d50838d659a2685ec80c8001b
Author: Petr Kovar <pknbe volny cz>
Date:   Wed Jan 26 22:27:47 2011 +0100

    Tweak the help support

 .gitignore       |    1 +
 Makefile.am      |   13 +++++++------
 autogen.sh       |    2 +-
 configure.in     |    6 +++---
 help/C/pan.xml   |    7 +++++--
 help/Makefile.am |    4 +++-
 help/pan.omf.in  |    5 +++--
 7 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16f5067..8ff914b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,6 @@ Thumbs.db
 build/
 .waf*/
 waf*/
+gnome-doc-utils.m4
 gnome-doc-utils.make
 help/*.omf
diff --git a/Makefile.am b/Makefile.am
index 54861aa..b175e91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ DESKTOP_IN_FILES=pan.desktop.in
 DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 
 DISTCLEANFILES = \
+ gnome-doc-utils.make \
  intltool-extract \
  intltool-merge \
  intltool-update \
- pan.desktop \
- gnome-doc-utils.make
-
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper"
+ pan.desktop
 
 EXTRA_DIST = \
  README \
@@ -20,12 +18,15 @@ EXTRA_DIST = \
  README.mingw \
  ChangeLog \
  Pan.ico \
+ gnome-doc-utils.make \
+ m4 \
  pan.spec \
  pan.png \
  $(DESKTOP_IN_FILES) \
  $(DESKTOP_FILES) \
- intltool-extract.in intltool-merge.in intltool-update.in \
- gnome-doc-utils.make
+ intltool-extract.in intltool-merge.in intltool-update.in
+
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper"
 
 Productivitydir = $(datadir)/applications
 Productivity_DATA = $(DESKTOP_FILES)
diff --git a/autogen.sh b/autogen.sh
index e8d7483..2d63202 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index c506871..5b63ee3 100644
--- a/configure.in
+++ b/configure.in
@@ -32,8 +32,8 @@ AC_CONFIG_SRCDIR(pan/general/quark.cc)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 AM_MAINTAINER_MODE
 
-GNOME_DOC_INIT 
-
+GNOME_DOC_INIT
+AC_CONFIG_MACRO_DIR([m4])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl glib, gmime, and gtk are mandatory prerequisites.
@@ -64,7 +64,7 @@ AC_PROG_RANLIB
 dnl for libuu
 AC_CHECK_HEADERS([errno.h fcntl.h])
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.35.5])
 GETTEXT_PACKAGE=pan
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
diff --git a/help/C/pan.xml b/help/C/pan.xml
index 741b264..2c6ae77 100644
--- a/help/C/pan.xml
+++ b/help/C/pan.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
   <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appversion "1.0">
   <!ENTITY manrevision "0.1">
   <!ENTITY date "December 2006">
   <!ENTITY app "<application>Pan</application>">
+  <!ENTITY appname "Pan">
   <!-- Information about the entities
        The legal.xml file contains legal information, there is no need to edit the file. 
        Use the appversion entity to specify the version of the application.
@@ -36,6 +37,7 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo> 
+    <abstract role="description"><para>Manual for the Pan Newsreader.</para></abstract>
     <title><application>Pan</application> Manual v1.0</title>       
 
     <copyright> 
@@ -61,9 +63,10 @@
    <!-- This file  contains link to license for the documentation (GNU FDL), and 
         other legal stuff such as "NO WARRANTY" statement. Please do not change 
 	any of this. -->
+    &legal;
 
     <authorgroup> 
-      <author> 
+      <author role="maintainer"> 
 		<firstname>Douglas</firstname> 
 		<surname>Bollinger</surname> 
 		<affiliation> 
diff --git a/help/Makefile.am b/help/Makefile.am
index d8130b0..2b72b2f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,10 @@
 include $(top_srcdir)/gnome-doc-utils.make
+
 dist-hook: doc-dist-hook
+
 DOC_MODULE = pan
 DOC_ENTITIES = legal.xml
 DOC_INCLUDES =
-DOC_FIGURES = figures/pan_window.png
+DOC_FIGURES = pan_window.png
 DOC_LINGUAS =
 
diff --git a/help/pan.omf.in b/help/pan.omf.in
index 1105a25..90702d0 100644
--- a/help/pan.omf.in
+++ b/help/pan.omf.in
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <omf>
   <resource>
-    <subject category="GNOME|Internet"/>
+    <subject category="Internet"/>
     <type>manual</type>
+    <identifier url="pan.xml"/>
     <relation seriesid="0f3b9550-d2ae-d04e-9240-0e0958ed87d8b0"/>
-    <rights type="GNU FDL" license.version="1.1" holder="Douglas Bollinger"/>
+    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"; holder="Douglas Bollinger"/>
   </resource>
 </omf>