Updated cups to the latest stable, this should fix some bugs.
authorChristian Schmidt <christian.schmidt@ipfire.org>
Fri, 17 Sep 2010 08:01:14 +0000 (10:01 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Fri, 17 Sep 2010 08:01:14 +0000 (10:01 +0200)
config/rootfiles/packages/cups
lfs/cups

index 4ed85c6..386e582 100644 (file)
@@ -446,6 +446,147 @@ usr/share/cups/templates/header.tmpl
 usr/share/cups/templates/help-header.tmpl
 usr/share/cups/templates/help-printable.tmpl
 usr/share/cups/templates/help-trailer.tmpl
+#usr/share/cups/templates/id
+#usr/share/cups/templates/id/add-class.tmpl
+#usr/share/cups/templates/id/add-printer.tmpl
+#usr/share/cups/templates/id/add-rss-subscription.tmpl
+#usr/share/cups/templates/id/admin.tmpl
+#usr/share/cups/templates/id/choose-device.tmpl
+#usr/share/cups/templates/id/choose-make.tmpl
+#usr/share/cups/templates/id/choose-model.tmpl
+#usr/share/cups/templates/id/choose-serial.tmpl
+#usr/share/cups/templates/id/choose-uri.tmpl
+#usr/share/cups/templates/id/class-added.tmpl
+#usr/share/cups/templates/id/class-confirm.tmpl
+#usr/share/cups/templates/id/class-deleted.tmpl
+#usr/share/cups/templates/id/class-jobs-header.tmpl
+#usr/share/cups/templates/id/class-modified.tmpl
+#usr/share/cups/templates/id/class.tmpl
+#usr/share/cups/templates/id/classes-header.tmpl
+#usr/share/cups/templates/id/classes.tmpl
+#usr/share/cups/templates/id/command.tmpl
+#usr/share/cups/templates/id/edit-config.tmpl
+#usr/share/cups/templates/id/error-op.tmpl
+#usr/share/cups/templates/id/error.tmpl
+#usr/share/cups/templates/id/header.tmpl
+#usr/share/cups/templates/id/help-header.tmpl
+#usr/share/cups/templates/id/help-printable.tmpl
+#usr/share/cups/templates/id/help-trailer.tmpl
+#usr/share/cups/templates/id/job-cancel.tmpl
+#usr/share/cups/templates/id/job-hold.tmpl
+#usr/share/cups/templates/id/job-move.tmpl
+#usr/share/cups/templates/id/job-moved.tmpl
+#usr/share/cups/templates/id/job-release.tmpl
+#usr/share/cups/templates/id/job-restart.tmpl
+#usr/share/cups/templates/id/jobs-header.tmpl
+#usr/share/cups/templates/id/jobs.tmpl
+#usr/share/cups/templates/id/list-available-printers.tmpl
+#usr/share/cups/templates/id/modify-class.tmpl
+#usr/share/cups/templates/id/modify-printer.tmpl
+#usr/share/cups/templates/id/norestart.tmpl
+#usr/share/cups/templates/id/option-boolean.tmpl
+#usr/share/cups/templates/id/option-conflict.tmpl
+#usr/share/cups/templates/id/option-header.tmpl
+#usr/share/cups/templates/id/option-pickmany.tmpl
+#usr/share/cups/templates/id/option-pickone.tmpl
+#usr/share/cups/templates/id/option-trailer.tmpl
+#usr/share/cups/templates/id/pager.tmpl
+#usr/share/cups/templates/id/printer-accept.tmpl
+#usr/share/cups/templates/id/printer-added.tmpl
+#usr/share/cups/templates/id/printer-configured.tmpl
+#usr/share/cups/templates/id/printer-confirm.tmpl
+#usr/share/cups/templates/id/printer-default.tmpl
+#usr/share/cups/templates/id/printer-deleted.tmpl
+#usr/share/cups/templates/id/printer-jobs-header.tmpl
+#usr/share/cups/templates/id/printer-modified.tmpl
+#usr/share/cups/templates/id/printer-purge.tmpl
+#usr/share/cups/templates/id/printer-reject.tmpl
+#usr/share/cups/templates/id/printer-start.tmpl
+#usr/share/cups/templates/id/printer-stop.tmpl
+#usr/share/cups/templates/id/printer.tmpl
+#usr/share/cups/templates/id/printers-header.tmpl
+#usr/share/cups/templates/id/printers.tmpl
+#usr/share/cups/templates/id/restart.tmpl
+#usr/share/cups/templates/id/samba-export.tmpl
+#usr/share/cups/templates/id/samba-exported.tmpl
+#usr/share/cups/templates/id/search.tmpl
+#usr/share/cups/templates/id/set-printer-options-header.tmpl
+#usr/share/cups/templates/id/set-printer-options-trailer.tmpl
+#usr/share/cups/templates/id/subscription-added.tmpl
+#usr/share/cups/templates/id/subscription-canceled.tmpl
+#usr/share/cups/templates/id/test-page.tmpl
+#usr/share/cups/templates/id/trailer.tmpl
+#usr/share/cups/templates/id/users.tmpl
+#usr/share/cups/templates/it
+#usr/share/cups/templates/it/add-class.tmpl
+#usr/share/cups/templates/it/add-printer.tmpl
+#usr/share/cups/templates/it/add-rss-subscription.tmpl
+#usr/share/cups/templates/it/admin.tmpl
+#usr/share/cups/templates/it/choose-device.tmpl
+#usr/share/cups/templates/it/choose-make.tmpl
+#usr/share/cups/templates/it/choose-model.tmpl
+#usr/share/cups/templates/it/choose-serial.tmpl
+#usr/share/cups/templates/it/choose-uri.tmpl
+#usr/share/cups/templates/it/class-added.tmpl
+#usr/share/cups/templates/it/class-confirm.tmpl
+#usr/share/cups/templates/it/class-deleted.tmpl
+#usr/share/cups/templates/it/class-jobs-header.tmpl
+#usr/share/cups/templates/it/class-modified.tmpl
+#usr/share/cups/templates/it/class.tmpl
+#usr/share/cups/templates/it/classes-header.tmpl
+#usr/share/cups/templates/it/classes.tmpl
+#usr/share/cups/templates/it/command.tmpl
+#usr/share/cups/templates/it/edit-config.tmpl
+#usr/share/cups/templates/it/error-op.tmpl
+#usr/share/cups/templates/it/error.tmpl
+#usr/share/cups/templates/it/help-header.tmpl
+#usr/share/cups/templates/it/help-printable.tmpl
+#usr/share/cups/templates/it/help-trailer.tmpl
+#usr/share/cups/templates/it/job-cancel.tmpl
+#usr/share/cups/templates/it/job-hold.tmpl
+#usr/share/cups/templates/it/job-move.tmpl
+#usr/share/cups/templates/it/job-moved.tmpl
+#usr/share/cups/templates/it/job-release.tmpl
+#usr/share/cups/templates/it/job-restart.tmpl
+#usr/share/cups/templates/it/jobs-header.tmpl
+#usr/share/cups/templates/it/jobs.tmpl
+#usr/share/cups/templates/it/list-available-printers.tmpl
+#usr/share/cups/templates/it/modify-class.tmpl
+#usr/share/cups/templates/it/modify-printer.tmpl
+#usr/share/cups/templates/it/norestart.tmpl
+#usr/share/cups/templates/it/option-boolean.tmpl
+#usr/share/cups/templates/it/option-conflict.tmpl
+#usr/share/cups/templates/it/option-header.tmpl
+#usr/share/cups/templates/it/option-pickmany.tmpl
+#usr/share/cups/templates/it/option-pickone.tmpl
+#usr/share/cups/templates/it/option-trailer.tmpl
+#usr/share/cups/templates/it/pager.tmpl
+#usr/share/cups/templates/it/printer-accept.tmpl
+#usr/share/cups/templates/it/printer-added.tmpl
+#usr/share/cups/templates/it/printer-configured.tmpl
+#usr/share/cups/templates/it/printer-confirm.tmpl
+#usr/share/cups/templates/it/printer-default.tmpl
+#usr/share/cups/templates/it/printer-deleted.tmpl
+#usr/share/cups/templates/it/printer-jobs-header.tmpl
+#usr/share/cups/templates/it/printer-modified.tmpl
+#usr/share/cups/templates/it/printer-purge.tmpl
+#usr/share/cups/templates/it/printer-reject.tmpl
+#usr/share/cups/templates/it/printer-start.tmpl
+#usr/share/cups/templates/it/printer-stop.tmpl
+#usr/share/cups/templates/it/printer.tmpl
+#usr/share/cups/templates/it/printers-header.tmpl
+#usr/share/cups/templates/it/printers.tmpl
+#usr/share/cups/templates/it/restart.tmpl
+#usr/share/cups/templates/it/samba-export.tmpl
+#usr/share/cups/templates/it/samba-exported.tmpl
+#usr/share/cups/templates/it/search.tmpl
+#usr/share/cups/templates/it/set-printer-options-header.tmpl
+#usr/share/cups/templates/it/set-printer-options-trailer.tmpl
+#usr/share/cups/templates/it/subscription-added.tmpl
+#usr/share/cups/templates/it/subscription-canceled.tmpl
+#usr/share/cups/templates/it/test-page.tmpl
+#usr/share/cups/templates/it/trailer.tmpl
+#usr/share/cups/templates/it/users.tmpl
 #usr/share/cups/templates/ja
 #usr/share/cups/templates/ja/add-class.tmpl
 #usr/share/cups/templates/ja/add-printer.tmpl
@@ -741,164 +882,4 @@ usr/share/doc/cups/help
 #usr/share/doc/cups/help/man-cupsd.html
 #usr/share/doc/cups/help/man-cupsenable.html
 #usr/share/doc/cups/help/man-cupstestdsc.html
-#usr/share/doc/cups/help/man-cupstestppd.html
-#usr/share/doc/cups/help/man-drv.html
-#usr/share/doc/cups/help/man-filter.html
-#usr/share/doc/cups/help/man-lp.html
-#usr/share/doc/cups/help/man-lpadmin.html
-#usr/share/doc/cups/help/man-lpc.html
-#usr/share/doc/cups/help/man-lpinfo.html
-#usr/share/doc/cups/help/man-lpmove.html
-#usr/share/doc/cups/help/man-lpoptions.html
-#usr/share/doc/cups/help/man-lppasswd.html
-#usr/share/doc/cups/help/man-lpq.html
-#usr/share/doc/cups/help/man-lpr.html
-#usr/share/doc/cups/help/man-lprm.html
-#usr/share/doc/cups/help/man-lpstat.html
-#usr/share/doc/cups/help/man-mime.convs.html
-#usr/share/doc/cups/help/man-mime.types.html
-#usr/share/doc/cups/help/man-notifier.html
-#usr/share/doc/cups/help/man-ppdc.html
-#usr/share/doc/cups/help/man-ppdhtml.html
-#usr/share/doc/cups/help/man-ppdi.html
-#usr/share/doc/cups/help/man-ppdmerge.html
-#usr/share/doc/cups/help/man-ppdpo.html
-#usr/share/doc/cups/help/network.html
-#usr/share/doc/cups/help/options.html
-#usr/share/doc/cups/help/overview.html
-#usr/share/doc/cups/help/policies.html
-#usr/share/doc/cups/help/postscript-driver.html
-#usr/share/doc/cups/help/ppd-compiler.html
-#usr/share/doc/cups/help/raster-driver.html
-#usr/share/doc/cups/help/ref-access_log.html
-#usr/share/doc/cups/help/ref-classes-conf.html
-#usr/share/doc/cups/help/ref-client-conf.html
-#usr/share/doc/cups/help/ref-cupsd-conf.html
-#usr/share/doc/cups/help/ref-error_log.html
-#usr/share/doc/cups/help/ref-mailto-conf.html
-#usr/share/doc/cups/help/ref-page_log.html
-#usr/share/doc/cups/help/ref-ppdcfile.html
-#usr/share/doc/cups/help/ref-printers-conf.html
-#usr/share/doc/cups/help/ref-snmp-conf.html
-#usr/share/doc/cups/help/ref-subscriptions-conf.html
-#usr/share/doc/cups/help/security.html
-#usr/share/doc/cups/help/sharing.html
-#usr/share/doc/cups/help/spec-banner.html
-#usr/share/doc/cups/help/spec-browsing.html
-#usr/share/doc/cups/help/spec-cmp.html
-#usr/share/doc/cups/help/spec-command.html
-#usr/share/doc/cups/help/spec-design.html
-#usr/share/doc/cups/help/spec-ipp.html
-#usr/share/doc/cups/help/spec-pdf.html
-#usr/share/doc/cups/help/spec-postscript.html
-#usr/share/doc/cups/help/spec-ppd.html
-#usr/share/doc/cups/help/spec-raster.html
-#usr/share/doc/cups/help/spec-stp.html
-#usr/share/doc/cups/help/standard.html
-#usr/share/doc/cups/help/translation.html
-#usr/share/doc/cups/help/whatsnew.html
-usr/share/doc/cups/images
-#usr/share/doc/cups/images/color-wheel.png
-#usr/share/doc/cups/images/cups-block-diagram.png
-#usr/share/doc/cups/images/cups-command-chain.png
-#usr/share/doc/cups/images/cups-icon.png
-#usr/share/doc/cups/images/cups-postscript-chain.png
-#usr/share/doc/cups/images/cups-raster-chain.png
-#usr/share/doc/cups/images/cups.png
-#usr/share/doc/cups/images/left.gif
-#usr/share/doc/cups/images/raster.png
-#usr/share/doc/cups/images/right.gif
-#usr/share/doc/cups/images/sel.gif
-#usr/share/doc/cups/images/smiley.jpg
-#usr/share/doc/cups/images/unsel.gif
-#usr/share/doc/cups/images/wait.gif
-usr/share/doc/cups/index.html
-#usr/share/doc/cups/ja
-#usr/share/doc/cups/ja/index.html
-#usr/share/doc/cups/pl
-#usr/share/doc/cups/pl/index.html
-usr/share/doc/cups/robots.txt
-#usr/share/doc/cups/ru
-#usr/share/doc/cups/ru/index.html
-#usr/share/locale/da/cups_da.po
-#usr/share/locale/de/cups_de.po
-#usr/share/locale/es/cups_es.po
-#usr/share/locale/eu/cups_eu.po
-#usr/share/locale/fi/cups_fi.po
-#usr/share/locale/fr/cups_fr.po
-#usr/share/locale/it/cups_it.po
-#usr/share/locale/ja/cups_ja.po
-#usr/share/locale/ko/cups_ko.po
-#usr/share/locale/nl/cups_nl.po
-#usr/share/locale/no/cups_no.po
-#usr/share/locale/pl/cups_pl.po
-#usr/share/locale/pt/cups_pt.po
-#usr/share/locale/pt_BR/cups_pt_BR.po
-#usr/share/locale/ru/cups_ru.po
-#usr/share/locale/sv/cups_sv.po
-#usr/share/locale/zh
-#usr/share/locale/zh/cups_zh.po
-#usr/share/locale/zh_TW/cups_zh_TW.po
-#usr/share/man/man1/cancel.1.gz
-#usr/share/man/man1/cups-config.1.gz
-#usr/share/man/man1/cupstestdsc.1.gz
-#usr/share/man/man1/cupstestppd.1.gz
-#usr/share/man/man1/lp.1.gz
-#usr/share/man/man1/lpoptions.1.gz
-#usr/share/man/man1/lppasswd.1.gz
-#usr/share/man/man1/lpq.1.gz
-#usr/share/man/man1/lpr.1.gz
-#usr/share/man/man1/lprm.1.gz
-#usr/share/man/man1/lpstat.1.gz
-#usr/share/man/man1/ppdc.1.gz
-#usr/share/man/man1/ppdhtml.1.gz
-#usr/share/man/man1/ppdi.1.gz
-#usr/share/man/man1/ppdmerge.1.gz
-#usr/share/man/man1/ppdpo.1.gz
-#usr/share/man/man5/classes.conf.5.gz
-#usr/share/man/man5/client.conf.5.gz
-#usr/share/man/man5/cups-snmp.conf.5.gz
-#usr/share/man/man5/cupsd.conf.5.gz
-#usr/share/man/man5/mailto.conf.5.gz
-#usr/share/man/man5/mime.convs.5.gz
-#usr/share/man/man5/mime.types.5.gz
-#usr/share/man/man5/ppdcfile.5.gz
-#usr/share/man/man5/printers.conf.5.gz
-#usr/share/man/man5/subscriptions.conf.5.gz
-#usr/share/man/man7/backend.7.gz
-#usr/share/man/man7/drv.7.gz
-#usr/share/man/man7/filter.7.gz
-#usr/share/man/man7/notifier.7.gz
-#usr/share/man/man8/accept.8.gz
-#usr/share/man/man8/cups-deviced.8.gz
-#usr/share/man/man8/cups-driverd.8.gz
-#usr/share/man/man8/cups-lpd.8.gz
-#usr/share/man/man8/cups-polld.8.gz
-#usr/share/man/man8/cupsaccept.8.gz
-#usr/share/man/man8/cupsaddsmb.8.gz
-#usr/share/man/man8/cupsctl.8.gz
-#usr/share/man/man8/cupsd.8.gz
-#usr/share/man/man8/cupsdisable.8.gz
-#usr/share/man/man8/cupsenable.8.gz
-#usr/share/man/man8/cupsfilter.8.gz
-#usr/share/man/man8/cupsreject.8.gz
-#usr/share/man/man8/lpadmin.8.gz
-#usr/share/man/man8/lpc.8.gz
-#usr/share/man/man8/lpinfo.8.gz
-#usr/share/man/man8/lpmove.8.gz
-#usr/share/man/man8/reject.8.gz
-var/cache/cups
-#var/cache/cups/rss
-#var/ipfire/cups
-var/ipfire/cups/cupsd.conf
-#var/ipfire/cups/cupsd.conf.default
-var/ipfire/cups/interfaces
-var/ipfire/cups/ppd
-var/ipfire/cups/snmp.conf
-var/ipfire/cups/ssl
-var/log/cups
-var/run/cups
-var/run/cups/certs
-var/spool/cups
-var/spool/cups/tmp
-etc/rc.d/init.d/cups
+#usr/
\ No newline at end of file
index 938037b..e8d9cc0 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.2
+VER        = 1.4.4
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "ghostscript"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d95e2d588e3d36e563027a963b117b1b
+$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d
 
 install : $(TARGET)