? libwpd.patch
? src/conv/raw/.cvsignore
? src/lib/src-lib-Makefile.am.patch
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- Makefile.am	5 Dec 2003 14:22:11 -0000	1.6
+++ Makefile.am	18 Dec 2003 11:56:05 -0000
@@ -5,11 +5,7 @@
 SUBDIRS = src build
 
 EXTRA_DIST = \
-	autogen.sh \
-	libwpd.spec.in          \
+	autogen.sh	\
+	libwpd.spec	\
+	libwpd.spec.in	\
 	CHANGES
-	
-# These may be in the builddir too
-BUILD_EXTRA_DIST = 		\
-	libwpd.spec	
-	
\ No newline at end of file
Index: configure.in
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/configure.in,v
retrieving revision 1.21
diff -u -r1.21 configure.in
--- configure.in	5 Dec 2003 14:22:11 -0000	1.21
+++ configure.in	18 Dec 2003 11:56:05 -0000
@@ -3,8 +3,8 @@
 AM_CONFIG_HEADER(config.h)
 
 WPD_MAJOR_VERSION=0
-WPD_MINOR_VERSION=7
-WPD_MICRO_VERSION=0
+WPD_MINOR_VERSION=6
+WPD_MICRO_VERSION=99
 
 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION"
 
@@ -142,6 +142,7 @@
 libwpd-1.pc
 libwpd.spec
 ])
+dnl src/conv/raw/Makefile
 
 case "$debug" in
      "true" )
Index: libwpd.spec.in
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/libwpd.spec.in,v
retrieving revision 1.1
diff -u -r1.1 libwpd.spec.in
--- libwpd.spec.in	26 May 2003 02:56:26 -0000	1.1
+++ libwpd.spec.in	18 Dec 2003 11:56:05 -0000
@@ -29,7 +29,8 @@
 
 %description tools
 Tools to transform WordPerfect Documents into other formats.
-Currently supported: html, raw, text
+Currently supported: html, text
+##Currently supported: html, raw, text
 
 %package devel
 Requires: libwpd
Index: src/conv/Makefile.am
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/conv/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- src/conv/Makefile.am	18 Oct 2003 19:04:35 -0000	1.4
+++ src/conv/Makefile.am	18 Dec 2003 11:56:06 -0000
@@ -3,3 +3,4 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 SUBDIRS = html text
+#SUBDIRS = html text raw
Index: src/conv/raw/main.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/conv/raw/main.cpp,v
retrieving revision 1.5
diff -u -r1.5 main.cpp
--- src/conv/raw/main.cpp	8 Nov 2003 16:22:42 -0000	1.5
+++ src/conv/raw/main.cpp	18 Dec 2003 11:56:06 -0000
@@ -2,6 +2,7 @@
 #include <gsf/gsf-input-stdio.h>
 #include <stdio.h>
 #include "libwpd.h"
+#include "WP6HLContentListener.h"
 #include "RawListener.h"
 
 int main(int argc, char *argv[])