Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.2b1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,26 +1,7 @@
-CHANGES.txt - 2006-03-10
+CHANGES.txt - 02/25/2006
 ------------------------

-CHANGES IN CUPS V1.2b2
-
-	- Updated the CUPS design description.
-	- Added --enable-32bit and --enable-64bit configure
-	  options to allow building of separate 32/64-bit
-	  libraries on systems that support both environments
-	  (STR #1472)
-	- Various compiler warning fixes.
-	- Fixes for Solaris 10 builds against old GNU TLS and
-	  LDAP libraries.
-	- Added a cupsArrayUserData() function to retrieve the
-	  user data pointer for an array (useful for typing
-	  arrays)
-	- The ppdEmitString() function did not compute the
-	  required buffer size properly, leading to dropped
-	  characters on the end of the printer commands in pstops
-	  and imagetops (STR #1470)
-
-
-CHANGES IN CUPS V1.2b1
+CHANGES IN CUPS V1.2.0b1

 	- The serial backend now supports Equinox 8-port serial
 	  hubs (STR #526)
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.2b2 - 2006-03-09
+INSTALL - CUPS v1.2b1 - 2006-03-03
 ----------------------------------

 This file describes how to compile and install CUPS from source
@@ -126,24 +126,6 @@ SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
 LAUNCHDLIBS	=	@LAUNCHDLIBS@

-#
-# Separate 32/64-bit library support...
-#
-
-C32FLAGS	=	@C32FLAGS@
-INSTALL32	=	@INSTALL32@
-LIB32CUPS	=	@LIB32CUPS@
-LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
-LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
-UNINSTALL32	=	@UNINSTALL32@
-
-C64FLAGS	=	@C64FLAGS@
-INSTALL64	=	@INSTALL64@
-LIB64CUPS	=	@LIB64CUPS@
-LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@
-LIB64DIR	=	$(BUILDROOT)@LIB64DIR@
-UNINSTALL64	=	@UNINSTALL64@
-
 #
 # Directories...
 #
@@ -212,20 +194,12 @@ DBUSDIR		=	@DBUSDIR@
 #

 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz

 .c.o:
 	echo Compiling $<...
 	$(CC) $(OPTIM) $(CFLAGS) -c $<

-.c.32.o:
-	echo Compiling 32-bit $<...
-	$(CC) $(C32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
-
-.c.64.o:
-	echo Compiling 64-bit $<...
-	$(CC) $(C64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
-
 .cxx.o:
 	echo Compiling $<...
 	$(CXX) $(OPTIM) $(CXXFLAGS) -c $<
@@ -1,4 +1,4 @@
-README - CUPS v1.2b2 - 2006-03-09
+README - CUPS v1.2b1 - 2006-03-03
 ---------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
@@ -1263,8 +1263,7 @@ compress_files(int  num_files,		/* I - Number of files */
      fprintf(stderr,
              "DEBUG: File %d compressed to %.1f%% of original size, "
 	      CUPS_LLFMT " bytes...\n",
-              i + 1, 100.0 * outinfo.st_size / total,
-	      CUPS_LLCAST outinfo.st_size);
+              i + 1, 100.0 * outinfo.st_size / total, outinfo.st_size);
  }
 }
 #endif /* HAVE_LIBZ */
@@ -374,6 +374,7 @@ list_devices(void)
 	device_id[1024],	/* Device ID string */
 	device_uri[1024],	/* Device URI string */
 	make_model[1024];	/* Make and model */
+  struct ecpp_device_id did;	/* Device ID buffer */


 /*
@@ -544,6 +545,7 @@ open_device(const char *uri)		/* I - Device URI */
 		device_id[1024],	/* Device ID string */
 		make_model[1024],	/* Make and model */
 		device_uri[1024];	/* Device URI string */
+    struct ecpp_device_id did;		/* Device ID buffer */


   /*
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $"
+dnl "$Id: cups-compiler.m4 4953 2006-01-19 20:30:48Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -34,40 +34,6 @@ AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
 		OPTIM="-g"
 	fi])

-dnl Setup support for separate 32/64-bit library generation...
-AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
-
-C32FLAGS=""
-INSTALL32=""
-LIB32CUPS=""
-LIB32CUPSIMAGE=""
-LIB32DIR=""
-UNINSTALL32=""
-
-AC_SUBST(C32FLAGS)
-AC_SUBST(INSTALL32)
-AC_SUBST(LIB32CUPS)
-AC_SUBST(LIB32CUPSIMAGE)
-AC_SUBST(LIB32DIR)
-AC_SUBST(UNINSTALL32)
-
-AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
-
-C64FLAGS=""
-INSTALL64=""
-LIB64CUPS=""
-LIB64CUPSIMAGE=""
-LIB64DIR=""
-UNINSTALL64=""
-
-AC_SUBST(C64FLAGS)
-AC_SUBST(INSTALL64)
-AC_SUBST(LIB64CUPS)
-AC_SUBST(LIB64CUPSIMAGE)
-AC_SUBST(LIB64DIR)
-AC_SUBST(UNINSTALL64)
-
-dnl Position-Independent Executable support on Linux and *BSD...
 AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fpie option, default=no])

 dnl Update compiler options...
@@ -113,72 +79,6 @@ if test -n "$GCC"; then
 		# Additional warning options for alpha testing...
 		OPTIM="-Wshadow -Wunused $OPTIM"
 	fi
-
-	case "$uname" in
-		IRIX)
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on an IRIX system, build 32-bit
-				# libraries...
-				C32FLAGS="-n32 -mips3"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$prefix/lib32"
-				UNINSTALL32="uninstall32bit"
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Compiling on an IRIX system, build 64-bit
-				# libraries...
-				C64FLAGS="-64 -mips4"
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$prefix/lib64"
-				UNINSTALL64="uninstall64bit"
-			fi
-			;;
-
-		Linux*)
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on an 64-bit x86 system, build 32-bit
-				# libraries...
-				C32FLAGS="-m32"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib"
-				if test -d /usr/lib32; then
-					LIB32DIR="${LIB32DIR}32"
-				fi
-				UNINSTALL32="uninstall32bit"
-			fi
-			;;
-
-		SunOS*)
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on a Solaris system, build 32-bit
-				# libraries...
-				C32FLAGS="-m32"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib/32"
-				UNINSTALL32="uninstall32bit"
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Compiling on a Solaris system, build 64-bit
-				# libraries...
-				C64FLAGS="-m64"
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib/64"
-				UNINSTALL64="uninstall64bit"
-			fi
-			;;
-	esac
 else
 	case $uname in
 		AIX*)
@@ -218,30 +118,21 @@ else
 				fi
 			fi

+			if test $uversion -ge 62 -a "x$with_optim" = x; then
+				OPTIM="$OPTIM -n32 -mips3"
+			fi
+
 			if test "x$with_optim" = x; then
-				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
-			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on an IRIX system, build 32-bit
-				# libraries...
-				C32FLAGS="-n32 -mips3"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib32"
-				UNINSTALL32="uninstall32bit"
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Compiling on an IRIX system, build 64-bit
-				# libraries...
-				C64FLAGS="-64 -mips4"
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib64"
-				UNINSTALL64="uninstall64bit"
+				# Show most warnings, but suppress the
+				# ones about arguments not being used,
+				# string constants assigned to const
+				# char *'s, etc.  We only set the warning
+				# options on IRIX 6.2 and higher because
+				# of limitations in the older SGI compiler
+				# tools.
+				if test $uversion -ge 62; then
+					OPTIM="-fullwarn -woff 1183,1209,1349,3201 $OPTIM"
+				fi
 			fi
 			;;
 		SunOS*)
@@ -263,28 +154,6 @@ else
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
 			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on a Solaris system, build 32-bit
-				# libraries...
-				C32FLAGS="-xarch=v8"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib/32"
-				UNINSTALL32="uninstall32bit"
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Compiling on a Solaris system, build 64-bit
-				# libraries...
-				C64FLAGS="-xarch=v9 -xcode=pic32"
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib/64"
-				UNINSTALL64="uninstall64bit"
-			fi
 			;;
 		UNIX_SVR*)
 			# UnixWare
@@ -323,5 +192,5 @@ if test $uname = HP-UX; then
 fi

 dnl
-dnl End of "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $".
+dnl End of "$Id: cups-compiler.m4 4953 2006-01-19 20:30:48Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4 5269 2006-03-10 03:33:00Z mike $"
+dnl "$Id: cups-directories.m4 5023 2006-01-29 14:39:44Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -99,14 +99,10 @@ fi

 dnl Fix "libdir" variable for IRIX 6.x...
 if test "$libdir" = "\${exec_prefix}/lib"; then
-	if test "$uname" = "IRIX"; then
+	if test "$uname" = "IRIX" -a $uversion -ge 62; then
 		libdir="$exec_prefix/lib32"
 	else
-		if test "$uname" = Linux -a -d /usr/lib64; then
-			libdir="$exec_prefix/lib64"
-		else
-			libdir="$exec_prefix/lib"
-		fi
+		libdir="$exec_prefix/lib"
 	fi
 fi

@@ -270,7 +266,7 @@ case "$uname" in
 	*)
 		# All others
 		INSTALL_SYSV="install-sysv"
-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
+		CUPS_SERVERBIN="$libdir/cups"
 		;;
 esac

@@ -289,5 +285,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 5269 2006-03-10 03:33:00Z mike $".
+dnl End of "$Id: cups-directories.m4 5023 2006-01-29 14:39:44Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 5264 2006-03-10 01:10:36Z mike $"
+dnl "$Id: cups-ssl.m4 4800 2005-10-18 18:06:20Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -55,7 +55,7 @@ if test x$enable_ssl != xno; then
 	    dnl included...
 	    SAVELIBS="$LIBS"

-	    AC_CHECK_LIB(gnutls, gnutls_x509_crt_set_dn_by_oid,
+	    AC_CHECK_LIB(gnutls, gnutls_init,
 		[SSLLIBS="-lgnutls"
 		 AC_DEFINE(HAVE_SSL)
 		 AC_DEFINE(HAVE_GNUTLS)])
@@ -105,5 +105,5 @@ AC_SUBST(EXPORT_SSLLIBS)


 dnl
-dnl End of "$Id: cups-ssl.m4 5264 2006-03-10 01:10:36Z mike $".
+dnl End of "$Id: cups-ssl.m4 4800 2005-10-18 18:06:20Z mike $".
 dnl
@@ -83,173 +83,3 @@ testi18n.o: language.h array.h string.h ../config.h transcode.h normalize.h
 testipp.o: ../cups/string.h ../config.h string.h ipp.h http.h md5.h
 testlang.o: i18n.h language.h array.h
 testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h
-# DO NOT DELETE
-
-adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.32.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h normalize.h
-adminutil.32.o: adminutil.c  transcode.h debug.h
-array.32.o: array.c  array.h string.h ../config.h debug.h
-attr.32.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
-auth.32.o: auth.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-auth.32.o: auth.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-backchannel.32.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-backend.32.o: backend.c  backend.h string.h ../config.h
-custom.32.o: custom.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-custom.32.o: custom.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-dest.32.o: dest.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-dest.32.o: dest.c  array.h file.h language.h i18n.h normalize.h transcode.h
-dir.32.o: dir.c  dir.h string.h ../config.h debug.h
-emit.32.o: emit.c  ppd.h array.h file.h string.h ../config.h
-encode.32.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-encode.32.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.32.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h string.h
-file.32.o: file.c  ../cups/debug.h file.h
-getputfile.32.o: getputfile.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-getputfile.32.o: getputfile.c  string.h ../config.h debug.h
-globals.32.o: globals.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-globals.32.o: globals.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.32.o: globals.c  normalize.h transcode.h
-http.32.o: http.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.32.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
-http.32.o: http.c  transcode.h debug.h
-http-addr.32.o: http-addr.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-http-addr.32.o: http-addr.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-http-addrlist.32.o: http-addrlist.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-http-addrlist.32.o: http-addrlist.c  globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.32.o: http-addrlist.c  i18n.h normalize.h transcode.h debug.h
-http-support.32.o: http-support.c  debug.h globals.h string.h ../config.h cups.h ipp.h http.h
-http-support.32.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h normalize.h
-http-support.32.o: http-support.c  transcode.h
-ipp.32.o: ipp.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.32.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
-ipp.32.o: ipp.c  transcode.h debug.h
-ipp-support.32.o: ipp-support.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-ipp-support.32.o: ipp-support.c  array.h file.h language.h i18n.h normalize.h transcode.h
-ipp-support.32.o: ipp-support.c  debug.h
-langprintf.32.o: langprintf.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-langprintf.32.o: langprintf.c  array.h file.h language.h i18n.h normalize.h transcode.h
-language.32.o: language.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-language.32.o: language.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-localize.32.o: localize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-localize.32.o: localize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-mark.32.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
-mark.32.o: mark.c  ../config.h debug.h
-md5.32.o: md5.c  md5.h string.h ../config.h
-md5passwd.32.o: md5passwd.c  http.h md5.h string.h ../config.h
-normalize.32.o: normalize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-normalize.32.o: normalize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-notify.32.o: notify.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-notify.32.o: notify.c  array.h file.h language.h i18n.h normalize.h transcode.h
-options.32.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
-options.32.o: options.c  ../config.h debug.h
-page.32.o: page.c  ppd.h array.h file.h string.h ../config.h
-ppd.32.o: ppd.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
-ppd.32.o: ppd.c  file.h language.h i18n.h normalize.h transcode.h debug.h
-request.32.o: request.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-request.32.o: request.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-snprintf.32.o: snprintf.c  string.h ../config.h
-string.32.o: string.c  debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
-string.32.o: string.c  ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
-tempfile.32.o: tempfile.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-tempfile.32.o: tempfile.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-transcode.32.o: transcode.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-transcode.32.o: transcode.c  array.h file.h language.h i18n.h normalize.h transcode.h
-usersys.32.o: usersys.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-usersys.32.o: usersys.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.32.o: usersys.c  normalize.h transcode.h
-util.32.o: util.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-util.32.o: util.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-testadmin.32.o: testadmin.c  language.h string.h ../config.h
-testarray.32.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
-testfile.32.o: testfile.c  string.h ../config.h file.h debug.h
-testhttp.32.o: testhttp.c  http.h md5.h string.h ../config.h
-testi18n.32.o: testi18n.c  language.h array.h string.h ../config.h transcode.h normalize.h
-testipp.32.o: testipp.c  ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.32.o: testlang.c  i18n.h language.h array.h
-testppd.32.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h
-# DO NOT DELETE
-
-adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.64.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h normalize.h
-adminutil.64.o: adminutil.c  transcode.h debug.h
-array.64.o: array.c  array.h string.h ../config.h debug.h
-attr.64.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
-auth.64.o: auth.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-auth.64.o: auth.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-backchannel.64.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-backend.64.o: backend.c  backend.h string.h ../config.h
-custom.64.o: custom.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-custom.64.o: custom.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-dest.64.o: dest.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-dest.64.o: dest.c  array.h file.h language.h i18n.h normalize.h transcode.h
-dir.64.o: dir.c  dir.h string.h ../config.h debug.h
-emit.64.o: emit.c  ppd.h array.h file.h string.h ../config.h
-encode.64.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-encode.64.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.64.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h string.h
-file.64.o: file.c  ../cups/debug.h file.h
-getputfile.64.o: getputfile.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-getputfile.64.o: getputfile.c  string.h ../config.h debug.h
-globals.64.o: globals.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-globals.64.o: globals.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.64.o: globals.c  normalize.h transcode.h
-http.64.o: http.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.64.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
-http.64.o: http.c  transcode.h debug.h
-http-addr.64.o: http-addr.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-http-addr.64.o: http-addr.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-http-addrlist.64.o: http-addrlist.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-http-addrlist.64.o: http-addrlist.c  globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.64.o: http-addrlist.c  i18n.h normalize.h transcode.h debug.h
-http-support.64.o: http-support.c  debug.h globals.h string.h ../config.h cups.h ipp.h http.h
-http-support.64.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h normalize.h
-http-support.64.o: http-support.c  transcode.h
-ipp.64.o: ipp.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.64.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
-ipp.64.o: ipp.c  transcode.h debug.h
-ipp-support.64.o: ipp-support.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-ipp-support.64.o: ipp-support.c  array.h file.h language.h i18n.h normalize.h transcode.h
-ipp-support.64.o: ipp-support.c  debug.h
-langprintf.64.o: langprintf.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-langprintf.64.o: langprintf.c  array.h file.h language.h i18n.h normalize.h transcode.h
-language.64.o: language.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-language.64.o: language.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-localize.64.o: localize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-localize.64.o: localize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-mark.64.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
-mark.64.o: mark.c  ../config.h debug.h
-md5.64.o: md5.c  md5.h string.h ../config.h
-md5passwd.64.o: md5passwd.c  http.h md5.h string.h ../config.h
-normalize.64.o: normalize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-normalize.64.o: normalize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-notify.64.o: notify.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-notify.64.o: notify.c  array.h file.h language.h i18n.h normalize.h transcode.h
-options.64.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
-options.64.o: options.c  ../config.h debug.h
-page.64.o: page.c  ppd.h array.h file.h string.h ../config.h
-ppd.64.o: ppd.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
-ppd.64.o: ppd.c  file.h language.h i18n.h normalize.h transcode.h debug.h
-request.64.o: request.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-request.64.o: request.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-snprintf.64.o: snprintf.c  string.h ../config.h
-string.64.o: string.c  debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
-string.64.o: string.c  ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
-tempfile.64.o: tempfile.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-tempfile.64.o: tempfile.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-transcode.64.o: transcode.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-transcode.64.o: transcode.c  array.h file.h language.h i18n.h normalize.h transcode.h
-usersys.64.o: usersys.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-usersys.64.o: usersys.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.64.o: usersys.c  normalize.h transcode.h
-util.64.o: util.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-util.64.o: util.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-testadmin.64.o: testadmin.c  language.h string.h ../config.h
-testarray.64.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
-testfile.64.o: testfile.c  string.h ../config.h file.h debug.h
-testhttp.64.o: testhttp.c  http.h md5.h string.h ../config.h
-testi18n.64.o: testi18n.c  language.h array.h string.h ../config.h transcode.h normalize.h
-testipp.64.o: testipp.c  ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.64.o: testlang.c  i18n.h language.h array.h
-testppd.64.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h
@@ -69,12 +69,8 @@ LIBOBJS	=	\
 		transcode.o \
 		usersys.o \
 		util.o
-LIB32OBJS	= $(LIBOBJS:.o=.32.o)
-LIB64OBJS	= $(LIBOBJS:.o=.64.o)
 OBJS	=	\
 		$(LIBOBJS) \
-		$(LIB32OBJS) \
-		$(LIB64OBJS) \
 		testadmin.o \
 		testarray.o \
 		testfile.o \
@@ -112,8 +108,6 @@ HEADERS	=	\

 TARGETS	=	\
 		$(LIBCUPS) \
-		$(LIB32CUPS) \
-		$(LIB64CUPS) \
 		libcups.a \
 		testadmin \
 		testarray \
@@ -137,8 +131,7 @@ all:	$(TARGETS)
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS)
-	$(RM) libcups.so libcups.sl libcups.dylib libcups.32.so libcups.64.so
+	$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2` libcups.dylib


 #
@@ -146,20 +139,14 @@ clean:
 #

 depend:
-	touch Dependencies.tmp
-	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
-	$(RM) Dependencies
-	cp Dependencies.tmp Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
-	$(RM) Dependencies.tmp
+	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1


 #
 # Install object and target files...
 #

-install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:	all installhdrs $(INSTALLSTATIC)
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
@@ -185,22 +172,12 @@ installhdrs:
 		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
 	done

-install32bit:
-	$(INSTALL_DIR) -m 755 $(LIB32DIR)
-	$(INSTALL_LIB) libcups.32.so.2 $(LIB32DIR)/libcups.so.2
-	$(LN) libcups.so $(LIB32DIR)/libcups.so.2
-
-install64bit:
-	$(INSTALL_DIR) -m 755 $(LIB64DIR)
-	$(INSTALL_LIB) libcups.64.so.2 $(LIB64DIR)/libcups.so.2
-	$(LN) libcups.so $(LIB64DIR)/libcups.so.2
-

 #
 # Uninstall object and target files...
 #

-uninstall: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
 	$(RM) $(LIBDIR)/libcups.2.dylib
 	$(RM) $(LIBDIR)/libcups.a
 	$(RM) $(LIBDIR)/libcups.dylib
@@ -215,16 +192,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	done
 	-$(RMDIR) $(INCLUDEDIR)/cups

-uninstall32bit:
-	$(RM) $(LIB32DIR)/libcups.so
-	$(RM) $(LIB32DIR)/libcups.so.2
-	-$(RMDIR) $(LIB32DIR)
-
-uninstall64bit:
-	$(RM) $(LIB64DIR)/libcups.so
-	$(RM) $(LIB64DIR)/libcups.so.2
-	-$(RMDIR) $(LIB64DIR)
-

 #
 # libcups.so.2, libcups.sl.2
@@ -237,24 +204,6 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 	$(LN) $@ `basename $@ .2`


-#
-# libcups.32.so.2
-#
-
-libcups.32.so.2:	$(LIB32OBJS)
-	echo Linking 32-bit $@...
-	$(DSO) $(C32FLAGS) $(DSOFLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# libcups.64.so.2
-#
-
-libcups.64.so.2:	$(LIB64OBJS)
-	echo Linking 64-bit $@...
-	$(DSO) $(C64FLAGS) $(DSOFLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
 #
 # libcups.2.dylib
 #
@@ -25,27 +25,24 @@
 *
 * Contents:
 *
- *   cupsArrayAdd()      - Add an element to the array.
- *   cupsArrayClear()    - Clear the array.
- *   cupsArrayCount()    - Get the number of elements in the array.
- *   cupsArrayCurrent()  - Return the current element in the array.
- *   cupsArrayDelete()   - Free all memory used by the array.
- *   cupsArrayDup()      - Duplicate the array.
- *   cupsArrayFind()     - Find an element in the array.
- *   cupsArrayFirst()    - Get the first element in the array.
- *   cupsArrayIndex()    - Get the N-th element in the array.
- *   cupsArrayInsert()   - Insert an element in the array.
- *   cupsArrayLast()     - Get the last element in the array.
- *   cupsArrayNew()      - Create a new array.
- *   cupsArrayNext()     - Get the next element in the array.
- *   cupsArrayPrev()     - Get the previous element in the array.
- *   cupsArrayRemove()   - Remove an element from the array.
- *   cupsArrayRestore()  - Reset the current element to the last cupsArraySave.
- *   cupsArraySave()     - Mark the current element for a later
- *                         cupsArrayRestore.
- *   cupsArrayUserData() - Return the user data for an array.
- *   cups_array_add()    - Insert or append an element to the array...
- *   cups_array_find()   - Find an element in the array...
+ *   cupsArrayAdd()     - Add an element to the array.
+ *   cupsArrayClear()   - Clear the array.
+ *   cupsArrayCount()   - Get the number of elements in the array.
+ *   cupsArrayCurrent() - Return the current element in the array.
+ *   cupsArrayDelete()  - Free all memory used by the array.
+ *   cupsArrayDup()     - Duplicate the array.
+ *   cupsArrayFind()    - Find an element in the array.
+ *   cupsArrayFirst()   - Get the first element in the array.
+ *   cupsArrayIndex()   - Get the N-th element in the array.
+ *   cupsArrayInsert()  - Insert an element in the array.
+ *   cupsArrayLast()    - Get the last element in the array.
+ *   cupsArrayNew()     - Create a new array.
+ *   cupsArrayNext()    - Get the next element in the array.
+ *   cupsArrayPrev()    - Get the previous element in the array.
+ *   cupsArrayRemove()  - Remove an element from the array.
+ *   cupsArrayRestore() - Reset the current element to the last cupsArraySave.
+ *   cupsArraySave()    - Mark the current element for a later cupsArrayRestore.
+ *   cups_array_find()  - Find an element in the array...
 */

 /*
@@ -641,20 +638,6 @@ cupsArraySave(cups_array_t *a)		/* I - Array */
 }


-/*
- * 'cupsArrayUserData()' - Return the user data for an array.
- */
-
-void *					/* O - User data */
-cupsArrayUserData(cups_array_t *a)	/* I - Array */
-{
-  if (a)
-    return (a->data);
-  else
-    return (NULL);
-}
-
-
 /*
 * 'cups_array_add()' - Insert or append an element to the array...
 */
@@ -73,7 +73,6 @@ extern void		*cupsArrayPrev(cups_array_t *a);
 extern int		cupsArrayRemove(cups_array_t *a, void *e);
 extern void		*cupsArrayRestore(cups_array_t *a);
 extern int		cupsArraySave(cups_array_t *a);
-extern void		*cupsArrayUserData(cups_array_t *a);

 #  ifdef __cplusplus
 }
@@ -527,7 +527,7 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
           !strcasecmp(choices[i]->option->keyword, "PageRegion")) &&
          !strcasecmp(choices[i]->choice, "Custom"))
      {
-        bufsize += 37;			/* %%BeginFeature: *CustomPageSize True\n */
+        bufsize += 37;			/* %%BeginFeature: *CustomPageSize True */
        bufsize += 50;			/* Five 9-digit numbers + newline */
      }
      else if (!strcasecmp(choices[i]->choice, "Custom") &&
@@ -535,8 +535,8 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	                                      choices[i]->option->keyword))
 	           != NULL)
      {
-        bufsize += 17 + strlen(choices[i]->option->keyword) + 6;
-					/* %%BeginFeature: *keyword True\n */
+        bufsize += 23 + strlen(choices[i]->option->keyword);
+					/* %%BeginFeature: *keyword True */

        
        for (cparam = (ppd_cparam_t *)cupsArrayFirst(coption->params);
@@ -562,16 +562,16 @@ ppdEmitString(ppd_file_t    *ppd,	/* I - PPD file record */
 	}
      }
      else
-        bufsize += 17 + strlen(choices[i]->option->keyword) + 1 +
-	           strlen(choices[i]->choice) + 1;
-					/* %%BeginFeature: *keyword choice\n */
+        bufsize += 19 + strlen(choices[i]->option->keyword) +
+	           strlen(choices[i]->choice);
+					/* %%BeginFeature: *keyword choice */

      bufsize += 13;			/* %%EndFeature\n */
      bufsize += 22;			/* } stopped cleartomark\n */
    }

    if (choices[i]->code)
-      bufsize += strlen(choices[i]->code) + 1;
+      bufsize += strlen(choices[i]->code);
    else
      bufsize += strlen(ppd_custom_code);
  }
@@ -2280,8 +2280,7 @@ http_setup_ssl(http_t *http)		/* I - HTTP connection */
  gnutls_init(&(conn->session), GNUTLS_CLIENT);
  gnutls_set_default_priority(conn->session);
  gnutls_credentials_set(conn->session, GNUTLS_CRD_CERTIFICATE, *credentials);
-  gnutls_transport_set_ptr(conn->session,
-                           (gnutls_transport_ptr)((long)http->fd));
+  gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr)http->fd);

  if ((gnutls_handshake(conn->session)) != GNUTLS_E_SUCCESS)
  {
@@ -39,9 +39,6 @@
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
 #  else
-#    ifdef __sgi /* IRIX needs this for IPv6 support!?! */
-#      define INET6
-#    endif /* __sgi */
 #    include <unistd.h>
 #    include <sys/time.h>
 #    include <sys/socket.h>
@@ -103,7 +103,7 @@ static const gencat_t gencat_index[] =	/* General Category Index */
  { CUPS_GENCAT_CS, "Cs" },		/* Other, Surrogate */
  { CUPS_GENCAT_CO, "Co" },		/* Other, Private Use */
  { CUPS_GENCAT_CN, "Cn" },		/* Other, Not Assigned */
-  { CUPS_GENCAT_NULL, NULL }
+  { 0, NULL }
 };

 static const char * const bidicat_index[] =
@@ -168,7 +168,7 @@ static const _cups_break_t break_index[] =	/* Line Break Class Index */
  { CUPS_BREAK_SY, "SY" },		/* Symbols Allowing Break After (A) */
  { CUPS_BREAK_XX, "XX" },		/* Unknown (XP) */
  { CUPS_BREAK_ZW, "ZW" },		/* Zero Width Space (A) (norm) */
-  { CUPS_BREAK_NULL, NULL }
+  { 0, NULL }
 };

 /*
@@ -40,26 +40,26 @@ extern "C" {
 * Types...
 */

-typedef enum				/**** Normalizataion Types ****/
+typedef enum                    /**** Normalizataion Types ****/
 {
-  CUPS_NORM_NFD,			/* Canonical Decomposition */
-  CUPS_NORM_NFKD,			/* Compatibility Decomposition */
-  CUPS_NORM_NFC,			/* NFD, them Canonical Composition */
-  CUPS_NORM_NFKC			/* NFKD, them Canonical Composition */
+  CUPS_NORM_NFD,                /* Canonical Decomposition */
+  CUPS_NORM_NFKD,               /* Compatibility Decomposition */
+  CUPS_NORM_NFC,                /* NFD, them Canonical Composition */
+  CUPS_NORM_NFKC                /* NFKD, them Canonical Composition */
 } cups_normalize_t;

-typedef enum				/**** Case Folding Types ****/
+typedef enum                    /**** Case Folding Types ****/
 {
-  CUPS_FOLD_SIMPLE,			/* Simple - no expansion in size */
-  CUPS_FOLD_FULL			/* Full - possible expansion in size */
+  CUPS_FOLD_SIMPLE,             /* Simple - no expansion in size */
+  CUPS_FOLD_FULL                /* Full - possible expansion in size */
 } cups_folding_t;

-typedef enum				/**** Unicode Char Property Types ****/
+typedef enum                    /**** Unicode Char Property Types ****/
 {
-  CUPS_PROP_GENERAL_CATEGORY,		/* See 'cups_gencat_t' enum */
-  CUPS_PROP_BIDI_CATEGORY,		/* See 'cups_bidi_t' enum */
-  CUPS_PROP_COMBINING_CLASS,		/* See '_cups_comb_class_t' type */
-  CUPS_PROP_BREAK_CLASS			/* See 'cups_break_class_t' enum */
+  CUPS_PROP_GENERAL_CATEGORY,   /* See 'cups_gencat_t' enum */
+  CUPS_PROP_BIDI_CATEGORY,      /* See 'cups_bidi_t' enum */
+  CUPS_PROP_COMBINING_CLASS,    /* See '_cups_comb_class_t' type */
+  CUPS_PROP_BREAK_CLASS         /* See 'cups_break_class_t' enum */
 } cups_property_t;


@@ -67,69 +67,68 @@ typedef enum				/**** Unicode Char Property Types ****/
 * Note - Use major classes for logic optimizations (by mask).
 */

-typedef enum				/**** Unicode General Category ****/
+typedef enum                    /**** Unicode General Category ****/
 {
-  CUPS_GENCAT_NULL = 0,			/* Terminator */
-  CUPS_GENCAT_L	 = 0x10,		/* Letter major class */
-  CUPS_GENCAT_LU = 0x11,		/* Lu Letter, Uppercase */
-  CUPS_GENCAT_LL = 0x12,		/* Ll Letter, Lowercase */
-  CUPS_GENCAT_LT = 0x13,		/* Lt Letter, Titlecase */
-  CUPS_GENCAT_LM = 0x14,		/* Lm Letter, Modifier */
-  CUPS_GENCAT_LO = 0x15,		/* Lo Letter, Other */
-  CUPS_GENCAT_M	 = 0x20,		/* Mark major class */
-  CUPS_GENCAT_MN = 0x21,		/* Mn Mark, Non-Spacing */
-  CUPS_GENCAT_MC = 0x22,		/* Mc Mark, Spacing Combining */
-  CUPS_GENCAT_ME = 0x23,		/* Me Mark, Enclosing */
-  CUPS_GENCAT_N	 = 0x30,		/* Number major class */
-  CUPS_GENCAT_ND = 0x31,		/* Nd Number, Decimal Digit */
-  CUPS_GENCAT_NL = 0x32,		/* Nl Number, Letter */
-  CUPS_GENCAT_NO = 0x33,		/* No Number, Other */
-  CUPS_GENCAT_P	 = 0x40,		/* Punctuation major class */
-  CUPS_GENCAT_PC = 0x41,		/* Pc Punctuation, Connector */
-  CUPS_GENCAT_PD = 0x42,		/* Pd Punctuation, Dash */
-  CUPS_GENCAT_PS = 0x43,		/* Ps Punctuation, Open (start) */
-  CUPS_GENCAT_PE = 0x44,		/* Pe Punctuation, Close (end) */
-  CUPS_GENCAT_PI = 0x45,		/* Pi Punctuation, Initial Quote */
-  CUPS_GENCAT_PF = 0x46,		/* Pf Punctuation, Final Quote */
-  CUPS_GENCAT_PO = 0x47,		/* Po Punctuation, Other */
-  CUPS_GENCAT_S	 = 0x50,		/* Symbol major class */
-  CUPS_GENCAT_SM = 0x51,		/* Sm Symbol, Math */
-  CUPS_GENCAT_SC = 0x52,		/* Sc Symbol, Currency */
-  CUPS_GENCAT_SK = 0x53,		/* Sk Symbol, Modifier */
-  CUPS_GENCAT_SO = 0x54,		/* So Symbol, Other */
-  CUPS_GENCAT_Z	 = 0x60,		/* Separator major class */
-  CUPS_GENCAT_ZS = 0x61,		/* Zs Separator, Space */
-  CUPS_GENCAT_ZL = 0x62,		/* Zl Separator, Line */
-  CUPS_GENCAT_ZP = 0x63,		/* Zp Separator, Paragraph */
-  CUPS_GENCAT_C	 = 0x70,		/* Other (miscellaneous) major class */
-  CUPS_GENCAT_CC = 0x71,		/* Cc Other, Control */
-  CUPS_GENCAT_CF = 0x72,		/* Cf Other, Format */
-  CUPS_GENCAT_CS = 0x73,		/* Cs Other, Surrogate */
-  CUPS_GENCAT_CO = 0x74,		/* Co Other, Private Use */
-  CUPS_GENCAT_CN = 0x75			/* Cn Other, Not Assigned */
+  CUPS_GENCAT_L  = 0x10,        /* Letter major class */
+  CUPS_GENCAT_LU = 0x11,        /* Lu Letter, Uppercase */
+  CUPS_GENCAT_LL = 0x12,        /* Ll Letter, Lowercase */
+  CUPS_GENCAT_LT = 0x13,        /* Lt Letter, Titlecase */
+  CUPS_GENCAT_LM = 0x14,        /* Lm Letter, Modifier */
+  CUPS_GENCAT_LO = 0x15,        /* Lo Letter, Other */
+  CUPS_GENCAT_M  = 0x20,        /* Mark major class */
+  CUPS_GENCAT_MN = 0x21,        /* Mn Mark, Non-Spacing */
+  CUPS_GENCAT_MC = 0x22,        /* Mc Mark, Spacing Combining */
+  CUPS_GENCAT_ME = 0x23,        /* Me Mark, Enclosing */
+  CUPS_GENCAT_N  = 0x30,        /* Number major class */
+  CUPS_GENCAT_ND = 0x31,        /* Nd Number, Decimal Digit */
+  CUPS_GENCAT_NL = 0x32,        /* Nl Number, Letter */
+  CUPS_GENCAT_NO = 0x33,        /* No Number, Other */
+  CUPS_GENCAT_P  = 0x40,        /* Punctuation major class */
+  CUPS_GENCAT_PC = 0x41,        /* Pc Punctuation, Connector */
+  CUPS_GENCAT_PD = 0x42,        /* Pd Punctuation, Dash */
+  CUPS_GENCAT_PS = 0x43,        /* Ps Punctuation, Open (start) */
+  CUPS_GENCAT_PE = 0x44,        /* Pe Punctuation, Close (end) */
+  CUPS_GENCAT_PI = 0x45,        /* Pi Punctuation, Initial Quote */
+  CUPS_GENCAT_PF = 0x46,        /* Pf Punctuation, Final Quote */
+  CUPS_GENCAT_PO = 0x47,        /* Po Punctuation, Other */
+  CUPS_GENCAT_S  = 0x50,        /* Symbol major class */
+  CUPS_GENCAT_SM = 0x51,        /* Sm Symbol, Math */
+  CUPS_GENCAT_SC = 0x52,        /* Sc Symbol, Currency */
+  CUPS_GENCAT_SK = 0x53,        /* Sk Symbol, Modifier */
+  CUPS_GENCAT_SO = 0x54,        /* So Symbol, Other */
+  CUPS_GENCAT_Z  = 0x60,        /* Separator major class */
+  CUPS_GENCAT_ZS = 0x61,        /* Zs Separator, Space */
+  CUPS_GENCAT_ZL = 0x62,        /* Zl Separator, Line */
+  CUPS_GENCAT_ZP = 0x63,        /* Zp Separator, Paragraph */
+  CUPS_GENCAT_C  = 0x70,        /* Other (miscellaneous) major class */
+  CUPS_GENCAT_CC = 0x71,        /* Cc Other, Control */
+  CUPS_GENCAT_CF = 0x72,        /* Cf Other, Format */
+  CUPS_GENCAT_CS = 0x73,        /* Cs Other, Surrogate */
+  CUPS_GENCAT_CO = 0x74,        /* Co Other, Private Use */
+  CUPS_GENCAT_CN = 0x75         /* Cn Other, Not Assigned */
 } cups_gencat_t;

-typedef enum				/**** Unicode Bidi Category ****/
+typedef enum                    /**** Unicode Bidi Category ****/
 {
-  CUPS_BIDI_L,				/* Left-to-Right (Alpha, Ideographic) */
-  CUPS_BIDI_LRE,			/* Left-to-Right Embedding (explicit) */
-  CUPS_BIDI_LRO,			/* Left-to-Right Override (explicit) */
-  CUPS_BIDI_R,				/* Right-to-Left (Hebrew alpha/punct) */
-  CUPS_BIDI_AL,				/* Right-to-Left Arabic (Arabic, etc) */
-  CUPS_BIDI_RLE,			/* Right-to-Left Embedding (explicit) */
-  CUPS_BIDI_RLO,			/* Right-to-Left Override (explicit) */
-  CUPS_BIDI_PDF,			/* Pop Directional Format */
-  CUPS_BIDI_EN,				/* Euro Number (Euro & Indic digits) */
-  CUPS_BIDI_ES,				/* Euro Number Separator (Slash) */
-  CUPS_BIDI_ET,				/* Euro Number Terminator */
-  CUPS_BIDI_AN,				/* Arabic Number (digits, separators) */
-  CUPS_BIDI_CS,				/* Common Number Separator */
-  CUPS_BIDI_NSM,			/* Non-Spacing Mark (Mn/Me in UCD) */
-  CUPS_BIDI_BN,				/* Boundary Neutral (formatting, etc) */
-  CUPS_BIDI_B,				/* Paragraph Separator */
-  CUPS_BIDI_S,				/* Segment Separator (Tab) */
-  CUPS_BIDI_WS,				/* Whitespace Space (Space, etc) */
-  CUPS_BIDI_ON				/* Other Neutrals */
+  CUPS_BIDI_L,                  /* Left-to-Right (Alpha, Ideographic) */
+  CUPS_BIDI_LRE,                /* Left-to-Right Embedding (explicit) */
+  CUPS_BIDI_LRO,                /* Left-to-Right Override (explicit) */
+  CUPS_BIDI_R,                  /* Right-to-Left (Hebrew alpha/punct) */
+  CUPS_BIDI_AL,                 /* Right-to-Left Arabic (Arabic, etc) */
+  CUPS_BIDI_RLE,                /* Right-to-Left Embedding (explicit) */
+  CUPS_BIDI_RLO,                /* Right-to-Left Override (explicit) */
+  CUPS_BIDI_PDF,                /* Pop Directional Format */
+  CUPS_BIDI_EN,                 /* Euro Number (Euro & Indic digits) */
+  CUPS_BIDI_ES,                 /* Euro Number Separator (Slash) */
+  CUPS_BIDI_ET,                 /* Euro Number Terminator */
+  CUPS_BIDI_AN,                 /* Arabic Number (digits, separators) */
+  CUPS_BIDI_CS,                 /* Common Number Separator */
+  CUPS_BIDI_NSM,                /* Non-Spacing Mark (Mn/Me in UCD) */
+  CUPS_BIDI_BN,                 /* Boundary Neutral (formatting, etc) */
+  CUPS_BIDI_B,                  /* Paragraph Separator */
+  CUPS_BIDI_S,                  /* Segment Separator (Tab) */
+  CUPS_BIDI_WS,                 /* Whitespace Space (Space, etc) */
+  CUPS_BIDI_ON                  /* Other Neutrals */
 } cups_bidi_t;

 /*
@@ -139,7 +138,7 @@ typedef enum				/**** Unicode Bidi Category ****/
 * See 'LineBreak.txt' (12,875) and 'DerivedLineBreak.txt' (1,350).
 */

-typedef enum				/**** Unicode Line Break Class ****/
+typedef enum                    /**** Unicode Line Break Class ****/
 {
 /*
  * (A) - Allow Break AFTER
@@ -149,40 +148,39 @@ typedef enum				/**** Unicode Line Break Class ****/
  * (P) - Allow Break For Pair
  * (XP) - Prevent Break For Pair
  */
-  CUPS_BREAK_NULL,			/* Terminator */
-  CUPS_BREAK_AI,			/* Ambiguous Alphabetic or Ideograph */
-  CUPS_BREAK_AL,			/* Ordinary Alpha/Symbol Chars (XP) */
-  CUPS_BREAK_BA,			/* Break Opportunity After Chars (A) */
-  CUPS_BREAK_BB,			/* Break Opportunity Before Chars (B) */
-  CUPS_BREAK_B2,			/* Break Opportunity Either (B/A/XP) */
-  CUPS_BREAK_BK,			/* Mandatory Break (A) (norm) */
-  CUPS_BREAK_CB,			/* Contingent Break (B/A) (norm) */
-  CUPS_BREAK_CL,			/* Closing Punctuation (XB) */
-  CUPS_BREAK_CM,			/* Attached/Combining (XB) (norm) */
-  CUPS_BREAK_CR,			/* Carriage Return (A) (norm) */
-  CUPS_BREAK_EX,			/* Exclamation/Interrogation (XB) */
-  CUPS_BREAK_GL,			/* Non-breaking "Glue" (XB/XA) (norm) */
-  CUPS_BREAK_HY,			/* Hyphen (XA) */
-  CUPS_BREAK_ID,			/* Ideographic (B/A) */
-  CUPS_BREAK_IN,			/* Inseparable chars (XP) */
-  CUPS_BREAK_IS,			/* Numeric Separator (Infix) (XB) */
-  CUPS_BREAK_LF,			/* Line Feed (A) (norm) */
-  CUPS_BREAK_NS,			/* Non-starters (XB) */
-  CUPS_BREAK_NU,			/* Numeric (XP) */
-  CUPS_BREAK_OP,			/* Opening Punctuation (XA) */
-  CUPS_BREAK_PO,			/* Postfix (Numeric) (XB) */
-  CUPS_BREAK_PR,			/* Prefix (Numeric) (XA) */
-  CUPS_BREAK_QU,			/* Ambiguous Quotation (XB/XA) */
-  CUPS_BREAK_SA,			/* Context Dependent (SE Asian) (P) */
-  CUPS_BREAK_SG,			/* Surrogates (XP) (norm) */
-  CUPS_BREAK_SP,			/* Space (A) (norm) */
-  CUPS_BREAK_SY,			/* Symbols Allowing Break After (A) */
-  CUPS_BREAK_XX,			/* Unknown (XP) */
-  CUPS_BREAK_ZW				/* Zero Width Space (A) (norm) */
+  CUPS_BREAK_AI,                /* Ambiguous Alphabetic or Ideograph */
+  CUPS_BREAK_AL,                /* Ordinary Alpha/Symbol Chars (XP) */
+  CUPS_BREAK_BA,                /* Break Opportunity After Chars (A) */
+  CUPS_BREAK_BB,                /* Break Opportunity Before Chars (B) */
+  CUPS_BREAK_B2,                /* Break Opportunity Either (B/A/XP) */
+  CUPS_BREAK_BK,                /* Mandatory Break (A) (norm) */
+  CUPS_BREAK_CB,                /* Contingent Break (B/A) (norm) */
+  CUPS_BREAK_CL,                /* Closing Punctuation (XB) */
+  CUPS_BREAK_CM,                /* Attached/Combining (XB) (norm) */
+  CUPS_BREAK_CR,                /* Carriage Return (A) (norm) */
+  CUPS_BREAK_EX,                /* Exclamation/Interrogation (XB) */
+  CUPS_BREAK_GL,                /* Non-breaking "Glue" (XB/XA) (norm) */
+  CUPS_BREAK_HY,                /* Hyphen (XA) */
+  CUPS_BREAK_ID,                /* Ideographic (B/A) */
+  CUPS_BREAK_IN,                /* Inseparable chars (XP) */
+  CUPS_BREAK_IS,                /* Numeric Separator (Infix) (XB) */
+  CUPS_BREAK_LF,                /* Line Feed (A) (norm) */
+  CUPS_BREAK_NS,                /* Non-starters (XB) */
+  CUPS_BREAK_NU,                /* Numeric (XP) */
+  CUPS_BREAK_OP,                /* Opening Punctuation (XA) */
+  CUPS_BREAK_PO,                /* Postfix (Numeric) (XB) */
+  CUPS_BREAK_PR,                /* Prefix (Numeric) (XA) */
+  CUPS_BREAK_QU,                /* Ambiguous Quotation (XB/XA) */
+  CUPS_BREAK_SA,                /* Context Dependent (SE Asian) (P) */
+  CUPS_BREAK_SG,                /* Surrogates (XP) (norm) */
+  CUPS_BREAK_SP,                /* Space (A) (norm) */
+  CUPS_BREAK_SY,                /* Symbols Allowing Break After (A) */
+  CUPS_BREAK_XX,                /* Unknown (XP) */
+  CUPS_BREAK_ZW                 /* Zero Width Space (A) (norm) */
 } cups_break_class_t;

-typedef int _cups_comb_class_t;	  /**** Unicode Combining Class ****/
-				/* 0=base, 1..254=combining char */
+typedef int _cups_comb_class_t;   /**** Unicode Combining Class ****/
+                                /* 0=base, 1..254=combining char */

 /*
 * Structures...
@@ -190,57 +188,57 @@ typedef int _cups_comb_class_t;	  /**** Unicode Combining Class ****/

 typedef struct _cups_normmap_s		/**** Normalize Map Cache Struct ****/
 {
-  struct _cups_normmap_s *next;		/* Next normalize in cache */
-  int			used;		/* Number of times entry used */
-  cups_normalize_t	normalize;	/* Normalization type */
-  int			normcount;	/* Count of Source Chars */
-  cups_ucs2_t		*uni2norm;	/* Char -> Normalization */
-					/* ...only supports UCS-2 */
+  struct _cups_normmap_s *next;        /* Next normalize in cache */
+  int                   used;           /* Number of times entry used */
+  cups_normalize_t      normalize;      /* Normalization type */
+  int                   normcount;      /* Count of Source Chars */
+  cups_ucs2_t           *uni2norm;      /* Char -> Normalization */
+                                        /* ...only supports UCS-2 */
 } _cups_norm_map_t;

 typedef struct _cups_foldmap_s		/**** Case Fold Map Cache Struct ****/
 {
-  struct _cups_foldmap_s *next;		/* Next case fold in cache */
-  int			used;		/* Number of times entry used */
-  cups_folding_t	fold;		/* Case folding type */
-  int			foldcount;	/* Count of Source Chars */
-  cups_ucs2_t		*uni2fold;	/* Char -> Folded Char(s) */
-					/* ...only supports UCS-2 */
+  struct _cups_foldmap_s *next;        /* Next case fold in cache */
+  int                   used;           /* Number of times entry used */
+  cups_folding_t        fold;           /* Case folding type */
+  int                   foldcount;      /* Count of Source Chars */
+  cups_ucs2_t           *uni2fold;      /* Char -> Folded Char(s) */
+                                        /* ...only supports UCS-2 */
 } _cups_fold_map_t;

 typedef struct _cups_prop_s		/**** Char Property Struct ****/
 {
-  cups_ucs2_t		ch;		/* Unicode Char as UCS-2 */
-  unsigned char		gencat;		/* General Category */
-  unsigned char		bidicat;	/* Bidirectional Category */
+  cups_ucs2_t           ch;             /* Unicode Char as UCS-2 */
+  unsigned char         gencat;         /* General Category */
+  unsigned char         bidicat;        /* Bidirectional Category */
 } _cups_prop_t;

 typedef struct _cups_prop_map_s		/**** Char Property Map Struct ****/
 {
-  int			used;		/* Number of times entry used */
-  int			propcount;	/* Count of Source Chars */
-  _cups_prop_t		*uni2prop;	/* Char -> Properties */
+  int                   used;           /* Number of times entry used */
+  int                   propcount;      /* Count of Source Chars */
+  _cups_prop_t           *uni2prop;      /* Char -> Properties */
 } _cups_prop_map_t;

 typedef struct _cups_break_map_s	/**** Line Break Class Map Struct ****/
 {
-  int			used;		/* Number of times entry used */
-  int			breakcount;	/* Count of Source Chars */
-  cups_ucs2_t		*uni2break;	/* Char -> Line Break Class */
+  int                   used;           /* Number of times entry used */
+  int                   breakcount;     /* Count of Source Chars */
+  cups_ucs2_t           *uni2break;     /* Char -> Line Break Class */
 } _cups_break_map_t;

 typedef struct _cups_comb_s		/**** Char Combining Class Struct ****/
 {
-  cups_ucs2_t		ch;		/* Unicode Char as UCS-2 */
-  unsigned char		combclass;	/* Combining Class */
-  unsigned char		reserved;	/* Reserved for alignment */
+  cups_ucs2_t           ch;             /* Unicode Char as UCS-2 */
+  unsigned char         combclass;      /* Combining Class */
+  unsigned char         reserved;       /* Reserved for alignment */
 } _cups_comb_t;

 typedef struct _cups_comb_map_s		/**** Combining Class Map Struct ****/
 {
-  int			used;		/* Number of times entry used */
-  int			combcount;	/* Count of Source Chars */
-  _cups_comb_t		*uni2comb;	/* Char -> Combining Class */
+  int                   used;           /* Number of times entry used */
+  int                   combcount;      /* Count of Source Chars */
+  _cups_comb_t           *uni2comb;      /* Char -> Combining Class */
 } _cups_comb_map_t;

 /*
@@ -954,6 +954,9 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
    }
    else if (!strncmp(keyword, "Custom", 6) && !strcmp(name, "True"))
    {
+      ppd_coption_t	*coption;	/* Custom option */
+
+
      DEBUG_puts("Processing Custom option...");

     /*
@@ -984,7 +987,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	}
      }

-      if (!ppd_get_coption(ppd, keyword + 6))
+      if ((coption = ppd_get_coption(ppd, keyword + 6)) == NULL)
      {
        cg->ppd_status = PPD_ALLOC_ERROR;

@@ -141,8 +141,8 @@
 *StringOption bar: "StringOption=bar"
 *CloseUI: *StringOption

-*CustomStringOption True/Custom String: "StringOption=Custom"
-*ParamCustomStringOption String: 1 string 1 10
+*CustomStringOption True/Custom Stringeger: "StringOption=Custom"
+*ParamCustomStringOption String: 1 string * **********

 *CloseGroup: Extended

@@ -70,7 +70,6 @@ main(int  argc,				/* I - Number of command-line arguments */
  cups_dir_t	*dir;			/* Current directory */
  cups_dentry_t	*dent;			/* Directory entry */
  char		*saved[32];		/* Saved entries */
-  void		*data;			/* User data for arrays */


 /*
@@ -85,8 +84,7 @@ main(int  argc,				/* I - Number of command-line arguments */

  fputs("cupsArrayNew: ", stdout);

-  data  = (void *)"testarray";
-  array = cupsArrayNew((cups_array_func_t)strcmp, data);
+  array = cupsArrayNew((cups_array_func_t)strcmp, NULL);

  if (array)
    puts("PASS");
@@ -96,20 +94,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    status ++;
  }

- /*
-  * cupsArrayUserData()
-  */
-
-  fputs("cupsArrayUserData: ", stdout);
-  if (cupsArrayUserData(array) == data)
-    puts("PASS");
-  else
-  {
-    printf("FAIL (returned %p instead of %p!)\n", cupsArrayUserData(array),
-           data);
-    status ++;
-  }
-
 /*
  * cupsArrayAdd()
  */
@@ -497,8 +497,8 @@ main(int  argc,				/* I - Number of command-line arguments */
        current = time(NULL);
        if (current == start) current ++;
        printf("\r" CUPS_LLFMT "/" CUPS_LLFMT " bytes ("
-	       CUPS_LLFMT " bytes/sec)      ", CUPS_LLCAST total,
-	       CUPS_LLCAST length, CUPS_LLCAST (total / (current - start)));
+	       CUPS_LLFMT " bytes/sec)      ", total, length,
+               total / (current - start));
        fflush(stdout);
      }
    }
@@ -45,23 +45,6 @@
 #endif /* WIN32 */


-/*
- * Test data...
- */
-
-static const char	*default_code =
-			"[{\n"
-			"%%BeginFeature: *PageRegion Letter\n"
-			"PageRegion=Letter\n"
-			"%%EndFeature\n"
-			"} stopped cleartomark\n"
-			"[{\n"
-			"%%BeginFeature: *InputSlot Tray\n"
-			"InputSlot=Tray\n"
-			"%%EndFeature\n"
-			"} stopped cleartomark\n";
-
-
 /*
 * 'main()' - Main entry.
 */
@@ -72,8 +55,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 {
  ppd_file_t	*ppd;			/* PPD file loaded from disk */
  int		status;			/* Status of tests (0 = success, 1 = fail) */
-  int		conflicts;		/* Number of conflicts */
-  char		*s;			/* String */


  status = 0;
@@ -94,33 +75,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    printf("FAIL (%s on line %d)\n", ppdErrorString(err), line);
  }

-  fputs("ppdMarkDefaults: ", stdout);
-  ppdMarkDefaults(ppd);
-
-  if ((conflicts = ppdConflicts(ppd)) == 0)
-    puts("PASS");
-  else
-  {
-    status ++;
-    printf("FAIL (%d conflicts)\n", conflicts);
-  }
-
-  fputs("ppdEmitString: ", stdout);
-  if ((s = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL &&
-      !strcmp(s, default_code))
-    puts("PASS");
-  else
-  {
-    printf("FAIL (%d bytes instead of %d)\n", s ? (int)strlen(s) : 0,
-           (int)strlen(default_code));
-
-    if (s)
-      puts(s);
-  }
-
-  if (s)
-    free(s);
-
  ppdClose(ppd);

  return (status);
@@ -76,20 +76,6 @@ DIV.table TABLE TH {
  border-bottom: solid thin #999999;
 }

-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 TH.label {
  padding-top: 5pt;
  text-align: right;
@@ -139,20 +139,6 @@ DIV.table TABLE TH {
  border-bottom: solid thin #999966;
 }

-DIV.figure TABLE {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-DIV.figure CAPTION {
-  caption-side: bottom;
-  font-size: 120%;
-  font-style: italic;
-  font-weight: bold;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 TH.label {
  padding-top: 5pt;
  text-align: right;
@@ -1,15 +1,15 @@
 <HTML>
 <!-- SECTION: Specifications -->
 <HEAD>
-	<TITLE>CUPS Developer Guide</TITLE>
+	<TITLE>CUPS Configuration Management Plan</TITLE>
 </HEAD>
 <BODY>

-<P>This developer guide documents the guidelines and processes we
-use when developing and maintaining the Common UNIX Printing
-System ("CUPS") and related software. Our goal is to provide
-reliable and efficient software and documentation that addresses
-the needs of our users.</P>
+<P>This configuration management plan documents the guidelines
+and processes we use when developing and maintaining the Common
+UNIX Printing System ("CUPS") and related software. Our goal is
+to provide reliable and efficient software and documentation that
+addresses the needs of our users.</P>

 <H2 CLASS="title"><A NAME="COMMUNICATION">Communication</A></H2>

@@ -5,330 +5,11 @@
 </HEAD>
 <BODY>

-<P><EM>This document is still being updated for CUPS
-1.2...</EM></P>
-
-<P>This design description documents the overall organization of
-the Common UNIX Printing System. The purpose is not to provide a
-line-by-line description of the CUPS source code, but rather to
-describe the overall architecture and location of key pieces so
-that developers can more easily understand the underlying
-operation of CUPS.</P>
-
-<H2 CLASS="title"><A NAME="INTRO">Introduction</A></H2>
-
 <P>Like most printing systems, CUPS is designed around a central
 print scheduling process that dispatches print jobs, processes
 administrative commands, provides printer status information to
-local and remote programs, and informs users as needed. <A
-HREF="#FIGURE1">Figure 1</A> shows the basic organization of
-CUPS.</P>
-
-<H3>Scheduler</H3>
-
-<P>The scheduler is a HTTP/1.1 and IPP/1.1 server application
-manages HTTP and IPP requests, printers, classes, jobs,
-subscriptions, and notifications on the system. HTTP is used for
-normal web browser services as well as IPP operation messages
-passed via HTTP POST requests with the
-<CODE>application/ipp</CODE> content type. The scheduler uses a
-series of helper Common Gateway Interface ("CGI") applications to
-provide dynamic web interfaces, and can be configured to run
-additional, site-specific programs or scripts for the web
-interface.</P>
-
-<P>The scheduler is designed as a traditional monolithic,
-single-threaded server process which runs external processes to
-do longer-term operations such as printing, notification,
-device/driver enumeration, and remote printer monitoring. While
-this design does limit the maximum number of simultaneous clients
-that can be supported on a typical system, it also keep resource
-utilization to a minimum and greatly simplifies the scheduler's
-logic.</P>
-
-<DIV CLASS="figure"><TABLE SUMMARY="CUPS Block Diagram">
-<CAPTION>Figure 1: <A NAME="FIGURE1">CUPS Block Diagram</A></CAPTION>
-<TR><TD ALIGN="CENTER"><IMG SRC="../images/cups-block-diagram.gif"
-WIDTH="768" HEIGHT="768" ALT="CUPS Block Diagram"/></TD></TR>
-</TABLE></DIV>
-
-<H4>Job Files</H4>
-
-<P>The scheduler stores job files in a <EM>spool directory</EM>,
-typically <VAR>/var/spool/cups</VAR>. Two types of files will be
-found in the spool directory: <EM>control files</EM> starting
-with the letter "c" ("c00001", "c99999", "c100000", etc.) and
-<EM>data files</EM> starting with the letter "d" ("d00001-001",
-"d99999-001", "d100000-001", etc.) Control files are IPP messages
-based on the original IPP Print-Job or Create-Job messages, while
-data files are the original print files that were submitted for
-printing. There is one control file for every job known to the
-system and 0 or more data files for each job. Data files are
-normally removed after a job has successfully printed, however
-this behavior can be configured.</P>
-
-<H4>Log Files</H4>
-
-<P>The scheduler keeps three kinds of log files which are
-normally stored in the <VAR>/var/log/cups</VAR> directory. The <A
-HREF="ref-access_log.html">access_log</A> file lists every HTTP
-and IPP request that is processed by the scheduler. The <A
-HREF="ref-error_log.html">error_log</A> file contains messages
-from the scheduler and its helper applications that can be used
-to track down problems. The <A
-HREF="ref-page_log.html">page_log</A> file lists every page that
-is printed, allowing for simple print accounting.</P>
-
-<P>Log files are rotated automatically by the scheduler when they
-reach the configured size limit, by default 1MB. If the limit is
-set to 0 then no rotation is performed in the scheduler - this
-mode is often used by Linux distributions so they can use the
-<B>logrotated(8)</B> program to rotate them instead.</P>
-
-<H4>Config Files</H4>
-
-<P>The scheduler uses several configuration files to store the
-server settings (<A HREF="ref-cupsd-conf.html">cupsd.conf</A>),
-available classes (<A
-HREF="ref-classes-conf.html">classes.conf</A>), available
-printers (<A HREF="ref-printers-conf.html">printers.conf</A>),
-current notification subscriptions (<A
-HREF="ref-subscriptions-conf.html">subscriptions.conf</A>), and
-supported file types and filters (<A
-HREF="man-mime.types.html">mime.types</A>, <A
-HREF="man-mime.convs.html">mime.convs</A>). In addition,
-PostScript Printer Description ("PPD") files or interface scripts
-are associated with each printer, and the scheduler has cache
-files for remote printers, PPD files, and current jobs to
-optimize the scheduler's startup speed and availability.</P>
-
-<H3>Berkeley Commands</H3>
-
-<P>CUPS provides the Berkeley <A HREF="man-lpc.html">lpc(8)</A>,
-<A HREF="man-lpq.html">lpq(1)</A>, <A
-HREF="man-lpr.html">lpr(1)</A>, and <A
-HREF="man-lprm.html">lprm(1)</A> commands. In general, they
-function identically to the original Berkeley commands with the
-following exceptions:</P>
-
-<OL>
-
-	<LI>The <B>lpc</B> command currently only supports the
-	"status" sub-command.</LI>
-
-	<LI>The <B>lpr</B> command does not support the format
-	modifier options "1" (TROFF font set 1), "2" (TROFF font
-	set 2), "3" (TROFF font set 3), "4" (TROFF font set 4),
-	"c" (CIFPLOT), "d" (DVI), "f" (FORTRAN), "g" (GNU plot),
-	"i" (indentation), "n" (Ditroff), "r" (Sun raster), "t"
-	(Troff), or "w" (width), as they do not map to the IPP
-	MIME media type based document formats.</LI>
-
-</OL>
-
-<H3>System V Commands</H3>
-
-<P>CUPS provides the System V <A
-HREF="man-accept.html">accept(8)</A>, <A
-HREF="man-cancel.html">cancel(1)</A>, <A
-HREF="man-lp.html">lp(1)</A>, <A
-HREF="man-lpadmin.html">lpadmin(8)</A>, <A
-HREF="man-lpmove.html">lpmove(8)</A>, <A
-HREF="man-lpstat.html">lpstat(1)</A>, and <A
-HREF="man-accept.html">reject(8)</A> commands. In general, they
-function identically to the original System V commands with the
-following exceptions:</P>
-
-<OL>
-
-	<LI>All commands may ask for a password; the System V
-	print spooler requires root access to perform
-	administration tasks, while CUPS allows for more flexible
-	configurations.</LI>
-
-	<LI>The <B>lpadmin</B> command does not implement the
-	Solaris "-A" (alert), "-F" (fault recovery), "-M" (mount
-	form/wheel), "-P" (paper list), "-S" (print wheels), "-T"
-	(type list), "-U" (dialer info), "-W" (wait), "-f" (form
-	name), "-l" (content-type list), "-s" (remote printer),
-	or "-t" (number of trays) options.</LI>
-
-</OL>
-
-<H3>CUPS Commands</H3>
-
-<P>CUPS provides the <A
-HREF="man-cupsaddsmb.html">cupsaddsmb(8)</A>, <A
-HREF="man-cupsenable.html">cupsdisable(8)</A>, <A
-HREF="man-cupsenable.html">cupsenable(8)</A>, <A
-HREF="man-cupstestppd.html">cupstestppd(1)</A>, <A
-HREF="man-lpinfo.html">lpinfo(8)</A>, and <A
-HREF="man-lppasswd.html">lppasswd(1)</A> commands. The
-<B>cupsdisable</B> and <B>cupsenable</B> commands correspond to
-the System V <B>disable</B> and <B>enable</B> commands but have
-been renamed to avoid conflicts with the <B>bash(1)</B> internal
-commands of the same name.</P>
-
-<H3>LPD Support</H3>
-
-<P>LPD client support is provided via the <A
-HREF="man-cups-lpd.html">cups-lpd(8)</A> program. Incoming LPD
-requests are accepted on TCP port 515 by the local
-<B>inetd(8)</B>, <B>launchd(8)</B>, or <B>xinetd(8)</B> process
-and forwarded to the <B>cups-lpd</B> program for conversion to
-the corresponding IPP request(s).</P>
-
-<P>The <B>cups-lpd</B> program conforms, for the most part, to
-RFC 1179: Line Printer Daemon Protocol, but does not enforce the
-privileged source port restriction specified in that document. In
-addition, the banner page and output format options are usually
-overridden via command-line options to the <B>cups-lpd</B>
-program when it is invoked by the corresponding super-daemon
-program.</P>
-
-<H3>Web Interface</H3>
-
-<P>The web interface is supported by five CGI programs. Table 1
-describes the purpose of each of the programs.</P>
-
-<DIV CLASS="table"><TABLE SUMMARY="CGI Programs">
-<CAPTION>Table 1: <A NAME="TABLE1">CGI Programs</A></CAPTION>
-<THEAD>
-<TR>
-	<TH>Program</TH>
-	<TH>Location</TH>
-	<TH>Description</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-	<TD>admin.cgi</TD>
-	<TD>/admin</TD>
-	<TD>Provides all of the administrative functions</TD>
-</TR>
-<TR>
-	<TD>classes.cgi</TD>
-	<TD>/classes</TD>
-	<TD>Lists classes and provides class management functions</TD>
-</TR>
-<TR>
-	<TD>help.cgi</TD>
-	<TD>/help</TD>
-	<TD>Provides access to on-line help documents</TD>
-</TR>
-<TR>
-	<TD>jobs.cgi</TD>
-	<TD>/jobs</TD>
-	<TD>Lists jobs and provides job management functions</TD>
-</TR>
-<TR>
-	<TD>printers.cgi</TD>
-	<TD>/printers</TD>
-	<TD>Lists printers and provides printer management functions</TD>
-</TR>
-</TBODY>
-</TABLE></DIV>
-
-<H3>Notifiers</H3>
-
-<P>Notifiers provide the means for sending event notifications
-from the scheduler. Notifiers are executed with the recipient
-information on the command-line and the event data on the
-standard input.</P>
-
-<P>The <B>mailto</B> notifier is the only notifier included with
-CUPS 1.2 and handles email notifications for the scheduler.
-Additional notifiers can be added as needed without additional
-configuration.</P>
-
-<H3>Filters</H3>
-
-<P>Filters convert job files into a printable format. Multiple
-filters are run, as needed, to convert from the job file format
-to the printable format. A filter program reads from the standard
-input or from a file if a filename is supplied. All filters must
-support a common set of options including printer name, job ID,
-username, job title, number of copies, and job options. All
-output is sent to the standard output.</P>
-
-<P>CUPS provides filters for printing text, PostScript, PDF,
-HP-GL/2, and many types of image files. CUPS also provides
-printer driver filters for HP-PCL, ESC/P, and several types of
-label printers. Additional filters can be added through the use
-of mime.convs and PPD files.</P>
-
-<H3>Port Monitors</H3>
-
-<P>Port monitors handle the device- and channel-specific data
-formatting for a printer. Port monitors use the same interface as
-filters.</P>
-
-<P>CUPS includes two port monitors: the <B>bcp</B> port monitor
-which supports the PostScript Binary Communications Protocol
-("BCP") and the <b>tbcp</b> port monitor which supports the
-PostScript Tagged Binary Communications Protocol ("TBCP").
-Additional port monitors can be added through PPD files.</P>
-
-<H3>Backends</H3>
-
-<P>Backends send print data to the printer and enumerate
-available printers/devices as needed. Backends use the same
-interface as filters.</P>
-
-<P>CUPS includes backends for parallel, serial, SCSI, USB, LPD,
-IPP, and AppSocket (JetDirect) connections. Additional backends
-can be added as needed without additional configuration.</P>
-
-<H2 CLASS="title"><A NAME="PROGRAMMING">Programming Interfaces</A></H2>
-
-<P>CUPS makes use of two general-purpose libraries to provide its
-printing services. The CUPS library provides the general
-communications and management infrastructure while the CUPS
-imaging library provides the image file and raster data
-support.</P>
-
-<H3>CUPS Libary</H3>
-
-<P>The CUPS library contains CUPS-specific convenience functions
-for queuing print jobs, getting printer information, accessing
-resources via HTTP and IPP, and manipulating PPD files. Unlike
-the rest of CUPS, the CUPS API is provided under the terms of the
-GNU LGPL so it may be used by non-GPL applications.</P>
-
-<H3>CUPS Imaging Library</H3>
-
-<P>The CUPS imaging library provides functions for managing large
-images, doing colorspace conversion and color management, scaling
-images for printing, and managing raster page streams. It is used
-by the CUPS image file filters, the PostScript RIP, and all
-raster printers drivers.</P>
-
-<!--<H2 CLASS="title">Network Printing</H2>
-
-<P>Traditionally, network printing has been one of the hardest
-things to get working under UNIX. One reason is because each
-vendor added their own extensions to the LPD protocol (the
-previous standard for network printing), making cross-platform
-printing difficult if not impossible.</P>
-
-<P>Another reason is that you have to administer every network
-printer on every client machine. In some cases you can "clone'
-the printer configuration from a "master' client to each of the
-others, but even that can be time-consuming and error-prone.
-Something better is needed.</P>
-
-<P>CUPS provides "printer browsing", which allows clients to
-automatically see and use printers from any server on a LAN.
-This means that you only need to configure the server and the
-clients will automatically see the printers and classes on
-it.</P>
-
-<P>In addition, CUPS can automatically merge multiple identical
-network printers into "implicit classes". This allows clients to
-send jobs to the implicit class and have them print on the first
-available printer or server. In addition, failsafe and
-load-balancing functions are enabled simply by defining the same
-printer on multiple servers!</P>
+local and remote programs, and informs users as needed. Figure 1
+shows the basic organization of CUPS.</P>

 <H3>Scheduler</H3>

@@ -390,7 +71,100 @@ just PostScript printers. There is one PPD file for each
 printer. PPD files for non-PostScript printers define additional
 filters through <tt>cupsFilter</tt> attributes to support
 printer drivers.</P>
-->
+
+<P ALIGN="CENTER"><IMG SRC="../images/cups-block-diagram.gif"
+WIDTH="768" HEIGHT="768" ALT="CUPS Block Diagram"/><BR>
+<I>Figure 1 - CUPS Block Diagram</I></P>
+
+<H3>CUPS API</H3>
+
+<P>The CUPS API contains CUPS-specific convenience functions for
+queuing print jobs, getting printer information, accessing
+resources via HTTP and IPP, and manipulating PPD files. Unlike
+the rest of CUPS, the CUPS API is provided under the terms of
+the GNU LGPL so it may be used by non-GPL applications.</P>
+
+<H3>Berkeley and System V Commands</H3>
+
+<P>CUPS provides the System V and Berkeley command-line
+interfaces for submitting jobs and checking the printer status.
+The <tt>lpstat</tt> and <tt>lpc status</tt> commands
+also show network printers ("printer@server") when printer
+browsing is enabled.</P>
+
+<P>The System V administation commands are supplied for managing
+printers and classes. The Berkeley printer administration tool
+(<tt>lpc</tt>) is only supported in a "read-only' mode to
+check the current status of the printer queues and
+scheduler.</P>
+
+<H3>Filters</H3>
+
+<P>A filter program reads from the standard input or from a file
+if a filename is supplied. All filters must support a common set
+of options including printer name, job ID, username, job title,
+number of copies, and job options. All output is sent to the
+standard output.</P>
+
+<P>Filters are provided for many file formats and include image
+file and PostScript raster filters that support non-PostScript
+printers. Multiple filters are run in parallel to produce the
+required output format.</P>
+
+<P>The PostScript raster filter is based on the ESP Ghostscript
+core. Instead of using the Ghostscript printer drivers, the CUPS
+filter uses a generic CUPS raster printer driver and
+CUPS-compliant front-end to support any kind of raster printer.
+This allows the same printer driver filter to be used for
+printing raster data from any filter.</P>
+
+<pre>Talk about Apple's use of CUPS...</pre>
+
+<H3>CUPS Imaging</H3>
+
+<P>The CUPS Imaging library provides functions for managing
+large images, doing colorspace conversion and color management,
+scaling images for printing, and managing raster page streams.
+It is used by the CUPS image file filters, the PostScript RIP,
+and all raster printers drivers.</P>
+
+<H3>Backends</H3>
+
+<P>A backend program is a special filter that sends print data
+to a device or network connection. Backends for parallel,
+serial, USB, LPD, IPP, and AppSocket (JetDirect) connections are
+provided in CUPS 1.2.</P>
+
+<P>SAMBA version 2.0.6 and higher includes a SMB backend
+(<tt>smbspool(1)</tt>) that can be used for printing to
+Windows.</P>
+
+<H2 CLASS="title">Network Printing</H2>
+
+<P>Traditionally, network printing has been one of the hardest
+things to get working under UNIX. One reason is because each
+vendor added their own extensions to the LPD protocol (the
+previous standard for network printing), making cross-platform
+printing difficult if not impossible.</P>
+
+<P>Another reason is that you have to administer every network
+printer on every client machine. In some cases you can "clone'
+the printer configuration from a "master' client to each of the
+others, but even that can be time-consuming and error-prone.
+Something better is needed.</P>
+
+<P>CUPS provides "printer browsing", which allows clients to
+automatically see and use printers from any server on a LAN.
+This means that you only need to configure the server and the
+clients will automatically see the printers and classes on
+it.</P>
+
+<P>In addition, CUPS can automatically merge multiple identical
+network printers into "implicit classes". This allows clients to
+send jobs to the implicit class and have them print on the first
+available printer or server. In addition, failsafe and
+load-balancing functions are enabled simply by defining the same
+printer on multiple servers!</P>

 </BODY>
 </HTML>
@@ -102,7 +102,6 @@ form-tree.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 form-tree.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 form-tree.o: ../cups/language.h ../cups/language.h ../cups/string.h
 form-tree.o: ../config.h
-gziptoany.o: ../cups/string.h ../config.h
 imagetops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 imagetops.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 imagetops.o: ../cups/language.h ../cups/language.h ../cups/string.h
@@ -121,6 +120,9 @@ pstops.o: ../cups/array.h
 raster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 raster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 raster.o: ../cups/string.h ../config.h
+rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
+rastertolabel.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
+rastertolabel.o: ../cups/language.h ../cups/string.h ../config.h raster.h
 rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 rastertoepson.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 rastertoepson.o: ../cups/language.h ../cups/ppd.h ../cups/string.h
@@ -128,314 +130,15 @@ rastertoepson.o: ../config.h raster.h
 rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 rastertohp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 rastertohp.o: ../cups/string.h ../config.h raster.h
-rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.o: ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.o: image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.o: ../cups/language.h
-testraster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.o: ../cups/language.h ../cups/string.h ../config.h
-textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.o: ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.o: ../cups/string.h ../config.h
 texttops.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 texttops.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 texttops.o: ../cups/language.h ../cups/language.h ../cups/string.h
 texttops.o: ../config.h
-# DO NOT DELETE
-
-hpgl-attr.32.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-attr.32.o: hpgl-attr.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-attr.32.o: hpgl-attr.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-attr.32.o: hpgl-attr.c  ../config.h
-hpgl-config.32.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-config.32.o: hpgl-config.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-config.32.o: hpgl-config.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-config.32.o: hpgl-config.c  ../cups/string.h ../config.h
-hpgl-main.32.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-main.32.o: hpgl-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-main.32.o: hpgl-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-main.32.o: hpgl-main.c  ../config.h
-hpgl-prolog.32.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/string.h ../config.h
-hpgl-char.32.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-char.32.o: hpgl-char.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-char.32.o: hpgl-char.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-char.32.o: hpgl-char.c  ../config.h
-hpgl-input.32.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-input.32.o: hpgl-input.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-input.32.o: hpgl-input.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-input.32.o: hpgl-input.c  ../config.h
-hpgl-polygon.32.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/string.h ../config.h
-hpgl-vector.32.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/string.h ../config.h
-image-bmp.32.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-bmp.32.o: image-bmp.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-bmp.32.o: image-bmp.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-bmp.32.o: image-bmp.c  ../cups/string.h ../config.h
-image-colorspace.32.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
-image-colorspace.32.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-colorspace.32.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-colorspace.32.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
-image-gif.32.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-gif.32.o: image-gif.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-gif.32.o: image-gif.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-gif.32.o: image-gif.c  ../cups/string.h ../config.h
-image-jpeg.32.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-jpeg.32.o: image-jpeg.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-jpeg.32.o: image-jpeg.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-jpeg.32.o: image-jpeg.c  ../cups/string.h ../config.h
-image-photocd.32.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
-image-photocd.32.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-photocd.32.o: image-photocd.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-photocd.32.o: image-photocd.c  ../cups/debug.h ../cups/string.h ../config.h
-image-pix.32.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pix.32.o: image-pix.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pix.32.o: image-pix.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pix.32.o: image-pix.c  ../cups/string.h ../config.h
-image-png.32.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-png.32.o: image-png.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-png.32.o: image-png.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-png.32.o: image-png.c  ../cups/string.h ../config.h
-image-pnm.32.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pnm.32.o: image-pnm.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pnm.32.o: image-pnm.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pnm.32.o: image-pnm.c  ../cups/string.h ../config.h
-image-sgi.32.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sgi.32.o: image-sgi.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sgi.32.o: image-sgi.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sgi.32.o: image-sgi.c  ../cups/string.h ../config.h image-sgi.h
-image-sgilib.32.o: image-sgilib.c  image-sgi.h
-image-sun.32.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sun.32.o: image-sun.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sun.32.o: image-sun.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sun.32.o: image-sun.c  ../cups/string.h ../config.h
-image-tiff.32.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-tiff.32.o: image-tiff.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-tiff.32.o: image-tiff.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-tiff.32.o: image-tiff.c  ../cups/string.h ../config.h
-image-zoom.32.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-zoom.32.o: image-zoom.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-zoom.32.o: image-zoom.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-zoom.32.o: image-zoom.c  ../cups/string.h ../config.h
-image.32.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image.32.o: image.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image.32.o: image.c  ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-image.32.o: image.c  ../config.h
-interpret.32.o: interpret.c  ../cups/string.h ../config.h raster.h ../cups/cups.h
-interpret.32.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-interpret.32.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
-raster.32.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.32.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.32.o: raster.c  ../cups/string.h ../config.h
-form-main.32.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-main.32.o: form-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-main.32.o: form-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-main.32.o: form-main.c  ../config.h
-form-ps.32.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-ps.32.o: form-ps.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-ps.32.o: form-ps.c  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-form-tree.32.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-tree.32.o: form-tree.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-tree.32.o: form-tree.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-tree.32.o: form-tree.c  ../config.h
-gziptoany.32.o: gziptoany.c  ../cups/string.h ../config.h
-imagetops.32.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.32.o: imagetops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetops.32.o: imagetops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetops.32.o: imagetops.c  ../config.h image.h raster.h
-imagetoraster.32.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.32.o: imagetoraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetoraster.32.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetoraster.32.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.32.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-common.32.o: common.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-common.32.o: common.c  ../cups/language.h ../cups/string.h ../config.h
-pstops.32.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pstops.32.o: pstops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pstops.32.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
-pstops.32.o: pstops.c  ../cups/array.h
-raster.32.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.32.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.32.o: raster.c  ../cups/string.h ../config.h
-rastertoepson.32.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertoepson.32.o: rastertoepson.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertoepson.32.o: rastertoepson.c  ../cups/language.h ../cups/ppd.h ../cups/string.h
-rastertoepson.32.o: rastertoepson.c  ../config.h raster.h
-rastertohp.32.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertohp.32.o: rastertohp.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-rastertohp.32.o: rastertohp.c  ../cups/string.h ../config.h raster.h
-rastertolabel.32.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.32.o: rastertolabel.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.32.o: rastertolabel.c  ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.32.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.32.o: testimage.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.32.o: testimage.c  ../cups/language.h
-testraster.32.o: testraster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.32.o: testraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.32.o: testraster.c  ../cups/language.h ../cups/string.h ../config.h
-textcommon.32.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.32.o: textcommon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.32.o: textcommon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.32.o: textcommon.c  ../cups/string.h ../config.h
-texttops.32.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.32.o: texttops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.32.o: texttops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.32.o: texttops.c  ../config.h
-# DO NOT DELETE
-
-hpgl-attr.64.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-attr.64.o: hpgl-attr.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-attr.64.o: hpgl-attr.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-attr.64.o: hpgl-attr.c  ../config.h
-hpgl-config.64.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-config.64.o: hpgl-config.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-config.64.o: hpgl-config.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-config.64.o: hpgl-config.c  ../cups/string.h ../config.h
-hpgl-main.64.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-main.64.o: hpgl-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-main.64.o: hpgl-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-main.64.o: hpgl-main.c  ../config.h
-hpgl-prolog.64.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/string.h ../config.h
-hpgl-char.64.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-char.64.o: hpgl-char.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-char.64.o: hpgl-char.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-char.64.o: hpgl-char.c  ../config.h
-hpgl-input.64.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-input.64.o: hpgl-input.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-input.64.o: hpgl-input.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-input.64.o: hpgl-input.c  ../config.h
-hpgl-polygon.64.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/string.h ../config.h
-hpgl-vector.64.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/string.h ../config.h
-image-bmp.64.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-bmp.64.o: image-bmp.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-bmp.64.o: image-bmp.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-bmp.64.o: image-bmp.c  ../cups/string.h ../config.h
-image-colorspace.64.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
-image-colorspace.64.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-colorspace.64.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-colorspace.64.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
-image-gif.64.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-gif.64.o: image-gif.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-gif.64.o: image-gif.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-gif.64.o: image-gif.c  ../cups/string.h ../config.h
-image-jpeg.64.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-jpeg.64.o: image-jpeg.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-jpeg.64.o: image-jpeg.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-jpeg.64.o: image-jpeg.c  ../cups/string.h ../config.h
-image-photocd.64.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
-image-photocd.64.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-photocd.64.o: image-photocd.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-photocd.64.o: image-photocd.c  ../cups/debug.h ../cups/string.h ../config.h
-image-pix.64.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pix.64.o: image-pix.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pix.64.o: image-pix.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pix.64.o: image-pix.c  ../cups/string.h ../config.h
-image-png.64.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-png.64.o: image-png.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-png.64.o: image-png.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-png.64.o: image-png.c  ../cups/string.h ../config.h
-image-pnm.64.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pnm.64.o: image-pnm.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pnm.64.o: image-pnm.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pnm.64.o: image-pnm.c  ../cups/string.h ../config.h
-image-sgi.64.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sgi.64.o: image-sgi.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sgi.64.o: image-sgi.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sgi.64.o: image-sgi.c  ../cups/string.h ../config.h image-sgi.h
-image-sgilib.64.o: image-sgilib.c  image-sgi.h
-image-sun.64.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sun.64.o: image-sun.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sun.64.o: image-sun.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sun.64.o: image-sun.c  ../cups/string.h ../config.h
-image-tiff.64.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-tiff.64.o: image-tiff.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-tiff.64.o: image-tiff.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-tiff.64.o: image-tiff.c  ../cups/string.h ../config.h
-image-zoom.64.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-zoom.64.o: image-zoom.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-zoom.64.o: image-zoom.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-zoom.64.o: image-zoom.c  ../cups/string.h ../config.h
-image.64.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image.64.o: image.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image.64.o: image.c  ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-image.64.o: image.c  ../config.h
-interpret.64.o: interpret.c  ../cups/string.h ../config.h raster.h ../cups/cups.h
-interpret.64.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-interpret.64.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
-raster.64.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.64.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.64.o: raster.c  ../cups/string.h ../config.h
-form-main.64.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-main.64.o: form-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-main.64.o: form-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-main.64.o: form-main.c  ../config.h
-form-ps.64.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-ps.64.o: form-ps.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-ps.64.o: form-ps.c  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-form-tree.64.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-tree.64.o: form-tree.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-tree.64.o: form-tree.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-tree.64.o: form-tree.c  ../config.h
-gziptoany.64.o: gziptoany.c  ../cups/string.h ../config.h
-imagetops.64.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.64.o: imagetops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetops.64.o: imagetops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetops.64.o: imagetops.c  ../config.h image.h raster.h
-imagetoraster.64.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.64.o: imagetoraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetoraster.64.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetoraster.64.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.64.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-common.64.o: common.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-common.64.o: common.c  ../cups/language.h ../cups/string.h ../config.h
-pstops.64.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pstops.64.o: pstops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pstops.64.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
-pstops.64.o: pstops.c  ../cups/array.h
-raster.64.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.64.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.64.o: raster.c  ../cups/string.h ../config.h
-rastertoepson.64.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertoepson.64.o: rastertoepson.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertoepson.64.o: rastertoepson.c  ../cups/language.h ../cups/ppd.h ../cups/string.h
-rastertoepson.64.o: rastertoepson.c  ../config.h raster.h
-rastertohp.64.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertohp.64.o: rastertohp.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-rastertohp.64.o: rastertohp.c  ../cups/string.h ../config.h raster.h
-rastertolabel.64.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.64.o: rastertolabel.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.64.o: rastertolabel.c  ../cups/language.h ../cups/string.h ../config.h raster.h
-testimage.64.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.64.o: testimage.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.64.o: testimage.c  ../cups/language.h
-testraster.64.o: testraster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.64.o: testraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.64.o: testraster.c  ../cups/language.h ../cups/string.h ../config.h
-textcommon.64.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.64.o: textcommon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.64.o: textcommon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.64.o: textcommon.c  ../cups/string.h ../config.h
-texttops.64.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.64.o: texttops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.64.o: texttops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.64.o: texttops.c  ../config.h
+textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h
+textcommon.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+textcommon.o: ../cups/file.h ../cups/language.h ../cups/language.h
+textcommon.o: ../cups/string.h ../config.h
+testraster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testraster.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testraster.o: ../cups/language.h ../cups/string.h ../config.h
+gziptoany.o: ../cups/string.h ../config.h
@@ -28,13 +28,7 @@ include ../Makedefs

 FILTERS	=	gziptoany hpgltops texttops pstops imagetops imagetoraster \
 		rastertolabel rastertoepson rastertohp
-TARGETS	=	$(FILTERS) \
-		$(LIBCUPSIMAGE) \
-		libcupsimage.a \
-		$(LIB32CUPSIMAGE) \
-		$(LIB64CUPSIMAGE) \
-		testimage \
-		testraster
+TARGETS	=	$(FILTERS) testraster

 HPGLOBJS =	hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
 		hpgl-char.o hpgl-input.o hpgl-polygon.o hpgl-vector.o
@@ -42,20 +36,18 @@ IMAGEOBJS =	image-bmp.o image-colorspace.o image-gif.o image-jpeg.o \
 		image-photocd.o image-pix.o image-png.o image-pnm.o \
 		image-sgi.o image-sgilib.o image-sun.o image-tiff.o \
 		image-zoom.o image.o interpret.o raster.o
-IMAGE32OBJS =	$(IMAGEOBJS:.o=.32.o)
-IMAGE64OBJS =	$(IMAGEOBJS:.o=.64.o)
 FORMOBJS =	form-attr.o form-main.o form-ps.o form-text.o form-tree.o
 OBJS	=	$(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
-		gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \
-		raster.o rastertoepson.o rastertohp.o rastertolabel.o \
-		testimage.o testraster.o textcommon.o texttops.o
+		imagetops.o imagetoraster.o common.o pstops.o raster.o \
+		rastertolabel.o rastertoepson.o rastertohp.o \
+		texttops.o textcommon.o testraster.o gziptoany.o


 #
 # Make all targets...
 #

-all:	$(TARGETS)
+all:	$(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a


 #
@@ -63,9 +55,8 @@ all:	$(TARGETS)
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS)
-	$(RM) libcupsimage.so libcupsimage.sl libcupsimage.dylib
-	$(RM) libcupsimage.32.so libcupsimage.64.so
+	$(RM) $(OBJS) $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
+	$(RM) `basename $(LIBCUPSIMAGE) .2` libcupsimage.dylib


 #
@@ -73,20 +64,14 @@ clean:
 #

 depend:
-	touch Dependencies.tmp
-	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
-	$(RM) Dependencies
-	cp Dependencies.tmp Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
-	$(RM) Dependencies.tmp
+	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1


 #
 # Install all targets...
 #

-install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:	all installhdrs $(INSTALLSTATIC)
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
 	for file in $(FILTERS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
@@ -117,22 +102,12 @@ installhdrs:
 	$(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
 	$(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups

-install32bit:
-	$(INSTALL_DIR) -m 755 $(LIB32DIR)
-	$(INSTALL_LIB) libcupsimage.32.so.2 $(LIB32DIR)/libcupsimage.so.2
-	$(LN) libcupsimage.so $(LIB32DIR)/libcupsimage.so.2
-
-install64bit:
-	$(INSTALL_DIR) -m 755 $(LIB64DIR)
-	$(INSTALL_LIB) libcupsimage.64.so.2 $(LIB64DIR)/libcupsimage.so.2
-	$(LN) libcupsimage.so $(LIB64DIR)/libcupsimage.so.2
-

 #
 # Uninstall all targets...
 #

-uninstall: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
 	for file in $(FILTERS); do \
 		$(RM) $(SERVERBIN)/filter/$$file; \
 	done
@@ -152,16 +127,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	$(RM) $(INCLUDEDIR)/cups/raster.h
 	-$(RMDIR) $(INCLUDEDIR)/cups

-uninstall32bit:
-	$(RM) $(LIB32DIR)/libcupsimage.so
-	$(RM) $(LIB32DIR)/libcupsimage.so.2
-	-$(RMDIR) $(LIB32DIR)
-
-uninstall64bit:
-	$(RM) $(LIB64DIR)/libcupsimage.so
-	$(RM) $(LIB64DIR)/libcupsimage.so.2
-	-$(RMDIR) $(LIB64DIR)
-

 #
 # Automatic API help files...
@@ -212,24 +177,6 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
 	$(LN) $@ `basename $@ .2`


-#
-# libcupsimage.32.so.2
-#
-
-libcupsimage.32.so.2:	$(IMAGE32OBJS)
-	echo Linking 32-bit $@...
-	$(DSO) $(C32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) -lm
-
-
-#
-# libcupsimage.64.so.2
-#
-
-libcupsimage.64.so.2:	$(IMAGE64OBJS)
-	echo Linking 64-bit $@...
-	$(DSO) $(C64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) -lm
-
-
 #
 # libcupsimage.2.dylib
 #
@@ -3,7 +3,7 @@
 *
 *   Image library test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1993-2006 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -39,18 +39,15 @@
 * 'main()' - Main entry...
 */

-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
 {
-  cups_image_t		*img;		/* Image to print */
-  cups_icspace_t	primary;	/* Primary image colorspace */
-  FILE			*out;		/* Output PPM/PGM file */
-  cups_ib_t		*line;		/* Line from file */
-  int			y,		/* Current line */
-			width,		/* Width of image */
-			height,		/* Height of image */
-			depth;		/* Depth of image */
+  image_t	*img;		/* Image to print */
+  int		primary;	/* Primary image colorspace */
+  FILE		*out;		/* Output PPM/PGM file */
+  ib_t		*line;		/* Line from file */
+  int		y;		/* Current line */


  if (argc != 3)
@@ -60,11 +57,11 @@ main(int  argc,				/* I - Number of command-line arguments */
  }

  if (strstr(argv[2], ".ppm") != NULL)
-    primary = CUPS_IMAGE_RGB;
+    primary = IMAGE_RGB;
  else
-    primary = CUPS_IMAGE_WHITE;
+    primary = IMAGE_WHITE;

-  img = cupsImageOpen(argv[1], primary, CUPS_IMAGE_WHITE, 100, 0, NULL);
+  img = ImageOpen(argv[1], primary, IMAGE_WHITE, 100, 0, NULL);

  if (!img)
  {
@@ -77,26 +74,22 @@ main(int  argc,				/* I - Number of command-line arguments */
  if (!out)
  {
    perror(argv[2]);
-    cupsImageClose(img);
+    ImageClose(img);
    return (1);
  }

-  width  = cupsImageGetWidth(img);
-  height = cupsImageGetHeight(img);
-  depth  = cupsImageGetDepth(img);
-  line   = calloc(width, depth);
+  line = calloc(img->xsize, img->colorspace);

-  fprintf(out, "P%d\n%d\n%d\n255\n",
-          cupsImageGetColorSpace(img) == CUPS_IMAGE_WHITE ? 5 : 6,
-          width, height);
+  fprintf(out, "P%d\n%d\n%d\n255\n", img->colorspace == IMAGE_WHITE ? 5 : 6,
+          img->xsize, img->ysize);

-  for (y = 0; y < height; y ++)
+  for (y = 0; y < img->ysize; y ++)
  {
-    cupsImageGetRow(img, 0, y, width, line);
-    fwrite(line, width, depth, out);
+    ImageGetRow(img, 0, y, img->xsize, line);
+    fwrite(line, img->xsize, img->colorspace, out);
  }

-  cupsImageClose(img);
+  ImageClose(img);
  fclose(out);

  return (0);
@@ -27,10 +27,6 @@
 *
 * Contents:
 *
- *   main()               - Main entry.
- *   save_messages()      - Save messages to a .po file.
- *   translate_messages() - Translate messages using Google.
- *   write_string()       - Write a quoted string to a file.
 */

 /*
@@ -241,7 +237,7 @@ translate_messages(cups_array_t *cat,	/* I - Message catalog */
    *bufptr++ = '&';
    *bufptr = '\0';

-    sprintf(length, "%d", (int)(bufptr - buffer));
+    sprintf(length, "%d", bufptr - buffer);

   /*
    * Send the request...
@@ -4,7 +4,7 @@
 \margl1440\margr1440\vieww9000\viewh8400\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS 1.1.x software that is included with MacOS X.\
+\f0\fs24 \cf0 This program installs a pre-release version of CUPS 1.2 and replaces the CUPS 1.1.x software that is included with MacOS X.\
 \

 \f1\b WARNING\
@@ -21,4 +21,4 @@ Please report all problems using the Bugs & Features page on the CUPS home page:

 \f0\b0 \
 CUPS is provided under the terms of the GNU General Public License and GNU Library General Public License. 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.\
-}
+}
@@ -189,7 +189,7 @@ cupsdAddName(cupsd_location_t *loc,	/* I - Location to add to */
  if (temp == NULL)
  {
    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to add name to location %s: %s",
-                    loc->location ? loc->location : "nil", strerror(errno));
+                    loc->location, strerror(errno));
    return;
  }

@@ -199,7 +199,7 @@ cupsdAddName(cupsd_location_t *loc,	/* I - Location to add to */
  {
    cupsdLogMessage(CUPSD_LOG_ERROR,
                    "Unable to duplicate name for location %s: %s",
-                    loc->location ? loc->location : "nil", strerror(errno));
+                    loc->location, strerror(errno));
    return;
  }

@@ -221,7 +221,7 @@ cupsdAllowHost(cupsd_location_t *loc,	/* I - Location to add to */


  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAllowHost(loc=%p(%s), name=\"%s\")",
-                  loc, loc->location ? loc->location : "nil", name);
+                  loc, loc->location, name);

  if ((temp = add_allow(loc)) == NULL)
    return;
@@ -284,9 +284,9 @@ cupsdAllowIP(cupsd_location_t *loc,	/* I - Location to add to */

  cupsdLogMessage(CUPSD_LOG_DEBUG2,
                  "cupsdAllowIP(loc=%p(%s), address=%x:%x:%x:%x, netmask=%x:%x:%x:%x)",
-		  loc, loc->location ? loc->location : "nil",
-		  address[0], address[1], address[2], address[3],
-		  netmask[0], netmask[1], netmask[2], netmask[3]);
+		  loc, loc->location, address[0], address[1], address[2],
+		  address[3], netmask[0], netmask[1], netmask[2],
+		  netmask[3]);

  if ((temp = add_allow(loc)) == NULL)
    return;
@@ -478,13 +478,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
            strlcpy(data.username, username, sizeof(data.username));
 	    strlcpy(data.password, password, sizeof(data.password));

-#  ifdef __sun
-	    pamdata.conv        = (int (*)(int, struct pam_message **,
-	                                   struct pam_response **,
-					   void *))pam_func;
-#  else
 	    pamdata.conv        = pam_func;
-#  endif /* __sun */
 	    pamdata.appdata_ptr = &data;

 #  ifdef __hpux
@@ -1254,7 +1248,7 @@ cupsdDenyHost(cupsd_location_t *loc,	/* I - Location to add to */


  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDenyHost(loc=%p(%s), name=\"%s\")",
-                  loc, loc->location ? loc->location : "nil", name);
+                  loc, loc->location, name);

  if ((temp = add_deny(loc)) == NULL)
    return;
@@ -1317,9 +1311,9 @@ cupsdDenyIP(cupsd_location_t *loc,	/* I - Location to add to */

  cupsdLogMessage(CUPSD_LOG_DEBUG,
                  "cupsdDenyIP(loc=%p(%s), address=%x:%x:%x:%x, netmask=%x:%x:%x:%x)",
-		  loc, loc->location ? loc->location : "nil",
-		  address[0], address[1], address[2], address[3],
-		  netmask[0], netmask[1], netmask[2], netmask[3]);
+		  loc, loc->location, address[0], address[1], address[2],
+		  address[3], netmask[0], netmask[1], netmask[2],
+		  netmask[3]);

  if ((temp = add_deny(loc)) == NULL)
    return;
@@ -1400,7 +1394,7 @@ cupsdFindBest(const char   *path,	/* I - Resource path */
       loc = (cupsd_location_t *)cupsArrayNext(Locations))
  {
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindBest: Location %s Limit %x",
-                    loc->location ? loc->location : "nil", loc->limit);
+                    loc->location, loc->limit);

    if (!strncmp(uri, "/printers/", 10) || !strncmp(uri, "/classes/", 9))
    {
@@ -1408,7 +1402,7 @@ cupsdFindBest(const char   *path,	/* I - Resource path */
      * Use case-insensitive comparison for queue names...
      */

-      if (loc->length > bestlen && loc->location &&
+      if (loc->length > bestlen &&
          !strncasecmp(uri, loc->location, loc->length) &&
 	  loc->location[0] == '/' &&
 	  (limit & loc->limit) != 0)
@@ -1423,7 +1417,7 @@ cupsdFindBest(const char   *path,	/* I - Resource path */
      * Use case-sensitive comparison for other URIs...
      */

-      if (loc->length > bestlen && loc->location &&
+      if (loc->length > bestlen &&
          !strncmp(uri, loc->location, loc->length) &&
 	  loc->location[0] == '/' &&
 	  (limit & loc->limit) != 0)
@@ -748,8 +748,7 @@ cupsdEncryptClient(cupsd_client_t *con)	/* I - Client to encrypt */
  gnutls_init(&(conn->session), GNUTLS_SERVER);
  gnutls_set_default_priority(conn->session);
  gnutls_credentials_set(conn->session, GNUTLS_CRD_CERTIFICATE, *credentials);
-  gnutls_transport_set_ptr(conn->session,
-                           (gnutls_transport_ptr)((long)con->http.fd));
+  gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr)con->http.fd);

  error = gnutls_handshake(conn->session);

@@ -3676,8 +3675,7 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
  }
  else
  {
-    sprintf(content_length, "CONTENT_LENGTH=" CUPS_LLFMT,
-            CUPS_LLCAST con->bytes);
+    sprintf(content_length, "CONTENT_LENGTH=" CUPS_LLFMT, con->bytes);
    snprintf(content_type, sizeof(content_type), "CONTENT_TYPE=%s",
             con->http.fields[HTTP_FIELD_CONTENT_TYPE]);

@@ -971,7 +971,7 @@ cupsdSendCUPSBrowse(cupsd_printer_t *p)	/* I - Printer to send */
 	cupsdLogMessage(CUPSD_LOG_ERROR,
 	                "cupsdSendBrowseList: sendto failed for browser "
 			"%d - %s.",
-	                (int)(b - Browsers + 1), strerror(errno));
+	                b - Browsers + 1, strerror(errno));

        if (i > 1)
 	  memmove(b, b + 1, (i - 1) * sizeof(cupsd_dirsvc_addr_t));
@@ -5124,7 +5124,7 @@ get_devices(cupsd_client_t *con)	/* I - Client connection */
  snprintf(options, sizeof(options),
           "%d+%d+%d+requested-attributes=%s",
           con->request->request.op.request_id,
-           limit ? limit->values[0].integer : 0, (int)User,
+           limit ? limit->values[0].integer : 0, User,
 	   attrs);

  if (cupsdSendCommand(con, command, options, 1))
@@ -226,7 +226,7 @@ cupsdAddEvent(
 	  ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_INTEGER,
 	                "notify-job-id", job->id);
 	  ippAddInteger(temp->attrs, IPP_TAG_EVENT_NOTIFICATION, IPP_TAG_ENUM,
-	                "job-state", job->state_value);
+	                "job-state", (int)job->state);

          if ((attr = ippFindAttribute(job->attrs, "job-name",
 	                               IPP_TAG_NAME)) != NULL)
@@ -351,10 +351,9 @@ cupsdAddSubscription(


  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "cupsdAddSubscription(mask=%x, dest=%p(%s), job=%p(%d), "
-		  "uri=\"%s\")",
-                  mask, dest, dest ? dest->name : "", job, job ? job->id : 0,
-		  uri);
+                  "cupsdAddSubscription(mask=%x(%s), dest=%p(%s), job=%p(%d), uri=\"%s\")",
+                  mask, cupsdEventName(mask), dest, dest ? dest->name : "",
+	          job, job ? job->id : 0, uri);

  if (!Subscriptions)
    Subscriptions = cupsArrayNew((cups_array_func_t)cupsd_compare_subscriptions,
@@ -572,9 +571,6 @@ cupsdEventName(
    case CUPSD_EVENT_JOB_PROGRESS :
        return ("job-progress");

-    case CUPSD_EVENT_JOB_STATE :
-        return ("job-state");
-
    case CUPSD_EVENT_JOB_STATE_CHANGED :
        return ("job-state-changed");

@@ -627,8 +623,6 @@ cupsdEventValue(const char *name)	/* I - Name of event */
    return (CUPSD_EVENT_PRINTER_CONFIG_CHANGED);
  else if (!strcmp(name, "printer-changed"))
    return (CUPSD_EVENT_PRINTER_CHANGED);
-  else if (!strcmp(name, "job-state"))
-    return (CUPSD_EVENT_JOB_STATE);
  else if (!strcmp(name, "job-created"))
    return (CUPSD_EVENT_JOB_CREATED);
  else if (!strcmp(name, "job-completed"))
@@ -149,19 +149,7 @@ esac
 # Information for the server/tests...
 #

-user="$USER"
-if test -z "$user"; then
-	if test -x /usr/ucb/whoami; then
-		user=`/usr/ucb/whoami`
-	else
-		user=`whoami`
-	fi
-
-	if test -z "$user"; then
-		user="unknown"
-	fi
-fi
-
+user=`whoami`
 port=8631
 cwd=`pwd`
 root=`dirname $cwd`
@@ -433,7 +421,7 @@ done
 # Create the test report source file...
 #

-strfile=cups-str-1.2-`date +%Y-%m-%d`-$user.html
+strfile=cups-str-1.2-`date +%Y-%m-%d`-`whoami`.html

 rm -f $strfile
 cat str-header.html >$strfile
@@ -447,7 +435,7 @@ echo "Running IPP compliance tests..."
 echo "<H1>1 - IPP Compliance Tests</H1>" >>$strfile
 echo "<P>This section provides the results to the IPP compliance tests" >>$strfile
 echo "outlined in the CUPS Software Test Plan. These tests were run on" >>$strfile
-echo `date "+%Y-%m-%d"` by $user on `hostname`. >>$strfile
+echo `date "+%Y-%m-%d"` by `whoami` on `hostname`. >>$strfile
 echo "<PRE>" >>$strfile

 fail=0
@@ -475,7 +463,7 @@ echo "Running command tests..."
 echo "<H1>2 - Command Tests</H1>" >>$strfile
 echo "<P>This section provides the results to the command tests" >>$strfile
 echo "outlined in the CUPS Software Test Plan. These tests were run on" >>$strfile
-echo `date "+%Y-%m-%d"` by $user on `hostname`. >>$strfile
+echo `date "+%Y-%m-%d"` by `whoami` on `hostname`. >>$strfile
 echo "<PRE>" >>$strfile

 for file in 5*.sh; do
@@ -30,8 +30,7 @@ mkdir -p $pkgdir/Resources
 # Install resource files into the Resources directory...
 echo Installing resource files...
 cp packaging/LICENSE.rtf $pkgdir/Resources/ReadMe.rtf
-sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
-	<packaging/WELCOME.rtf >$pkgdir/Resources/Welcome.rtf
+cp packaging/WELCOME.rtf $pkgdir/Resources/Welcome.rtf
 cp packaging/installer.tif $pkgdir/Resources/background.tif

 cat >$pkgdir/Resources/preflight <<EOF
@@ -64,14 +63,12 @@ fi
 chmod 755 $pkgdir/Resources/postflight

 # Tag the current revision in the plist and web interface files...
-for file in packaging/cups-desc.plist packaging/cups-info.plist \
-		doc/index.html doc/ja/index.html templates/header.tmpl; do
-	echo Updating $file...
-	sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
-		-e '1,$s/@CUPS_REVISION@//g' \
-		-e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \
-		<$file.in >$file
-done
+sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
+	-e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \
+	<packaging/cups-desc.plist.in >packaging/cups-desc.plist
+sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
+	-e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \
+	<packaging/cups-info.plist.in >packaging/cups-info.plist

 # Install CUPS into the Package directory...
 #make INSTALL=$topdir/install-sh BUILDROOT=$pkgdir/Package install