cups: Update to 1.7.0.

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 93a9875ac3fc1ae69066e9380ed0b86cf43ec57d..7693e15d094a2c3f6cba1fa4a7ae866430b23f28 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+#etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups
 #etc/rc0.d
@@ -43,6 +44,7 @@ usr/bin/ppdpo
 #usr/include/cups/mime.h
 #usr/include/cups/ppd.h
 #usr/include/cups/ppdc.h
+#usr/include/cups/pwg.h
 #usr/include/cups/raster.h
 #usr/include/cups/sidechannel.h
 #usr/include/cups/transcode.h
@@ -142,21 +144,28 @@ usr/share/cups/ipptool/document-letter.pdf
 usr/share/cups/ipptool/document-letter.ps
 usr/share/cups/ipptool/get-completed-jobs.test
 usr/share/cups/ipptool/get-jobs.test
+usr/share/cups/ipptool/get-notifications.test
 usr/share/cups/ipptool/get-printer-attributes.test
+usr/share/cups/ipptool/get-subscriptions.test
 usr/share/cups/ipptool/gray.jpg
 usr/share/cups/ipptool/ipp-1.1.test
 usr/share/cups/ipptool/ipp-2.0.test
 usr/share/cups/ipptool/ipp-2.1.test
 usr/share/cups/ipptool/ipp-2.2.test
+usr/share/cups/ipptool/ipp-everywhere.test
 usr/share/cups/ipptool/onepage-a4.pdf
 usr/share/cups/ipptool/onepage-a4.ps
 usr/share/cups/ipptool/onepage-letter.pdf
 usr/share/cups/ipptool/onepage-letter.ps
+usr/share/cups/ipptool/print-job-deflate.test
+usr/share/cups/ipptool/print-job-gzip.test
+usr/share/cups/ipptool/print-job.test
 usr/share/cups/ipptool/testfile.jpg
 usr/share/cups/ipptool/testfile.pcl
 usr/share/cups/ipptool/testfile.pdf
 usr/share/cups/ipptool/testfile.ps
 usr/share/cups/ipptool/testfile.txt
+usr/share/cups/ipptool/validate-job.test
 #usr/share/cups/mime
 usr/share/cups/mime/mime.convs
 usr/share/cups/mime/mime.types
@@ -479,6 +488,77 @@ 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/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/header.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
@@ -666,8 +746,10 @@ usr/share/cups/templates/subscription-canceled.tmpl
 usr/share/cups/templates/test-page.tmpl
 usr/share/cups/templates/trailer.tmpl
 usr/share/cups/templates/users.tmpl
+usr/share/cups/usb
+usr/share/cups/usb/org.cups.usb-quirks
 #usr/share/doc/cups
-#uusr/share/doc/cups/ca
+#usr/share/doc/cups/ca
 #usr/share/doc/cups/ca/index.html
 #usr/share/doc/cups/cs
 #usr/share/doc/cups/cs/index.html
@@ -750,7 +832,6 @@ usr/share/doc/cups/help
 #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
@@ -760,7 +841,6 @@ usr/share/doc/cups/help
 #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
@@ -781,6 +861,8 @@ usr/share/doc/cups/images
 #usr/share/doc/cups/images/unsel.gif
 #usr/share/doc/cups/images/wait.gif
 usr/share/doc/cups/index.html
+#usr/share/doc/cups/it
+#usr/share/doc/cups/it/index.html
 #usr/share/doc/cups/ja
 #usr/share/doc/cups/ja/index.html
 usr/share/doc/cups/robots.txt
@@ -790,6 +872,7 @@ usr/share/doc/cups/robots.txt
 #usr/share/locale/cs/cups_cs.po
 #usr/share/locale/es/cups_es.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/ru/cups_ru.po
 #usr/share/man/man1/cancel.1.gz

diff --git a/lfs/cups b/lfs/cups
index 56ada1c6aa9976d11a9666f91ee0f317580f5b2d..08b574b8116439d1aaf87b562108b37c797ae102 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.4
+VER        = 1.7.0
 
 THISAPP    = cups-$(VER)
 DL_FILE    = $(THISAPP)-source.tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 52c3df269709a4d25472cfe72ab5e856
+$(DL_FILE)_MD5 = 5ab496a2ce27017fcdb3d7ec4818a75a
 
 install : $(TARGET)
 
@@ -83,6 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --sysconfdir=/var/ipfire \
                        --localstatedir=/var \
                        --enable-libusb \
+                       --disable-dbus \
                        --disable-avahi
 
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)