--- a/ChangeLog	Wed Jun 09 09:09:18 2004 +0000
+++ b/ChangeLog	Wed Jun 09 09:11:21 2004 +0000
@@ -1,3 +1,10 @@
+2004-06-09  Damien Carbery <[email protected]>
+
+	* gnome-pilot.spec: Integrated docs and associated patch from 
+	[email protected]
+	* patches/gnome-pilot-06-C_docs.diff: Modify help/C/Makefile.am to add
+	figures included in the docs tarball.
+
 2004-06-09  Padraig O'Briain <[email protected]>
 
 	* gnopernicus.spec: Update to 0.9.5 tarball

--- a/gnome-pilot.spec	Wed Jun 09 09:09:18 2004 +0000
+++ b/gnome-pilot.spec	Wed Jun 09 09:11:21 2004 +0000
@@ -8,11 +8,13 @@
 Summary:	PalmOS link utilities
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
 Source1:        gnome-pilot-l10n-po-1.1.tar.bz2
+Source2:        gnome-pilot-docs-0.1.tar.bz2
 Patch1:		gnome-pilot-01-potfiles-in.diff
 Patch2:     	gnome-pilot-02-menu-entry.diff
 Patch3:     	gnome-pilot-03-add-all-linguas.diff
 Patch4:     	gnome-pilot-04-g11n-i18n-ui.diff
 Patch5:         gnome-pilot-05-automake-fix.diff
+Patch6:		gnome-pilot-06-C_docs.diff
 URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/gnome-pilot
@@ -51,9 +53,11 @@
 %patch1 -p1
 %patch2 -p1
 bzcat %SOURCE1 | tar xvf -
+bzcat %SOURCE2 | tar xvf -
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 LC_ALL=
@@ -123,6 +127,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 09 2004 - [email protected]
+- Integrated docs and associated patch from [email protected]
+
 * Wed May 12 2004 - [email protected]
 - Updated l10n content to gnome-pilot-l10n-po-1.1.tar.bz2