wv (1.2.4-2) debian-dir only changes

Summary

 debian/changelog                            |  361 ++++++++++++++++++++++++++++
 debian/compat                               |    1 
 debian/control                              |   63 ++++
 debian/copyright                            |   33 ++
 debian/libwv-1.2-3.docs                     |    1 
 debian/libwv-1.2-3.install                  |    1 
 debian/libwv-dev.install                    |    4 
 debian/libwv-dev.links                      |    1 
 debian/patches/00list                       |    9 
 debian/patches/detect-imagick.dpatch        |   43 +++
 debian/patches/man-refs.dpatch              |   74 +++++
 debian/patches/man-wvrtf-name.dpatch        |   19 +
 debian/patches/man-wvware-options.dpatch    |   54 ++++
 debian/patches/non-latin-latex.dpatch       |   26 ++
 debian/patches/wvdvi-output-ext.dpatch      |   18 +
 debian/patches/wvmime.dpatch                |  102 +++++++
 debian/patches/wvtext-no-graphics.dpatch    |   18 +
 debian/patches/wvware-no-placeholder.dpatch |   21 +
 debian/rules                                |   85 ++++++
 debian/watch                                |    2 
 debian/wv.install                           |    3 
 debian/wv.links                             |    1 
 debian/wv.mime                              |    2 
 debian/wv.postinst                          |   14 +
 24 files changed, 956 insertions(+)

    
download this patch

Patch contents

--- wv-1.2.4.orig/debian/wv.install
+++ wv-1.2.4/debian/wv.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin
+debian/tmp/usr/share/man/man1
+debian/tmp/usr/share/wv
--- wv-1.2.4.orig/debian/wv.mime
+++ wv-1.2.4/debian/wv.mime
@@ -0,0 +1,2 @@
+application/msword; wvMime %s; description=Microsoft Word Document; test=test -n "$DISPLAY"; priority=1
+application/msword; wvText %s /dev/stdout; description=Microsoft Word Document; copiousoutput; priority=1
--- wv-1.2.4.orig/debian/libwv-1.2-3.install
+++ wv-1.2.4/debian/libwv-1.2-3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*.so.*
--- wv-1.2.4.orig/debian/rules
+++ wv-1.2.4/debian/rules
@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# Copyright (C) 1994-1998  Martin Schulze <joey@debian.org>
+# Copyright (C) 1999-2006  Matej Vela <vela@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+export CFLAGS := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+confflags := --prefix=/usr \
+	     --mandir=/usr/share/man \
+	     --with-libwmf
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+build-stamp: patch-stamp
+	dh_testdir
+
+	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess .
+	./configure $(strip $(confflags))
+	$(MAKE)
+
+	> $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f GNUmakefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
+
+	dh_clean
+
+export DH_OPTIONS
+
+install: DH_OPTIONS =
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+binary-arch: DH_OPTIONS = -a
+binary-indep: DH_OPTIONS = -i
+binary-%: DH_OPTIONS = -p$*
+binary binary-%: install
+	dh_installdirs
+	dh_link
+	dh_install
+	dh_installchangelogs
+	dh_installdocs
+	dh_installmime
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_shlibdeps -Llibwv-1.2-3 -ldebian/libwv-1.2-3/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+.PHONY: build clean install binary
--- wv-1.2.4.orig/debian/libwv-dev.links
+++ wv-1.2.4/debian/libwv-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libwv-1.2-3 usr/share/doc/libwv-dev
--- wv-1.2.4.orig/debian/watch
+++ wv-1.2.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/wvware/wv-([\d.]+)\.tar\.gz
--- wv-1.2.4.orig/debian/patches/wvmime.dpatch
+++ wv-1.2.4/debian/patches/wvmime.dpatch
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wvmime.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: wvMime:
+## DP: - If available, use see(1) from mime-support.
+## DP: - Look for kghostview.
+## DP: - Make the script whitespace-safe.
+## DP: - Use wvPS rather than make_epses.sh (now gone).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/wvMime wv-1.2.1/wvMime
+--- wv-1.2.1~/wvMime	2006-03-18 19:16:28.000000000 +0100
++++ wv-1.2.1/wvMime	2006-03-18 19:18:54.000000000 +0100
+@@ -12,64 +12,37 @@
+ 	exit 1
+ fi
+ 
+-# viewer application
+-GV=""
+-
+-# check for gnome ghost-view first
+-type ggv >/dev/null 2>&1
+-if [ ${?} -eq "0" ]; then
+-	GV="ggv"
+-else
+-	# TODO: does kde have something?
+-
+-	# try to default back onto gv
+-	type gv >/dev/null 2>&1
+-	if [ ${?} -eq "0" ]; then
+-		GV="gv"
+-	else
+-		# old solaris systems
+-		type ghostview >/dev/null 2>&1
+-		if [ ${?} -eq "0" ]; then
+-			GV="ghostview"
+-		else
+-			# unrecoverable error
+-			echo "Could not find a suitable PostScript viewer."
+-			echo "Please install ggv, gv, or ghostview"
+-			exit 1
+-		fi
++if [ -z "$GV" ]; then
++	# determine the viewer application:
++	# - see (let mailcap decide)
++	# - ggv (GNOME Ghostview)
++	# - kghostview (KDE Ghostview)
++	# - gv (Xaw3d Ghostview)
++	# - ghostview (the classic Ghostscript frontend)
++	for GV in see ggv kghostview gv ghostview; do
++		type "$GV" >/dev/null 2>&1 && break
++	done
++	if [ ${?} -ne "0" ]; then
++		# unrecoverable error
++		echo "Could not find a suitable PostScript viewer."
++		echo "Please install ggv, kghostview, gv, or ghostview"
++		exit 1
+ 	fi
+ fi
+ 
+-# temporary PS file, mangled to get some sort
+-# of semi-uniqueness
+-FILE=`basename ${1}`
+-TMPDIR="/tmp/${FILE}-${USER}-${$}"
+-TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps" 
+-
+-mkdir $TMPDIR
+-
+-# Make sure all graphics go into /tmp as well
+-cp ${1} $TMPDIR/$FILE
+-
+-# Extract graphics
+-wvLatex "$TMPDIR/$FILE" "$TMPDIR/$FILE.tex" 2>/dev/null >/dev/null
++# temporary target directory
++t_dir=${TMPDIR:-/tmp}/wvMime-$USER-$$
++mkdir -m 700 "$t_dir" || exit
++trap 'rm -rf "$t_dir"' 0 1 2 3 15
+ 
+-# Graphics conversion if make_epses.sh installed:
+-STEM=$TMPDIR/`basename ${1} .doc`
+-type make_epses.sh 2>&1 >/dev/null
+-  if [ ${?} -eq "0" ]; then
+-    (cd $TMPDIR; make_epses.sh $STEM)
+-  fi
++# PS file
++name=`basename "$1" .doc`.ps
+ 
+-wvPS $TMPDIR/$FILE ${TMPPS}
++wvPS --targetdir="$t_dir" "$1" "$name"
+ if [ ${?} -ne "0" ]; then 
+ 	echo "Could not translate into Postscript" 
+ 	exit 1 
+ fi 
+ 
+ # call our ghost-viewer
+-${GV} ${TMPPS}
+-rm -f ${TMPPS}
+-
+-cd /
+-rm -rf $TMPDIR
++$GV "$t_dir/$name"
--- wv-1.2.4.orig/debian/patches/detect-imagick.dpatch
+++ wv-1.2.4/debian/patches/detect-imagick.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## detect-imagick.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: wvDVI.in, wvPDF.in, wvPS.in: Fix ImageMagick check (#160925).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/wvDVI.in wv-1.2.1/wvDVI.in
+--- wv-1.2.1~/wvDVI.in	2002-02-18 09:08:35.000000000 +0100
++++ wv-1.2.1/wvDVI.in	2006-03-18 00:45:10.000000000 +0100
+@@ -153,7 +153,7 @@
+ # auto_jpg=`"$wv_exec" --auto-eps=jpg`
+ # auto_pict=`"$wv_exec" --auto-eps=pict`
+ 
+-im_chk=`convert --help 2>&1 | grep -v ImageMagick`
++im_chk=`convert --help 2>&1 | grep ImageMagick`
+ if test "x$im_chk" = "x"; then
+   im_chk="no"
+   s_img=""
+diff -urNad wv-1.2.1~/wvPDF.in wv-1.2.1/wvPDF.in
+--- wv-1.2.1~/wvPDF.in	2004-08-07 22:49:28.000000000 +0200
++++ wv-1.2.1/wvPDF.in	2006-03-18 00:45:07.000000000 +0100
+@@ -177,7 +177,7 @@
+ # auto_jpg=`"$wv_exec" --auto-eps=jpg`
+ # auto_pict=`"$wv_exec" --auto-eps=pict`
+ 
+-im_chk=`convert --help 2>&1 | grep -v ImageMagick`
++im_chk=`convert --help 2>&1 | grep ImageMagick`
+ if test "x$im_chk" = "x"; then
+   im_chk="no"
+   s_img=""
+diff -urNad wv-1.2.1~/wvPS.in wv-1.2.1/wvPS.in
+--- wv-1.2.1~/wvPS.in	2004-08-07 22:49:28.000000000 +0200
++++ wv-1.2.1/wvPS.in	2006-03-18 00:44:53.000000000 +0100
+@@ -159,7 +159,7 @@
+ # auto_jpg=`"$wv_exec" --auto-eps=jpg`
+ # auto_pict=`"$wv_exec" --auto-eps=pict`
+ 
+-im_chk=`convert --help 2>&1 | grep -v ImageMagick`
++im_chk=`convert --help 2>&1 | grep ImageMagick`
+ if test "x$im_chk" = "x"; then
+   im_chk="no"
+   s_img=""
--- wv-1.2.4.orig/debian/patches/man-wvware-options.dpatch
+++ wv-1.2.4/debian/patches/man-wvware-options.dpatch
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## man-wvware-options.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: help/man/wvWare.1: Document all options (#200776, #334769).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/help/man/wvWare.1 wv-1.2.1/help/man/wvWare.1
+--- wv-1.2.1~/help/man/wvWare.1	2004-08-07 22:44:12.000000000 +0200
++++ wv-1.2.1/help/man/wvWare.1	2006-03-18 15:06:09.000000000 +0100
+@@ -41,10 +41,43 @@
+ If dir is used then any created graphics will be placed in this directory. The default is the directory
+ in which the word document resides.
+ .TP
++.I "\-b name, \-\-basename name"
++Use
++.I name
++as the base name for image files.
++.TP
++.I "\-a format, \-\-auto-eps format"
++Depending on whether images of type
++.I format
++can be automatically converted to encapsulated PostScript, print "yes" or "no"
++and exit.  Encapsulated PostScript is required for LaTeX, PostScript, and PDF
++output.  Currently possible values for
++.I format
++are "wmf", "png", and "jpg".
++.TP
++.I "\-s format, \-\-suppress format"
++Suppress automatic conversion of images of type
++.I format
++to encapsulated PostScript.  Currently possible values for
++.I format
++are "wmf", "emf", "png", "jpg", and "pict".
++.TP
++.I "\-1, \-\-nographics"
++Suppress output of embedded images.
++.TP
+ .I "\-x config.xml, \-\-config config.xml"
+ Use this to give the location of the config file. If not used, the config file is searched for
+ by first checking the current directory, and then by looking in the install location
+ (/usr/local/lib/wv/wvHtml.xml by default)
++.TP
++.I "\-X, \-\-xml"
++Produce XHTML-like XML output (as defined in /usr/local/lib/wv/wvXml.xml).
++.TP
++.I "\-v, \-\-version"
++Print wvWare's version number and exit.
++.TP
++.I "\-?, \-\-help"
++Print a help message and exit.
+ .SH MORE INFORMATION
+ http://wvware.sourceforge.net
+ .SH "SEE ALSO"
--- wv-1.2.4.orig/debian/patches/wvtext-no-graphics.dpatch
+++ wv-1.2.4/debian/patches/wvtext-no-graphics.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wvtext-no-graphics.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: wvText.in: Disable graphics output in wvText.xml conversion
+## DP: (already disabled in wvHtml conversion).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/wvText.in wv-1.2.1/wvText.in
+--- wv-1.2.1~/wvText.in	2003-11-03 18:03:14.000000000 +0100
++++ wv-1.2.1/wvText.in	2006-03-18 11:15:17.000000000 +0100
+@@ -78,5 +78,5 @@
+     # fall back onto our cruddy output
+     # this is, admittedly, better than running
+     # 'strings' on the word document though :)
+-    wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
++    wvWare -1 -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
+ fi
--- wv-1.2.4.orig/debian/patches/wvware-no-placeholder.dpatch
+++ wv-1.2.4/debian/patches/wvware-no-placeholder.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wvware-no-placeholder.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: wvWare.c (wvStrangeNoGraphicData): Remove dangling reference to
+## DP: placeholder.eps (#197979).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/wvWare.c wv-1.2.1/wvWare.c
+--- wv-1.2.1~/wvWare.c	2006-03-17 22:33:32.000000000 +0100
++++ wv-1.2.1/wvWare.c	2006-03-18 12:11:04.000000000 +0100
+@@ -666,8 +666,7 @@
+     if ((strstr (config, "wvLaTeX.xml") != NULL)
+ 	|| (strstr (config, "wvCleanLaTeX.xml") != NULL))
+ 	printf
+-	    ("\n\\resizebox*{\\baselineskip}{!}{\\includegraphics{placeholder.eps}}\
+- 		  \n-- %#.2x graphic: StrangeNoGraphicData --",
++	    ("\n-- %#.2x graphic: StrangeNoGraphicData --",
+ 	     graphicstype);
+     else
+ 	printf ("<img alt=\"%#.2x graphic\" src=\"%s\"%s><br%s>", graphicstype,
--- wv-1.2.4.orig/debian/patches/non-latin-latex.dpatch
+++ wv-1.2.4/debian/patches/non-latin-latex.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## non-latin-latex.dpatch by Peter Novodvorsky <nidd@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: text.c (wvConvertUnicodeToLaTeX): Disable debugging code which
+## DP: causes spurious output for non-Latin-1 files (#171193).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/text.c wv-1.2.1/text.c
+--- wv-1.2.1~/text.c	2006-03-17 22:36:46.000000000 +0100
++++ wv-1.2.1/text.c	2006-03-17 22:38:28.000000000 +0100
+@@ -1944,12 +1944,14 @@
+ 	  return (1);
+ 
+       }
++#ifdef DEBUG
+     /* Debugging aid: */
+     if (char16 >= 0x80)
+       {
+ 	printf ("[%x]", char16);
+ 	return (1);
+       }
++#endif
+     return (0);
+ }
+ 
--- wv-1.2.4.orig/debian/patches/wvdvi-output-ext.dpatch
+++ wv-1.2.4/debian/patches/wvdvi-output-ext.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wvdvi-output-ext.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: wvDVI: Avoid `are the same file' error when the output extension
+## DP: is `.dvi' (#309524).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/wvDVI.in wv-1.2.1/wvDVI.in
+--- wv-1.2.1~/wvDVI.in	2006-03-18 16:13:32.000000000 +0100
++++ wv-1.2.1/wvDVI.in	2006-03-18 16:16:15.000000000 +0100
+@@ -299,5 +299,4 @@
+ 	exit 1
+ fi
+ 
+-cp -f "$name".dvi "$o_file"
+-rm -f "$name".dvi
++[ "$name".dvi -ef "$o_file" ] || mv -f "$name".dvi "$o_file"
--- wv-1.2.4.orig/debian/patches/man-wvrtf-name.dpatch
+++ wv-1.2.4/debian/patches/man-wvrtf-name.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## man-wvrtf-name.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: help/man/wvRTF.1: Fix NAME section (#339398).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/help/man/wvRTF.1 wv-1.2.1/help/man/wvRTF.1
+--- wv-1.2.1~/help/man/wvRTF.1	2001-02-17 22:53:28.000000000 +0100
++++ wv-1.2.1/help/man/wvRTF.1	2006-03-18 11:47:46.000000000 +0100
+@@ -1,7 +1,7 @@
+ .PU
+ .TH wvRTF 1 
+ .SH NAME
+-wvHtml \- convert msword documents to RTF
++wvRTF \- convert msword documents to RTF
+ .SH SYNOPSIS
+ .ll +8
+ .B wvRTF in_word_doc
--- wv-1.2.4.orig/debian/patches/man-refs.dpatch
+++ wv-1.2.4/debian/patches/man-refs.dpatch
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## man-refs.dpatch by Matej Vela <vela@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ensure that all man pages have a consistent set of references
+## DP: (#294805, #309663).
+
+@DPATCH@
+diff -urNad wv-1.2.1~/help/man/wvAbw.1 wv-1.2.1/help/man/wvAbw.1
+--- wv-1.2.1~/help/man/wvAbw.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvAbw.1	2006-03-18 17:39:07.000000000 +0100
+@@ -22,6 +22,7 @@
+ .BR wvPS(1),
+ .BR wvDVI(1),
+ .BR wvPDF(1),
++.BR wvRTF(1),
+ .BR wvText(1),
+ .BR wvWml(1),
+ .BR wvMime(1),
+diff -urNad wv-1.2.1~/help/man/wvCleanLatex.1 wv-1.2.1/help/man/wvCleanLatex.1
+--- wv-1.2.1~/help/man/wvCleanLatex.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvCleanLatex.1	2006-03-18 17:39:07.000000000 +0100
+@@ -23,6 +23,7 @@
+ .BR wvText(1),
+ .BR wvWml(1),
+ .BR wvMime(1),
++.BR wvRTF(1),
+ .BR catdoc(1), 
+ .BR word2x(1)
+ .SH "AUTHOR"
+diff -urNad wv-1.2.1~/help/man/wvDVI.1 wv-1.2.1/help/man/wvDVI.1
+--- wv-1.2.1~/help/man/wvDVI.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvDVI.1	2006-03-18 17:39:07.000000000 +0100
+@@ -22,6 +22,7 @@
+ .BR wvCleanLatex(1),
+ .BR wvPDF(1),
+ .BR wvPS(1),
++.BR wvRTF(1),
+ .BR wvText(1),
+ .BR wvWml(1),
+ .BR wvMime(1),
+diff -urNad wv-1.2.1~/help/man/wvHtml.1 wv-1.2.1/help/man/wvHtml.1
+--- wv-1.2.1~/help/man/wvHtml.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvHtml.1	2006-03-18 17:39:07.000000000 +0100
+@@ -21,6 +21,7 @@
+ .BR wvPS(1),
+ .BR wvDVI(1),
+ .BR wvPDF(1),
++.BR wvRTF(1),
+ .BR wvText(1),
+ .BR wvWml(1),
+ .BR wvMime(1),
+diff -urNad wv-1.2.1~/help/man/wvSummary.1 wv-1.2.1/help/man/wvSummary.1
+--- wv-1.2.1~/help/man/wvSummary.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvSummary.1	2006-03-18 17:39:24.000000000 +0100
+@@ -19,6 +19,7 @@
+ .BR wvHtml(1),
+ .BR wvLatex(1),
+ .BR wvCleanLatex(1),
++.BR wvPS(1),
+ .BR wvPDF(1),
+ .BR wvDVI(1),
+ .BR wvMime(1),
+diff -urNad wv-1.2.1~/help/man/wvText.1 wv-1.2.1/help/man/wvText.1
+--- wv-1.2.1~/help/man/wvText.1	2006-03-18 17:32:57.000000000 +0100
++++ wv-1.2.1/help/man/wvText.1	2006-03-18 17:39:07.000000000 +0100
+@@ -23,6 +23,7 @@
+ .BR wvDVI(1),
+ .BR wvPDF(1),
+ .BR wvRTF(1),
++.BR wvWml(1),
+ .BR wvMime(1),
+ .BR catdoc(1), 
+ .BR word2x(1)
--- wv-1.2.4.orig/debian/patches/00list
+++ wv-1.2.4/debian/patches/00list
@@ -0,0 +1,9 @@
+detect-imagick.dpatch
+man-refs.dpatch
+man-wvrtf-name.dpatch
+man-wvware-options.dpatch
+non-latin-latex.dpatch
+wvdvi-output-ext.dpatch
+wvmime.dpatch
+wvtext-no-graphics.dpatch
+wvware-no-placeholder.dpatch
--- wv-1.2.4.orig/debian/changelog
+++ wv-1.2.4/debian/changelog
@@ -0,0 +1,361 @@
+wv (1.2.4-2) unstable; urgency=low
+
+  * Thanks to Matej Vela for all his work on the package.
+  * New maintainer is Daniel Walrond. Closes: #379466.
+  * New uploader is Stuart Teasdale.
+
+ -- Daniel Walrond <debian@djw.org.uk>  Sun, 12 Nov 2006 20:12:19 +0000
+
+wv (1.2.4-1) unstable; urgency=high
+
+  * QA upload.
+  * New upstream release.
+    - Version 1.2.3 fixes multiple integer overflows.  [CVE-2006-4513]
+      Closes: #396256.
+    - Version 1.2.4 fixes unfiltered input in wvHandleCommandField(), and
+      potential segfaults in wvBeginDocument() and wvEndDocument().
+      There's no CVE, and no mention of security implications, but this
+      still might be worth backporting to stable.
+    - SONAME changed to libwv-1.2-3, though there have been no changes to
+      the ABI.  Dumbass upstream.
+
+ -- Matej Vela <vela@debian.org>  Tue, 31 Oct 2006 08:00:15 +0100
+
+wv (1.2.2-1) unstable; urgency=low
+
+  * QA upload.
+  * New upstream release.
+
+ -- Matej Vela <vela@debian.org>  Tue, 12 Sep 2006 16:26:34 +0200
+
+wv (1.2.1-2) unstable; urgency=low
+
+  * Orphaning.
+  * Drop .la file.  Closes: #374746.
+  * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <vela@debian.org>  Sat, 22 Jul 2006 20:46:26 +0200
+
+wv (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #240087.
+  * Acknowledge NMU (thanks, Mikael!).  Closes: #200772.
+  * Split off libwv-1.2-1 and libwv-dev.  Closes: #93065.
+  * Update build dependencies:
+    - Replace libglib1.2-dev with libglib2.0-dev.
+    - Add libgsf-1-dev.
+    - Add libpng12-dev.
+    - Replace libexpat1-dev with libxml2-dev.
+  * Switch to debhelper 5.
+  * Switch to dpatch.
+  * Automatically update config.sub and config.guess from autotools-dev.
+  * wvDVI.in: Avoid `are the same file' error when the output extension is
+    `.dvi'.  Closes: #309524.
+  * wvMime: If available, use see(1) from mime-support.
+  * wvWare.c (wvStrangeNoGraphicData): Remove dangling reference to
+    placeholder.eps.  Closes: #197979.
+  * help/man/wvAbw.1, help/man/wvCleanLatex.1, help/man/wvDVI.1,
+    help/man/wvHtml.1, help/man/wvSummary.1, help/man/wvText.1:
+    Ensure that all man pages have a consistent set of references.
+  * help/man/wvRTF.1: Fix NAME section.  Closes: #339398.
+  * help/man/wvWare.1: Document all options.  Closes: #200776, #334769.
+  * debian/changelog: Remove `closes' keyword from 0.1.0-2 entry to avoid
+    Lintian warnings.
+  * debian/control: Suggest elinks and links as alternatives to lynx for
+    plain text output.
+  * debian/copyright: Update upstream URL.
+  * debian/rules:
+    - Update FSF address.
+    - Add support for DEB_BUILD_OPTIONS=noopt.
+  * debian/wv.mime:
+    - Remove `copiousoutput' flag from wvMime entry.  Closes: #220207.
+    - Use `priority=1' to rank behind OpenOffice.org (`priority=3') and
+      AbiWord (`priority=2').  Closes: #350134.
+    - Use the wvText script now that it accepts /dev/stdout for output.
+    - Remove `print' commands; neither OpenOffice.org nor AbiWord provide
+      them, and wvText makes a poor default.
+  * debian/watch: Add.
+  * Conforms to Standards version 3.6.2.
+
+ -- Matej Vela <vela@debian.org>  Sat, 18 Mar 2006 19:21:07 +0100
+
+wv (1.0.2-0.1) unstable; urgency=high
+
+  * NMU to fix security bug, it also applies to the sarge version.
+	
+  * New upstream release, with fix for security bugg with
+    CAN-2004-0645 (Closes: #264972)
+
+  * wvText.in has changed, so the diff doesn't apply any more.
+
+  * debian/rules L33: Checking for GNUmakefile instead for makefile
+	
+  * debian/rules L43: bin/make_epses.sh,bin/wv-*config and share/wv/ttf 
+    doesn't not exists any more
+
+  * debian/rules L44,L45: Some removed files. README still exists, but the 
+    other doesn't exists in 1.0.2.
+
+  * help/man/GNUmakefile.am: L1, adding share to manonedir 
+    (aclocal-1.8 and automake-1.8 need to be runned after that and give some 
+     warnings)
+
+ -- Mikael Sennerholm <mikan@debian.org>  Wed, 11 Aug 2004 11:44:10 +0200
+
+wv (0.7.4-1) unstable; urgency=low
+
+  * New upstream release:
+    - char is no longer assumed to be signed.  Closes: #176381.
+  * Acknowledge NMU.  Closes: #165262, #166500.
+  * text.c (wvConvertUnicodeToLaTeX): Disable debugging code which causes
+    spurious output for non-Latin-1 files.  Thanks to Peter Novodvorsky
+    for the patch.  Closes: #171193.
+  * wvDVI.in, wvPDF.in, wvPS.in: Fix ImageMagick check.  Closes: #160925.
+  * wvText.in: Use `--nographics', as suggested by Edmund GRIMLEY EVANS.
+  * Makefile.in, exporter/Makefile.in: Disable `-ansi -pedantic' in order
+    to get declarations for non-ANSI functions like fdopen.
+  * wvWare.c: Remove declaration of strdup; without `-ansi' strdup is a
+    macro and this expands to garbage.
+  * Add imagemagick to Suggests (wv{DVI,PDF,PS} like to use convert).
+  * Remove libwmf-bin from Suggests (conversion to EPS is built-in now).
+  * Explain in the description what the suggested packages are for.
+  * debian/mime: Specify `copiousoutput' rather than `needsterminal'.
+    Closes: #179624.
+  * debian/rules: Remove `debug' support and enable `-g' by default.
+  * Conforms to Standards version 3.5.8.
+
+ -- Matej Vela <vela@debian.org>  Thu, 20 Feb 2003 20:53:53 +0100
+
+wv (0.7.2-2.1) unstable; urgency=low
+
+  * Non-Maintainer Upload (BSP 2002-11).
+  * Changed Build-Depends on libwmf-dev from (>= 0.2.2-2) to (>= 0.2.7-1)
+    (closes: bug#166500, bug#165262).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 23 Nov 2002 14:11:05 +0100
+
+wv (0.7.2-2) unstable; urgency=low
+
+  * Link against libwmf0.2-6 to avoid #141203.
+
+ -- Matej Vela <vela@debian.org>  Mon, 26 Aug 2002 22:49:15 +0200
+
+wv (0.7.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Switch to debhelper 4.
+
+ -- Matej Vela <vela@debian.org>  Mon, 29 Apr 2002 22:42:13 +0200
+
+wv (0.7.1+rvt-2) unstable; urgency=low
+
+  * Link with expat instead of libxml2 to be consistent with libwmf.
+
+ -- Matej Vela <vela@debian.org>  Sat, 13 Apr 2002 19:36:25 +0200
+
+wv (0.7.1+rvt-1) unstable; urgency=low
+
+  * New upstream version.
+  * help/man/wvSimpleCLX.1: wvSimpleCLX is gone; removed.
+
+ -- Matej Vela <vela@debian.org>  Mon, 21 Jan 2002 17:03:41 +0100
+
+wv (0.7.0-3) unstable; urgency=medium
+
+  * fbse.c, wv.h, wvRTF.c, wvWare.c: Patched from AbiWord CVS to fix a
+    segmentation fault.  Closes: #126230.
+
+ -- Matej Vela <vela@debian.org>  Thu, 27 Dec 2001 15:49:02 +0100
+
+wv (0.7.0-2) unstable; urgency=medium
+
+  * wvMime: Use `wvPS --targetdir'.  Closes: #120417.
+  * Don't include make_epses.sh as the new wvPS converts images on its
+    own.
+
+ -- Matej Vela <vela@debian.org>  Fri, 23 Nov 2001 13:31:27 +0100
+
+wv (0.7.0-1) unstable; urgency=low
+
+  * New upstream version:
+    * wvCleanLatex, wvDVI, wvLatex no longer munge slashes in
+      filenames.  Closes: #112101.
+  * make_epses.sh: Handle documents with no embedded WMF.
+    Closes: #111838.
+  * make_epses.sh, wvMime, wvText: Handle whitespace in filenames.
+    Closes: #113958.
+  * Suggest tetex-extra for ulem.sty (used for underlining).
+    Closes: #118692.
+
+ -- Matej Vela <vela@debian.org>  Sun, 11 Nov 2001 11:42:02 +0100
+
+wv (0.6.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * make_epses.sh: Use wmf2eps (libwmf2) rather than wmftoeps, after
+    checking whether it's installed.  Closes: #110675.
+
+ -- Matej Vela <vela@debian.org>  Sun,  2 Sep 2001 17:16:21 +0200
+
+wv (0.6.5-1) unstable; urgency=medium
+
+  * New upstream version.  Closes: #93411.
+  * Updated config.guess and config.sub.  Closes: #105013.
+  * Added MIME support.  Closes: #82062.
+  * Switched to debhelper 3.
+  * Conforms to Standards version 3.5.6.
+
+ -- Matej Vela <vela@debian.org>  Wed,  1 Aug 2001 00:54:28 +0200
+
+wv (0.6.2-1) unstable; urgency=low
+
+  * New upstream version.  Closes: Bug#59942, Bug#61773, Bug#71139,
+    Bug#71683, Bug#72270, Bug#74855, Bug#75074, Bug#80428.
+  * magick/utility.c, wvMime, wvText.in: Fixed /tmp race conditions.
+  * Wrote (forgotten?) wvSimpleCLX.1.
+  * wvPDF: Use ps2pdf instead of distill.  Closes: Bug#77297.
+  * debian/control:
+    * Suggest gs (needed for wvPDF), postscript-viewer (needed for
+      wvMime), libwmf-bin (needed for make_epses.sh), lynx (needed for
+      wvText), tetex-bin (needed for wvDVI).
+    * Expanded description.
+  * Conforms to Standards version 3.2.1:
+    * debian/rules: Added support for the `debug' build option.
+
+  * These can't be fixed without very large diffs: (Should be sorted out
+    with upstream shortly.)
+    * libwv.a and headers excluded -- this should be a shared library.
+      It'll have to wait until libtool is fully integrated...
+    * Not built with libmagick5-dev due to problems with configure
+      detecting it (caused by <magick/config.h> redefining HasPNG)...
+
+ -- Matej Vela <vela@debian.org>  Sun,  7 Jan 2001 18:07:58 +0100
+
+wv (0.6.0-1) unstable; urgency=low
+
+  * New upstream vesrion
+  * New upstream source package name
+  * NMU (Closes: #72270, #59942)
+  * Updated Build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 03:30:00 -0700
+
+mswordview (0.5.14-bw6-2) unstable; urgency=low
+
+  * Conforms to Standards version 3.1.0:
+    * debian/control:
+      * Suggesting `lynx | www-browser' instead of `www-browser' as
+        recommended in section 8.6 of the Packaging Manual.
+      * Added build dependancies.
+
+ -- Matej Vela <vela@debian.org>  Sat,  6 Nov 1999 19:58:36 +0100
+
+mswordview (0.5.14-bw6-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Fixed insecure uses of temporary storage.  Closes: Bug#45450.
+  * Using realclean instead of distclean for cleaning to ensure that
+    lex.yy.c is removed.
+  * Renamed notes/summaryinfo/readme.orig to
+    notes/summaryinfo/readme.original in the pristine source tarball
+    so that it isn't removed by dh_clean.
+  * Conforms to Standards version 3.0.1:
+    * Changed debian/copyright to reference
+      `/usr/share/common-licenses/GPL'.
+
+ -- Matej Vela <vela@debian.org>  Wed, 22 Sep 1999 07:13:46 +0200
+
+mswordview (0.5.14-1) unstable; urgency=low
+
+  * New upstream version.
+  * Simplified debian/rules by making use of `make distclean'.
+
+ -- Matej Vela <vela@debian.org>  Fri, 28 May 1999 19:45:21 +0200
+
+mswordview (0.5.12-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Matej Vela <vela@debian.org>  Mon, 17 May 1999 02:02:57 +0200
+
+mswordview (0.5.11-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added `$(includedir)' to installdirs in Makefile.in to make
+    the installation of header files possible.
+  * Adapted paths in the new scripts wv-incconfig and wv-libconfig.
+  * Wrote manual pages for wv-incconfig and wv-libconfig.  Modified
+    Makefile.in to install them.
+
+ -- Matej Vela <vela@debian.org>  Thu, 13 May 1999 15:18:39 +0200
+
+mswordview (0.5.10-1) unstable; urgency=low
+
+  * New upstream version.
+  * Linked with the newly-packaged libwmf.  Closes: Bug#36058.
+  * Added `1999' to debian/copyright.
+
+ -- Matej Vela <vela@debian.org>  Sun,  9 May 1999 20:02:52 +0200
+
+mswordview (0.5.6-1) unstable; urgency=low
+
+  * New upstream version.
+  * New maintainer.
+  * Removed debian/conffiles which seems to have been accidentally
+    copied from sysklogd.
+  * Added the `tcs' copyright directly to debian/copyright.
+  * Simplified debian/rules and converted to debhelper.
+  * Fixed a typo in the description and reformatted it.
+  * Changed Priority to optional and Section to text (this is what
+    both catdoc and word2x use).
+  * Updated Standards-Version to 2.5.0.0.
+
+ -- Matej Vela <vela@debian.org>  Sun, 11 Apr 1999 15:50:20 +0200
+
+mswordview (0.5.1-2) unstable; urgency=low
+
+  * Corrected files, darn binary files were added/removed so diff and cvs
+    were confused.
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue,  9 Feb 1999 00:51:14 +0100
+
+mswordview (0.5.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Mon,  8 Feb 1999 22:49:17 +0100
+
+mswordview (0.4.4-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 24 Sep 1998 01:52:26 +0200
+
+mswordview (0.1.0-2) unstable; urgency=low
+
+  * Modified laola/Makefile.in in order not to screw the paths again.
+    (closes: Bug#26710)
+  * Adjusted the manpage.
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Tue, 22 Sep 1998 03:01:58 +0200
+
+mswordview (0.1.0-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Sun,  6 Sep 1998 23:06:42 +0000
+
+mswordview (0.0.25-1) unstable; urgency=low
+
+  * New upstream version, now with free UTF conversion routines
+  * Added /usr/lib/mswordview to perl path for laola programs, fixes
+    unreported bug
+  * Changed libdir to /usr/lib/mswordview
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Wed, 8 Jul 1998 01:23:28 +0200
+
+mswordview (0.0.24-1) unstable; urgency=low
+
+  * First version
+
+ -- Martin Schulze <joey@finlandia.infodrom.north.de>  Thu, 25 Jun 1998 20:57:49 +0200
--- wv-1.2.4.orig/debian/compat
+++ wv-1.2.4/debian/compat
@@ -0,0 +1 @@
+5
--- wv-1.2.4.orig/debian/libwv-dev.install
+++ wv-1.2.4/debian/libwv-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/pkgconfig
--- wv-1.2.4.orig/debian/wv.links
+++ wv-1.2.4/debian/wv.links
@@ -0,0 +1 @@
+usr/share/doc/libwv-1.2-3 usr/share/doc/wv
--- wv-1.2.4.orig/debian/copyright
+++ wv-1.2.4/debian/copyright
@@ -0,0 +1,33 @@
+Upstream sources of wv were obtained from <http://wvware.sourceforge.net/>.
+
+The original author is Caolan McNamara <Caolan.McNamara@ul.ie>.  It is
+currently maintained by Dom Lachowicz <cinamod@hotmail.com>.
+
+wv was packaged for Debian by Martin Schulze <joey@debian.org>, and
+subsequently maintained by Matej Vela <vela@debian.org>.
+
+wv is distributed under the GNU General Public License.
+
+  All files are released and authored according to the notices in
+  the source, except for the files utf.c, hdr.h, plan9.h which are
+  from the `tcs' package whose notice is listed here:
+
+  * The authors of this software are Rob Pike and Howard Trickey.
+  *              Copyright (c) 1992 by AT&T.
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose without fee is hereby granted, provided that this entire notice
+  * is included in all copies of any software which is or includes a copy
+  * or modification of this software and in all copies of the supporting
+  * documentation for such software.
+  * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+  * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
+  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+         - Rob Pike, AT&T Bell Laboratories
+
+The Debian packaging is copyright (C) 1994-1998 Martin Schulze,
+(C) 1999-2006 Matej Vela, and also released under the terms of the GNU
+General Public License; version 2, or any later version.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL.
--- wv-1.2.4.orig/debian/control
+++ wv-1.2.4/debian/control
@@ -0,0 +1,63 @@
+Source: wv
+Section: text
+Priority: optional
+Maintainer: Daniel Walrond <debian@djw.org.uk>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libglib2.0-dev, libgsf-1-dev (>= 1.13.0), zlib1g-dev, libpng12-dev, libxml2-dev, libwmf-dev (>= 0.2.7-1)
+
+Package: wv
+Architecture: any
+Conflicts: mswordview
+Replaces: mswordview
+Provides: mswordview
+Depends: ${shlibs:Depends}
+Suggests: tetex-extra, gs, elinks | links | lynx, imagemagick, gv | postscript-viewer
+Description: Programs for accessing Microsoft Word documents
+ wvWare (previously known as mswordview) is a library that allows access
+ to Microsoft Word files.  It can load and parse the Word 2000, Word 97,
+ Word 95, and Word 6 file formats.  (Work is underway to support reading
+ earlier formats as well: Word 2 documents are converted to plain text.)
+ .
+ This package provides the following programs:
+ .
+  * wvWare: Converts to HTML and LaTeX.  It's used by a small army of
+    helper scripts able to preview Word documents and convert them to
+    various other formats, like PostScript, PDF, DVI, etc.
+ .
+  * wvRTF: Converts to Microsoft's Rich Text Format.
+ .
+  * wvSummary: Displays the summary information stream of all OLE2 files,
+    i.e. Excel, PowerPoint, Visio, Access, etc.
+ .
+  * wvVersion: Outputs the version of the Word format a document is stored
+    in.
+ .
+ Note that conversion to DVI, PostScript, or PDF requires the tetex-extra
+ package; PDF conversion also requires Ghostscript.  Having ELinks, Links,
+ or Lynx will greatly improve the plain text output.  ImageMagick may help
+ with the quality of images.  If you wish to preview Word documents from
+ the comfort of your mail reader, install a PostScript viewer like gv.
+
+Package: libwv-1.2-3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Library for accessing Microsoft Word documents
+ wvWare (previously known as mswordview) is a library that allows access
+ to Microsoft Word files.  It can load and parse the Word 2000, Word 97,
+ Word 95, and Word 6 file formats.  (Work is underway to support reading
+ earlier formats as well: Word 2 documents are converted to plain text.)
+ .
+ This package contains the shared library.
+
+Package: libwv-dev
+Section: libdevel
+Architecture: any
+Depends: libwv-1.2-3 (= ${Source-Version}), libglib2.0-dev, libgsf-1-dev, zlib1g-dev, libpng12-dev, libxml2-dev, libwmf-dev
+Description: Development files for the wvWare library
+ wvWare (previously known as mswordview) is a library that allows access
+ to Microsoft Word files.  It can load and parse the Word 2000, Word 97,
+ Word 95, and Word 6 file formats.  (Work is underway to support reading
+ earlier formats as well: Word 2 documents are converted to plain text.)
+ .
+ This package contains the static library and header files.
--- wv-1.2.4.orig/debian/libwv-1.2-3.docs
+++ wv-1.2.4/debian/libwv-1.2-3.docs
@@ -0,0 +1 @@
+README
--- wv-1.2.4.orig/debian/wv.postinst
+++ wv-1.2.4/debian/wv.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# Replace /usr/share/doc/wv with a symlink to .../libwv-1.2-3.  See
+# Bug#264606 for reasons why dpkg won't do this on its own.  Due to
+# the order of unpacking, doing this in the preinst would lead to an
+# empty /usr/share/doc/libwv-1.2-3 directory.
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.2.1-1; then
+	rm -rf /usr/share/doc/wv
+	ln -sf libwv-1.2-3 /usr/share/doc/wv
+fi
+# (The above can be removed in etch+1.)
+
+#DEBHELPER#