Imported Upstream version 4.3.99+cvs20051122.dfsg.1

1 files changed, 333 insertions, 350 deletions

diff --git a/ChangeLog b/ChangeLog
index 270faa8..c1e23c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,334 @@
+2005-11-22	<rleigh@sourceforge.net>
+
+	Files:	doc/developer/Makefile.am (1.18) (+2 -2)
+		src/cups/Makefile.am (1.83) (+3 -3)
+		src/foomatic/Makefile.am (1.47) (+2 -2)
+
+	Replace the use of the deprecated $(mkinstalldirs) with $(mkdir_p).
+
+2005-11-21	<rleigh@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.20) (+6 -12)
+
+	Update build tools version requirements.
+
+2005-11-21	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.250) (+6 -4)
+		src/foomatic/foomatic-printermap (1.103) (+1 -0)
+		src/main/printers.xml (1.135) (+8 -1)
+
+	Add Epson DX4200.
+
+2005-11-21	<rleigh@sourceforge.net>
+
+	Files:	Makefile.am (1.144) (+1 -4)
+		configure.ac (1.131) (+4 -4)
+		doc/Makefile.am (1.42) (+1 -5)
+		doc/developer/Makefile.am (1.17) (+1 -5)
+		doc/developer/using.xml (1.3) (+1 -4)
+		include/Makefile.am (1.7) (+1 -5)
+		include/gutenprint/Makefile.am (1.2) (+1 -5)
+		include/gutenprintui/Makefile.am (1.3) (+1 -5)
+		include/gutenprintui2/Makefile.am (1.3) (+1 -5)
+		man/Makefile.am (1.22) (+1 -5)
+		samples/Makefile.am (1.6) (+1 -5)
+		scripts/Makefile.am (1.5) (+1 -5)
+		src/Makefile.am (1.19) (+1 -5)
+		src/cups/Makefile.am (1.82) (+1 -5)
+		src/escputil/Makefile.am (1.20) (+0 -4)
+		src/foomatic/Makefile.am (1.46) (+1 -5)
+		src/ghost/Makefile.am (1.38) (+1 -5)
+		src/gimp/Makefile.am (1.36) (+1 -5)
+		src/gimp2/Makefile.am (1.6) (+1 -5)
+		src/gutenprintui/Makefile.am (1.5) (+1 -5)
+		src/gutenprintui2/Makefile.am (1.6) (+1 -5)
+		src/main/Makefile.am (1.92) (+1 -5)
+		src/testpattern/Makefile.am (1.23) (+1 -5)
+		test/Makefile.am (1.44) (+1 -5)
+
+	Makefile.am: Removed AUTOMAKE_OPTIONS and MAINT_CHARSET from all
+	             Makefile.am files.  These were obsolete with current
+		     automake versions.
+	configure.ac: Added automake options to AM_INIT_AUTOMAKE.
+	              Bumped version to -rc2 to match the version in NEWS.
+
+2005-10-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.84) (+2 -2)
+
+	Further slight improvement for photo quality inkjet paper.
+
+2005-10-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.83) (+5 -5)
+
+	More tuning for R200 et al.
+
+2005-10-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.249) (+12 -2)
+		src/main/escp2-channels.c (1.58) (+3 -3)
+		src/main/escp2-papers.c (1.82) (+23 -23)
+		src/main/print-escp2-data.c (1.181) (+2 -2)
+
+	Retune the Epson Stylus Photo R200 and related printers.
+
+2005-10-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.248) (+12 -3)
+		src/foomatic/foomatic-printermap (1.102) (+3 -0)
+		src/main/printers.xml (1.134) (+13 -1)
+
+	Support Epson Stylus Photo R220, R320, and R340
+
+2005-10-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.247) (+9 -4)
+		src/foomatic/foomatic-printermap (1.101) (+2 -0)
+		src/main/printers.xml (1.133) (+9 -1)
+
+	Add support for Epson C68 and D68
+
+2005-10-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.246) (+34 -10)
+		src/gutenprintui2/plist.c (1.6) (+19 -15)
+		src/main/print-vars.c (1.74) (+58 -10)
+
+	Load the printrc file correctly in all locales.
+
+	Improve debug output.
+
+2005-10-23	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.245) (+2 -0)
+		src/foomatic/foomatic-printermap (1.100) (+1 -0)
+		src/main/escp2-channels.c (1.57) (+283 -20)
+		src/main/escp2-inks.c (1.42) (+28 -1)
+		src/main/escp2-papers.c (1.81) (+234 -1)
+		src/main/escp2-resolutions.c (1.29) (+11 -1)
+		src/main/print-dither-matrices.c (1.35) (+16 -8)
+		src/main/print-escp2-data.c (1.180) (+39 -2)
+		src/main/print-escp2.c (1.345) (+28 -17)
+		src/main/print-escp2.h (1.97) (+7 -2)
+		src/main/printers.xml (1.132) (+7 -3)
+		test/unprint.c (1.36) (+7 -2)
+
+	Add baseline support for Epson Stylus Photo R2400, with partial tuning.
+
+	Add transposed (720x1440 and 1440x2880) resolutions to Epson driver.
+	This may give better results in some cases.
+
+2005-10-21	<rlk@sourceforge.net>
+
+	Files:	COPYING (1.8) (+2 -2)
+
+	Update FSF address.
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	NEWS (1.244) (+1 -0)
+
+	DuplexTumble for iP4000
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.167) (+84 -6)
+
+	duplex support for the iP4000 (NoToumble not yet supported) patch by Andreas Kemnade <akemnade at tzi.de>
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	AUTHORS (1.21) (+3 -0)
+		NEWS (1.243) (+3 -0)
+
+	canon s200 support
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.99) (+1 -0)
+		src/main/print-canon.c (1.166) (+309 -21)
+		src/main/printers.xml (1.131) (+5 -1)
+
+	support for canon s200, patch by Karsten Festag <karsten.festag at gmx.de>
+
+2005-10-21	<m0m@sourceforge.net>
+
+	Files:	NEWS (1.242) (+6 -1)
+		src/foomatic/foomatic-printermap (1.98) (+4 -0)
+		src/main/print-olympus.c (1.57) (+113 -4)
+		src/main/printers.xml (1.130) (+3 -1)
+
+	- added code support for Sony UP-DR150
+	- added new Canon printers SELPHY CP-510, SELPHY CP-710
+	 (Canon CP-220 series)
+	- added Olympus P-11 (Olympus P-10 series)
+
+2005-10-18	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/color.h (1.2) (+7 -2)
+		include/gutenprint/curve-cache.h (1.2) (+2 -2)
+		include/gutenprint/image.h (1.2) (+4 -2)
+		src/cups/genppd.c (1.109) (+4 -4)
+		src/ghost/ijsgutenprint.c (1.11) (+3 -3)
+		src/main/curve-cache.c (1.6) (+2 -2)
+		src/main/path.c (1.18) (+2 -2)
+		src/main/print-escp2.h (1.96) (+3 -3)
+		src/main/print-olympus.c (1.56) (+3 -2)
+		src/main/print-pcl.c (1.140) (+2 -2)
+
+	Fix some miscellaneous warnings
+
+2005-10-10	<rlk@sourceforge.net>
+
+	Files:	src/main/print-ps.c (1.81) (+17 -4)
+
+	1304710 Postscript driver corrupts output if width not multiple of 4
+
+2005-10-06	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui2/panel.c (1.7) (+36 -30)
+		src/main/print-escp2.c (1.344) (+7 -3)
+
+	Print correctly if quadtone ink is selected in color mode (force
+	the mode to grayscale).
+
+2005-10-02	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.108) (+2 -4)
+
+	Remove comment about initialize_stp_options (4.2 holdover).
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.241) (+7 -24)
+
+	Correct the list of printers for which four color mode is incompatible
+	with glossy paper, and remove specific blurb about resolutions on C80.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.240) (+10 -3)
+
+	Note improvements to escputil.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.76) (+84 -49)
+		src/foomatic/foomatic-printermap (1.97) (+6 -0)
+		src/main/printers.xml (1.129) (+37 -1)
+
+	Improve escputil -i and escputil -e by recognizing the ink output
+	of more printers.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.239) (+14 -5)
+		src/foomatic/foomatic-printermap (1.96) (+4 -0)
+		src/main/printers.xml (1.128) (+23 -1)
+
+	Preliminary support for Epson Stylus CX-3700, CX-4700, CX-7700,
+	DX-3850, and DX-4800.
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	AUTHORS (1.20) (+3 -0)
+		NEWS (1.238) (+2 -0)
+
+	cd printing for pixma printer
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.165) (+127 -17)
+
+	CD label support for Canon PIXMA iP4000, patch by Andreas Kemnade <akemnade at tzi.de>
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.164) (+24 -7)
+
+	attempt to fix offset handling for the 5 pixel in 1 byte compression, don't discard the last pixels when shiffting the buffer
+
+2005-09-18	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.237) (+7 -3)
+		src/foomatic/foomatic-printermap (1.95) (+3 -1)
+		src/main/printers.xml (1.127) (+15 -5)
+
+	Support a few more UK models
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.236) (+27 -2)
+		src/foomatic/foomatic-printermap (1.94) (+8 -0)
+		src/main/print-escp2-data.c (1.179) (+18 -1)
+		src/main/printers.xml (1.126) (+45 -1)
+
+	  5) Preliminary support for the Epson Stylus C87, C88, CX3800,
+	     CX3810, CX4200, CX4800, CX5800, CX7800, and DX3800.  These
+	     printers are expected to be fully functional (for the
+	     multi-function devices, this package supports only the printer
+	     function).
+
+	  7) Experimental support for the Epson Stylus Photo RX700.  This
+	     printer may or may not function correctly, and is not likely to
+	     be properly tuned.
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.235) (+18 -142)
+		src/gutenprintui/gutenprintui-internal.h (1.2) (+2 -1)
+		src/gutenprintui/panel.c (1.5) (+176 -43)
+		src/gutenprintui2/gutenprintui-internal.h (1.3) (+2 -1)
+		src/gutenprintui2/panel.c (1.6) (+177 -43)
+		src/main/color-conversion.h (1.11) (+2 -1)
+		src/main/print-color.c (1.132) (+100 -45)
+		src/main/print-ps.c (1.80) (+3 -1)
+		src/main/print-raw.c (1.37) (+2 -1)
+
+	  1) The Postscript driver now produces more accurate colors.
+	     Previous releases produced overly pale colors with the default
+	     settings.
+
+	  2) The Postscript driver now accepts red, green, and blue rather
+	     than cyan, magenta, and yellow options.
+
+	  3) The GIMP plugin now offers improved choices in the color
+	     adjustment window for viewing individual channels of the output.
+	     It now offers red/green/blue, cyan/magenta/yellow, or
+	     cyan/magenta/yellow/black as appropriate.
+
+	  4) The GIMP plugin is now significantly more responsive.
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.234) (+2 -0)
+		src/foomatic/foomatic-printermap (1.93) (+2 -0)
+		src/main/printers.xml (1.125) (+9 -1)
+
+	Add Epson CX3800
+
+2005-09-02	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.30) (+147 -142)
+		po/da.po (1.59) (+733 -639)
+		po/de.po (1.44) (+147 -142)
+		po/el.po (1.45) (+147 -142)
+		po/en_GB.po (1.136) (+147 -142)
+		po/es.po (1.43) (+147 -142)
+		po/fr.po (1.65) (+147 -142)
+		po/ja.po (1.39) (+147 -142)
+		po/nb.po (1.6) (+147 -142)
+		po/nl.po (1.45) (+147 -142)
+		po/pl.po (1.49) (+147 -142)
+		po/pt.po (1.43) (+147 -142)
+		po/sk.po (1.48) (+147 -142)
+		po/sv.po (1.75) (+148 -143)
+		po/zh_TW.po (1.3) (+147 -142)
+
+	Gutenprint 5.0.0-rc1 release
+
 2005-08-27	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.233) (+5 -5)
@@ -609,14 +940,6 @@
 
 2005-05-17	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/history.sgml (1.4) (+7 -7)
-		doc/users_guide/users-guide.sgml (1.9) (+2 -2)
-
-	Fix project name in the project history chapter.
-	Fix the manual title.
-
-2005-05-17	<rleigh@sourceforge.net>
-
 	Files:	configure.ac (1.124) (+3 -3)
 		po/nb.po (1.2) (+5746 -0)
 
@@ -1456,7 +1779,6 @@
 
 	Files:	.cvsignore (1.24) (+1 -0)
 		doc/developer/Makefile.am (1.16) (+3 -3)
-		doc/users_guide/Makefile.am (1.42) (+9 -9)
 		scripts/.cvsignore (1.4) (+2 -0)
 		scripts/autogen.sh (1.33) (+1 -1)
 
@@ -1722,16 +2044,6 @@
 		doc/developer/using.xml (1.2) (+34 -34)
 		doc/developer/weave.xml (1.2) (+1 -1)
 		doc/gutenprint.dox.in (1.1) ( )
-		doc/users_guide/README (1.7) (+1 -1)
-		doc/users_guide/cups-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/cups.sgml (1.4) (+15 -15)
-		doc/users_guide/gimp-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/gimp.sgml (1.3) (+5 -5)
-		doc/users_guide/history.sgml (1.3) (+10 -10)
-		doc/users_guide/title.sgml (1.3) (+8 -8)
-		doc/users_guide/users-guide.sgml (1.8) (+2 -2)
-		doc/users_guide/util-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/utils.sgml (1.6) (+3 -3)
 		include/Makefile.am (1.6) (+3 -3)
 		include/gutenprint/.cvsignore (1.1) ( )
 		include/gutenprint/Makefile.am (1.1) ( )
@@ -2859,12 +3171,6 @@
 
 2004-05-22	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.41) (+13 -13)
-
-	Fix VPATH build.
-
-2004-05-22	<rleigh@sourceforge.net>
-
 	Files:	m4/gimp.m4 (1.5) (+41 -41)
 		m4/stp_gimp.m4 (1.7) (+5 -4)
 
@@ -3568,7 +3874,6 @@
 	Files:	Makefile.am (1.139) (+1 -1)
 		configure.ac (1.97) (+9 -20)
 		doc/developer/Makefile.am (1.13) (+1 -1)
-		doc/users_guide/Makefile.am (1.40) (+1 -1)
 		m4/stp_option.m4 (1.4) (+42 -0)
 		scripts/autogen.sh (1.30) (+1 -0)
 		src/cups/cups-genppdconfig.in (1.8) (+1 -1)
@@ -3858,14 +4163,6 @@
 
 2004-02-27	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.39) (+28 -22)
-
-	Don't distribute the Postscript user's guide and .eps files (saves
-	about 500K in the bz2ball).  Also don't distribute two copies of the
-	.pnd files (saves another 200K or so).
-
-2004-02-27	<rlk@sourceforge.net>
-
 	Files:	Makefile.am (1.137) (+12 -3)
 
 	Don't rebuild the change log if it isn't needed
@@ -4034,12 +4331,6 @@
 	Rename stpi_dither_matrix_iterated_init() argument name "exp" to "exponent"
 	to quell compiler warnings.
 
-2004-01-21	<rleigh@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.38) (+12 -12)
-
-	Fix install error when using the provided install-sh.
-
 2004-01-11	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.17) (+17 -17)
@@ -4333,7 +4624,6 @@
 2003-12-02	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.142) (+1 -1)
-		doc/users_guide/gimp.sgml (1.2) (+0 -12)
 		po/cs.po (1.15) (+87 -272)
 		po/da.po (1.43) (+86 -80)
 		po/de.po (1.29) (+87 -265)
@@ -4418,8 +4708,6 @@
 
 	Files:	Makefile.am (1.136) (+2 -2)
 		README (1.131) (+1 -1)
-		doc/users_guide/cups.sgml (1.3) (+2 -2)
-		doc/users_guide/history.sgml (1.2) (+1 -1)
 		m4/stp.m4 (1.5) (+3 -3)
 		m4/stp_cups.m4 (1.8) (+1 -1)
 		m4/stp_gimp.m4 (1.4) (+1 -1)
@@ -9938,7 +10226,6 @@
 2003-01-06	<rleigh@sourceforge.net>
 
 	Files:	doc/developer/Makefile.am (1.8) (+3 -2)
-		doc/users_guide/Makefile.am (1.37) (+4 -2)
 
 	EPSLEVEL may be used to specify the EPS level to use
 
@@ -10131,7 +10418,6 @@
 		configure.ac (1.38) (+52 -41)
 		doc/Makefile.am (1.32) (+2 -0)
 		doc/developer/Makefile.am (1.7) (+3 -1)
-		doc/users_guide/Makefile.am (1.36) (+3 -1)
 		include/Makefile.am (1.3) (+3 -1)
 		m4/stp.m4 (1.4) (+0 -21)
 		m4/stp_cups.m4 (1.6) (+0 -1)
@@ -12243,13 +12529,6 @@
 
 2002-06-30	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.35) (+14 -9)
-
-	Distribute the cups-edition.sgml, gimp-edition.sgml, and
-	util-edition.sgml files.
-
-2002-06-30	<rlk@sourceforge.net>
-
 	Files:	src/main/print-escp2-data.c (1.35) (+43 -337)
 
 	Improve readability
@@ -12777,28 +13056,6 @@
 
 	Use AC_LIBOBJ instead of the deprecated direct LIBOJBS usage
 
-2002-04-08	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.5) (+1 -1)
-
-
-
-	Changed kernel config option from CONFIG_PRINTER_READBACK to CONFIG_PARPORT_1284.
-
-2002-04-08	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.34) (+256 -9)
-		doc/users_guide/cups-edition.sgml (1.1) ( )
-		doc/users_guide/cups.sgml (1.2) (+6 -2)
-		doc/users_guide/gimp-edition.sgml (1.1) ( )
-		doc/users_guide/title.sgml (1.2) (+0 -16)
-		doc/users_guide/users-guide.sgml (1.7) (+18 -0)
-		doc/users_guide/util-edition.sgml (1.1) ( )
-
-
-
-	Created new top level files for separate editions of the User's Guide.
-
 2002-04-08	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.52) (+2 -2)
@@ -12820,47 +13077,6 @@
 
 	Added descriptions for -o, -s, -l, -M options.  Updated description for -u option.
 
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.3) (+9 -5)
-		doc/users_guide/utils.sgml (1.4) (+6 -12)
-
-	*** empty log message ***
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.2) (+57 -51)
-
-
-
-	Reformatting of the escputil examples.  I thought they looked ugly on the
-	right margin when printed.
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.33) (+6 -6)
-		doc/users_guide/cups.sgml (1.1) ( )
-		doc/users_guide/gimp.sgml (1.1) ( )
-		doc/users_guide/history.sgml (1.1) ( )
-		doc/users_guide/title.sgml (1.1) ( )
-		doc/users_guide/users-guide.sgml (1.6) (+10 -10)
-		doc/users_guide/utils.sgml (1.1) ( )
-
-
-
-	Renamed files to make it easier to deal with multiple versions
-	of the manual.  Fixed (I think) the make dist problem in Makefile.am.
-	Updated users-guide.sgml to use new file names for chapter files.
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.32) (+2 -2)
-
-
-
-	Updates include minor textual fixes to ch_0 and ch_4.  Makefile.am repaired to
-	allow make dist to include more than users-guide.sgml.
-
 2002-04-06	<rleigh@sourceforge.net>
 
 	Files:	src/foomatic/Makefile.am (1.23) (+11 -13)
@@ -12887,18 +13103,6 @@
 
 	Let Foomatic data for GhostScript and IJS drivers go into separate directories (to simplify Debian packaging).
 
-2002-04-06	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.31) (+21 -6)
-		doc/users_guide/gfdl.sgml (1.1) ( )
-		doc/users_guide/users-guide.sgml (1.5) (+15 -1869)
-
-
-
-	Added chapter 4, the description of the escputil utility.  Chapters now
-	have their own separate files and the entire document is pulled together
-	via the users-guide.sgml file.  This necessitated a few Makefile changes.
-
 2002-04-06	<rlk@sourceforge.net>
 
 	Files:	m4/.cvsignore (1.1) ( )
@@ -13084,7 +13288,6 @@
 	Files:	Makefile.am (1.127) (+9 -20)
 		doc/Makefile.am (1.31) (+6 -6)
 		doc/developer/Makefile.am (1.6) (+6 -5)
-		doc/users_guide/Makefile.am (1.30) (+4 -2)
 		man/Makefile.am (1.7) (+16 -2)
 		samples/Makefile.am (1.4) (+6 -6)
 		src/Makefile.am (1.12) (+2 -3)
@@ -13412,12 +13615,6 @@
 
 2002-01-26	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.29) (+3 -3)
-
-	Fix manual.sgml dependencies to use $(srcdir) to create correct symlinks
-
-2002-01-26	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.124) (+1 -5)
 		doc/Makefile.am (1.30) (+2 -2)
 		doc/README.maintaining (1.10) (+1 -1)
@@ -13734,14 +13931,6 @@
 
 	Set release date.
 
-2001-11-23	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/figures/cups_admin_model.png (1.2) (+49 -62)
-		doc/users_guide/figures/cups_my_printer.png (1.2) (+33 -68)
-		doc/users_guide/users-guide.sgml (1.4) (+96 -91)
-
-	Updates for rev 4.2.0 release
-
 2001-11-23	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.120) (+3 -1)
@@ -13757,12 +13946,6 @@
 
 2001-11-22	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/users-guide.sgml (1.3) (+46 -9)
-
-	Insert warning for connecting USB printers with CUPS.
-
-2001-11-22	<rlk@sourceforge.net>
-
 	Files:	NEWS (1.66) (+2 -5)
 		src/foomatic/foomatic-printermap (1.23) (+0 -3)
 		src/main/printers.xml (1.42) (+1 -31)
@@ -13904,12 +14087,6 @@
 
 2001-11-10	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/users-guide.sgml (1.2) (+1 -1)
-
-	Update release date
-
-2001-11-10	<rlk@sourceforge.net>
-
 	Files:	src/escputil/Makefile.am (1.10) (+2 -2)
 		src/foomatic/Makefile.am (1.15) (+2 -2)
 		test/Makefile.am (1.30) (+2 -2)
@@ -13954,7 +14131,6 @@
 2001-11-08	<rlk@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.27) (+10 -10)
-		doc/users_guide/Makefile.am (1.28) (+11 -11)
 
 	Clean up rm use (many places need either -rm file or rm -f file):
 
@@ -14148,20 +14324,6 @@
 
 2001-10-30	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.27) (+2 -2)
-
-	Minor typo, to fix VPATH build
-
-2001-10-30	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/.cvsignore (1.4) (+8 -8)
-		doc/users_guide/Makefile.am (1.26) (+6 -6)
-		doc/users_guide/users-guide.sgml (1.1) ( )
-
-	Removed underscores from linkend, ids, and filename per Eric
-
-2001-10-30	<rlk@sourceforge.net>
-
 	Files:	src/main/printers.xml (1.37) (+7 -7)
 
 	Tweak C70/80 a bit more
@@ -14197,7 +14359,6 @@
 2001-10-28	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.26) (+36 -12)
-		doc/users_guide/Makefile.am (1.25) (+50 -15)
 
 	Fix VPATH build.  Don't build gimpprint.pdf by default.
 
@@ -14246,8 +14407,6 @@
 		doc/FAQ.html (1.7) (+3 -3)
 		doc/Makefile.am (1.24) (+2 -2)
 		doc/README.maintaining (1.8) (+16 -16)
-		doc/users_guide/README (1.6) (+9 -10)
-		doc/users_guide/figures/README (1.3) (+1 -1)
 		scripts/autogen.sh (1.14) (+2 -2)
 		src/cups/command.txt (1.2) (+1 -1)
 		src/cups/genppd.c (1.31) (+5 -5)
@@ -14421,12 +14580,6 @@
 
 2001-10-19	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.24) (+4 -3)
-
-	Remove incorrect html-stamp usage
-
-2001-10-19	<rleigh@sourceforge.net>
-
 	Files:	test/Makefile.am (1.29) (+2 -2)
 
 	Disable run-weavetest dependency which breaks make dist
@@ -14537,7 +14690,6 @@
 2001-10-16	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.20) (+31 -30)
-		doc/users_guide/Makefile.am (1.23) (+26 -13)
 
 	Make clean works fully in maintainer mode
 	VPATH builds create symlinks to docs correctly
@@ -14664,13 +14816,6 @@
 
 	Translate papersize (text) names before returning them to the user.
 
-2001-10-13	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.22) (+7 -7)
-		doc/users_guide/README (1.5) (+3 -8)
-
-	Fixed spacing...updated README
-
 2001-10-13	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.116) (+10 -10)
@@ -14681,32 +14826,9 @@
 	Use more portable $(RM) instead of 'rm -f'
 	Add reference to SGML users guide to Texinfo manual
 
-2001-10-13	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.21) (+21 -19)
-
-	Clean should not remove the pdf or ps version of the manual, to be
-	consistent with how it treats the html manual.  It also can't remove
-	the .eps files, unfortunately.
-
-	New veryclean target does remove all of the above.
-
-	Distribute the html timestamp to inhibit rebuilding in the field.
-
-	Add phony targets.
-
-	Remove unused ps.gz target.
-
-2001-10-13	<rleigh@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.20) (+14 -8)
-
-	Add DESTDIR support to install-data-local and uninstall-local
-
 2001-10-12	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/.cvsignore (1.3) (+1 -0)
-		src/ghost/.cvsignore (1.6) (+1 -0)
+	Files:	src/ghost/.cvsignore (1.6) (+1 -0)
 
 	Updates
 
@@ -14731,25 +14853,6 @@
 	sizes exceeds 94 in the DesignJet 750 PPD file CUPS loses
 	track of all printers in the administrative interface.
 
-2001-10-11	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/.cvsignore (1.2) (+1 -0)
-
-	Ignore html directory
-
-2001-10-11	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.19) (+11 -31)
-
-	Eliminate dependency on specific Linux (much less UNIX) distribution.
-	Preprocess source rather than intermediate file.
-
-2001-10-11	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.18) (+21 -16)
-
-	PDF users guide builds independently of PS docs.  Also, XREF and IMAGEDATA errors are gone.
-
 2001-10-10	<rlk@sourceforge.net>
 
 	Files:	src/gimp/Makefile.am (1.18) (+4 -5)
@@ -14786,24 +14889,12 @@
 
 2001-10-07	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.17) (+2 -2)
-
-	Need to remove the doc directory on uninstall.
-
-2001-10-07	<rlk@sourceforge.net>
-
 	Files:	README (1.74) (+6 -6)
 
 	A few very minor updates.
 
 2001-10-07	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.16) (+12 -6)
-
-	Assorted minor cleanup and bug fixing.
-
-2001-10-07	<rlk@sourceforge.net>
-
 	Files:	po/.cvsignore (1.5) (+1 -0)
 
 	Ignore change log
@@ -14835,34 +14926,12 @@
 
 2001-10-06	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.15) (+1 -7)
-
-	Removed creation of figures directory in users_guide pdf and eps targets
-
-2001-10-06	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.14) (+6 -21)
-		doc/users_guide/README (1.4) (+2 -2)
-		scripts/autogen.sh (1.9) (+27 -11)
+	Files:	scripts/autogen.sh (1.9) (+27 -11)
 
 	Tweaked doc/users_guide/Makefile.am and added checks for convert and docbook_4 to scripts/autogen.sh
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/.cvsignore (1.1) ( )
-		doc/users_guide/Makefile.am (1.13) (+6 -1)
-		doc/users_guide/figures/.cvsignore (1.1) ( )
-
-	Updates
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.12) (+31 -24)
-
-	Add -without-user-guide.
-
-2001-10-06	<rlk@sourceforge.net>
-
 	Files:	README (1.73) (+49 -39)
 
 	Cleanup
@@ -14893,33 +14962,6 @@
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.11) (+3 -3)
-
-	We do need to distribute the .ps file.  Sigh.
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.10) (+36 -23)
-
-	* List all of the figures explicitly rather than wildcarding
-
-	* Build and distribute HTML and PDF by default
-
-	* Don't export SGML_CATALOG_FILES (especially not incorrect hardcoded
-	  path)
-
-	* Create make install
-
-	* Fix directory permissions botched by the toolchain
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.9) (+2 -2)
-
-	maintainer-clean should clear the html stamp
-
-2001-10-06	<rlk@sourceforge.net>
-
 	Files:	src/foomatic/foomatic-printermap (1.16) (+3 -0)
 
 	Add BJC-210, 240, and 250.
@@ -14932,15 +14974,8 @@
 
 2001-10-05	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.8) (+8 -2)
-
-	Distribute the PDF manual
-
-2001-10-05	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.114) (+9 -1)
 		doc/Makefile.am (1.18) (+25 -4)
-		doc/users_guide/Makefile.am (1.7) (+87 -44)
 
 	Add new make targets: pdf and docs
 	Distribute user_guide html manual by default
@@ -14955,27 +14990,6 @@
 	Allow softweave printing on first generation printers that should
 	support it.
 
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.6) (+2 -3)
-
-	Removing Makefile as it is now built by automake
-
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.5) (+3 -3)
-		doc/users_guide/README (1.3) (+8 -0)
-
-	*** empty log message ***
-
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.4) (+13 -28)
-		doc/users_guide/README (1.2) (+12 -14)
-		doc/users_guide/figures/README (1.2) (+5 -7)
-
-	Updates to Makefile.am, READMEs, and rename orig source file to remove rev
-
 2001-10-03	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.13) (+1 -1)
@@ -14986,14 +15000,12 @@
 
 	Files:	Makefile.am (1.113) (+6 -6)
 		doc/Makefile.am (1.17) (+4 -4)
-		doc/users_guide/Makefile.am (1.3) (+4 -4)
 
 	Correct program naming, use variables for perl invocation
 
 2001-10-03	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.16) (+3 -1)
-		doc/users_guide/Makefile.am (1.2) (+54 -13)
 
 	Add users_guide to doc/Makefile.am SUBDIRS
 	Automatically generate EPS and PDF images from PNG source
@@ -15008,39 +15020,10 @@
 
 2001-10-02	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.1) ( )
-
-	Add preliminary support for the new SGML user guide
-
-2001-10-02	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.112) (+10 -1)
 
 	Use standard Makefile formatting
 
-2001-10-02	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/README (1.1) ( )
-		doc/users_guide/figures/README (1.1) ( )
-		doc/users_guide/figures/cups_admin.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_device.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_make.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_model.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_success.png (1.1) ( )
-		doc/users_guide/figures/cups_config_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_my_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_printers.png (1.1) ( )
-		doc/users_guide/figures/cups_startup.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui-1.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-new-printer.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-print-color-adjust.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-setup.png (1.1) ( )
-		doc/users_guide/figures/gimp_image.png (1.1) ( )
-		doc/users_guide/figures/gimp_startup.png (1.1) ( )
-
-	Initial checkin of user's guide
-
 2001-10-02	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.31) (+2 -1)