Merge changes from CUPS 1.5svn-r8849.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 15 Oct 2009 18:50:47 +0000 (18:50 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 15 Oct 2009 18:50:47 +0000 (18:50 +0000)
commit4d301e694f72b03ab2b6c8189387bd7076a3a2ea
tree3fe42587c15d843dd9eba082b9519ab52f2571cd
parentb226ab99134159fff1c3192d3bf22d2652db386b
Merge changes from CUPS 1.5svn-r8849.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1725 a1ca3aef-8c08-0410-bb20-df032aa958be
87 files changed:
CHANGES.txt
Makefile
backend/ipp.c
backend/lpd.c
backend/runloop.c
backend/scsi-irix.c
backend/scsi-linux.c
backend/serial.c
backend/socket.c
backend/usb-darwin.c
backend/usb-libusb.c
backend/usb.c
berkeley/lpq.c
berkeley/lpr.c
berkeley/lprm.c
cgi-bin/admin.c
cgi-bin/ipp-var.c
configure.in
cups/adminutil.c
cups/api-filter.shtml
cups/http-support.c
cups/localize.c
cups/util.c
desktop/Makefile [new file with mode: 0644]
desktop/cups.conf [new file with mode: 0644]
doc/help/api-filter.html
driver/rastertoescpx.c
driver/rastertopclx.c
filter/bannertops.c
filter/hpgl-input.c
filter/imagetops.c
filter/imagetoraster.c
filter/pstops.c
filter/rastertoepson.c
filter/rastertohp.c
filter/rastertolabel.c
filter/textcommon.c
filter/texttops.c
locale/cups.pot
locale/cups_da.po
locale/cups_de.po
locale/cups_es.po
locale/cups_eu.po
locale/cups_fi.po
locale/cups_fr.po
locale/cups_it.po
locale/cups_ja.po
locale/cups_ko.po
locale/cups_nl.po
locale/cups_no.po
locale/cups_pl.po
locale/cups_pt.po
locale/cups_pt_BR.po
locale/cups_ru.po
locale/cups_sv.po
locale/cups_zh.po
locale/cups_zh_TW.po
packaging/cups-dbus.conf
ppdc/ppdc-catalog.cxx
ppdc/ppdc-driver.cxx
ppdc/ppdc-source.cxx
ppdc/ppdmerge.cxx
scheduler/Makefile
scheduler/cups-lpd.xinetd.in [moved from init/cups-lpd.in with 100% similarity]
scheduler/cups.sh.in [moved from init/cups.sh.in with 97% similarity, mode: 0644]
scheduler/cups.xml.in [moved from init/cups.xml.in with 100% similarity]
scheduler/cupsfilter.c
scheduler/ipp.c
scheduler/job.c
scheduler/main.c
scheduler/org.cups.cups-lpd.plist.in [moved from init/org.cups.cups-lpd.plist.in with 100% similarity]
scheduler/org.cups.cupsd.plist [moved from init/org.cups.cupsd.plist with 100% similarity]
scheduler/printers.c
scheduler/process.c
systemv/cancel.c
systemv/cupsaccept.c
systemv/cupsaddsmb.c
systemv/cupsctl.c
systemv/cupstestdsc.c
systemv/cupstestppd.c
systemv/lp.c
systemv/lpadmin.c
systemv/lpinfo.c
systemv/lpmove.c
systemv/lpoptions.c
systemv/lppasswd.c
systemv/lpstat.c