Merge changes from CUPS 1.4svn-r7961.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 17 Sep 2008 19:54:07 +0000 (19:54 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Wed, 17 Sep 2008 19:54:07 +0000 (19:54 +0000)
commitb19ccc9e271691cc71a08e9968c58f464ebeade5
tree222499e15a781dcecfe0681b23825003d78caa8b
parent49d8745278805ede5c41bae3c299e14ba40457bf
Merge changes from CUPS 1.4svn-r7961.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be
194 files changed:
CHANGES-1.3.txt
CHANGES.txt
Makedefs.in
Makefile
backend/Makefile
backend/backend-private.h
backend/ipp.c
backend/lpd.c
backend/pap.c
backend/parallel.c
backend/runloop.c
backend/snmp.c
backend/socket.c
backend/usb-darwin.c
backend/usb-unix.c
berkeley/Makefile
berkeley/lpr.c
cgi-bin/Makefile
cgi-bin/admin.c
cgi-bin/cgi-private.h
cgi-bin/classes.c
cgi-bin/help-index.c
cgi-bin/help.c
cgi-bin/ipp-var.c
cgi-bin/printers.c
cgi-bin/search.c
conf/Makefile
conf/cupsd.conf.in
conf/pam.opendirectory [new file with mode: 0644]
conf/pam.securityserver [moved from conf/pam.darwin with 100% similarity]
config-scripts/cups-common.m4
config-scripts/cups-compiler.m4
config-scripts/cups-defaults.m4
config-scripts/cups-directories.m4
config-scripts/cups-dnssd.m4
config-scripts/cups-ldap.m4
config-scripts/cups-network.m4
config-scripts/cups-pam.m4
config-scripts/cups-scripting.m4
config.h.in
configure.in
cups/Makefile
cups/adminutil.c
cups/auth.c
cups/backend.h
cups/cups.h
cups/debug.h
cups/dest.c
cups/emit.c
cups/globals.c
cups/globals.h
cups/http-addr.c
cups/http-addrlist.c
cups/http-private.h
cups/http-support.c
cups/http.c
cups/ipp.c
cups/ipp.h
cups/langprintf.c
cups/mark.c
cups/options.c
cups/page.c
cups/ppd.c
cups/ppd.h
cups/request.c
cups/sidechannel.c
cups/test.ppd
cups/test2.ppd
cups/testadmin.c
cups/testfile.c
cups/testhttp.c
cups/testppd.c
cups/util.c
data/Makefile
desktop/cups-128.png
desktop/cups-16.png
desktop/cups-256.png
desktop/cups-32.png
desktop/cups-512.png
desktop/cups-64.png
desktop/cups.icns
desktop/cups.svg
doc/Makefile
doc/cups.css
doc/favicon.png
doc/help/ref-cupsd-conf.html.in
doc/help/spec-browsing.html [new file with mode: 0644]
doc/help/spec-ipp.html
doc/help/spec-ppd.html
doc/images/classes.png [deleted file]
doc/images/classes.svg [deleted file]
doc/images/cups-icon.png
doc/images/cups.png
doc/images/cups.svg
doc/images/left.gif
doc/images/left.xcf.gz
doc/images/printer-idle.png [deleted file]
doc/images/printer-idle.svg [deleted file]
doc/images/printer-processing.png [deleted file]
doc/images/printer-processing.svg [deleted file]
doc/images/printer-stopped.png [deleted file]
doc/images/printer-stopped.svg [deleted file]
doc/index.html.in
filter/Makefile
filter/image-colorspace.c
filter/image-gif.c
filter/interpret.c
filter/pstops.c
filter/raster.c
filter/rastertohp.c
filter/rastertolabel.c
filter/texttops.c
fonts/Makefile
locale/Makefile
locale/strings2po.c
locale/translate.c
man/Makefile
man/backend.man
man/cups-lpd.man.in
man/cupsaccept.man
man/cupsd.conf.man.in
man/cupsfilter.man
man/lp.man
man/lpoptions.man.in
man/lpr.man
man/lpstat.man
man/mantohtml.c
monitor/Makefile
notifier/Makefile
notifier/rss.c
packaging/cups.list.in
packaging/cups.spec.in
packaging/installer.gif
packaging/installer.tif
scheduler/Makefile
scheduler/auth.c
scheduler/classes.c
scheduler/client.c
scheduler/client.h
scheduler/conf.c
scheduler/conf.h
scheduler/cups-deviced.c
scheduler/cups-lpd.c
scheduler/cupsd.h
scheduler/cupsfilter.c
scheduler/dirsvc.c
scheduler/dirsvc.h
scheduler/ipp.c
scheduler/job.c
scheduler/job.h
scheduler/listen.c
scheduler/log.c
scheduler/main.c
scheduler/network.c
scheduler/printers.c
scheduler/removefile.c
scheduler/select.c
scheduler/server.c
scheduler/subscriptions.c
scheduler/subscriptions.h
scheduler/sysman.c
scheduler/sysman.h
scheduler/testspeed.c
scheduler/type.c
scheduler/util.h
standards/Makefile
standards/rfc4234.txt [new file with mode: 0644]
systemv/Makefile
systemv/accept.c
systemv/cancel.c
systemv/cupstestdsc.c
systemv/cupstestppd.c
systemv/lpadmin.c
systemv/lpinfo.c
systemv/lpoptions.c
systemv/lpstat.c
templates/Makefile
templates/admin.tmpl
templates/class-jobs-header.tmpl
templates/class.tmpl [new file with mode: 0644]
templates/classes.tmpl
templates/help-header.tmpl
templates/help-trailer.tmpl [new file with mode: 0644]
templates/jobs-header.tmpl
templates/jobs.tmpl
templates/pager.tmpl
templates/printer-jobs-header.tmpl
templates/printer.tmpl [new file with mode: 0644]
templates/printers.tmpl
templates/search.tmpl
test/Makefile
test/ipptest.c
test/run-stp-tests.sh
tools/makesrcdist