Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@13 a1ca3aef-8c08-0410-bb20-df032aa958be

4 files changed, 6 insertions, 192 deletions

diff --git a/conf/Makefile b/conf/Makefile
index fe060d9c9..684693806 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 4664 2005-09-17 22:56:56Z mike $"
+# "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2005 by Easy Software Products.
+#   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -28,7 +28,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP	=	classes.conf client.conf cupsd.conf printers.conf
+KEEP	=	client.conf cupsd.conf
 REPLACE	=	mime.convs mime.types
 
 
@@ -50,7 +50,7 @@ clean:
 # Install files...
 #
 
-install:
+install:	all
 	$(INSTALL_DIR) $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
@@ -59,6 +59,7 @@ install:
 			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 		fi ; \
 	done
+	$(INSTALL_DATA) cupsd.conf $(SERVERROOT)/cupsd.conf.default
 	for file in $(REPLACE); do \
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
@@ -76,5 +77,5 @@ install:
 
 
 #
-# End of "$Id: Makefile 4664 2005-09-17 22:56:56Z mike $".
+# End of "$Id: Makefile 4972 2006-01-24 14:48:12Z mike $".
 #
diff --git a/conf/classes.conf b/conf/classes.conf
deleted file mode 100644
index 408796883..000000000
--- a/conf/classes.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# "$Id: classes.conf 4494 2005-02-18 02:18:11Z mike $"
-#
-#   Sample class configuration file for the Common UNIX Printing System
-#   (CUPS) scheduler.
-#
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is a sample class configuration file.  This file is included    #
-# from the main configuration file (cups.conf) and lists all of the    #
-# printer classes known to the system.                                 #
-#                                                                      #
-########################################################################
-
-#
-# Each class starts with a <Class name> definition.  Class names
-# can be up to 128 characters in length and are *not* case sensitive.
-#
-# One <DefaultClass name> entry can appear in this file; if you don't
-# define a default destination, the first printer or class becomes
-# the default.
-#
-
-#<Class sample>
-#
-# Info: the description for the class.
-#
-
-#Info Acme LaserPrint 1000 Printers
-
-#
-# Location: the location of the printer.
-#
-
-#Location Room 101 in the activities building
-
-#
-# State: sets the initial state of the class.  Can be one of the
-# following:
-#
-#     Idle    - Class is available to print new jobs.
-#     Stopped - Class is disabled but accepting new jobs.
-#
-
-#State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the class.
-#
-
-#StateMessage Class is idle.
-
-#
-# Accepting: is the class accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-#
-
-#
-# Printer: adds a printer to the class.
-#
-
-#Printer sample
-#Printer sample@host2
-#</Class>
-
-#
-# End of "$Id: classes.conf 4494 2005-02-18 02:18:11Z mike $".
-#
diff --git a/conf/printcap b/conf/printcap
deleted file mode 100644
index 230c3017d..000000000
--- a/conf/printcap
+++ /dev/null
@@ -1,2 +0,0 @@
-# This is a dummy printcap file that is automatically generated by the
-# CUPS software for old applications that rely on it.
diff --git a/conf/printers.conf b/conf/printers.conf
deleted file mode 100644
index 3848459c9..000000000
--- a/conf/printers.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# "$Id: printers.conf 4494 2005-02-18 02:18:11Z mike $"
-#
-#   Sample printer configuration file for the Common UNIX Printing System
-#   (CUPS) scheduler.
-#
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is a sample printer configuration file.  This file is included  #
-# from the main configuration file (cups.conf) and lists all of the    #
-# printers known to the system.                                        #
-#                                                                      #
-########################################################################
-
-#
-# Each printer starts with a <Printer name> definition.  Printer names
-# can be up to 128 characters in length and are *not* case sensitive.
-#
-# One <DefaultPrinter name> entry can appear in this file; if you don't
-# define a default destination, the first printer or class becomes the
-# default.
-#
-
-#<Printer sample>
-#
-# Info: the description for the printer.
-#
-
-#Info Acme LaserPrint 1000
-
-#
-# Location: the location of the printer.
-#
-
-#Location Room 101 in the activities building
-
-#
-# DeviceURI: the device URI for this printer.
-#
-
-#DeviceURI parallel:/dev/plp
-#DeviceURI serial:/dev/ttyd1?baud=38400+size=8+parity=none+flow=soft
-#DeviceURI scsi:/dev/scsi/sc1d6l0
-#DeviceURI socket://hostname:port
-#DeviceURI tftp://hostname/path
-#DeviceURI ftp://hostname/path
-#DeviceURI http://hostname[:port]/path
-#DeviceURI ipp://hostname/path
-#DeviceURI smb://hostname/printer
-
-#
-# State: sets the initial state of the printer.  Can be one of the
-# following:
-#
-#     Idle    - Printer is available to print new jobs.
-#     Stopped - Printer is disabled but accepting new jobs.
-#
-
-#State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the printer.
-#
-
-#StateMessage Printer is idle.
-
-#
-# Accepting: is the printer accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-
-#</Printer>
-
-#
-# End of "$Id: printers.conf 4494 2005-02-18 02:18:11Z mike $".
-#