Update to CUPS 1.2.5, this fixes a handful of bugs. Remove one patch that
was applied upstream.
This commit is contained in:
mbalmer
parent
7bdea5013c
commit
9d690dfd6f
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2006/10/07 14:03:09 mbalmer Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2006/10/21 10:58:24 mbalmer Exp $
|
||||
|
||||
COMMENT= "Common Unix Printing System"
|
||||
|
||||
VERSION= 1.2.4
|
||||
VERSION= 1.2.5
|
||||
DISTNAME= cups-${VERSION}-source
|
||||
PKGNAME= ${DISTNAME:S/-source//}p3
|
||||
PKGNAME= ${DISTNAME:S/-source//}
|
||||
CATEGORIES= print sysutils
|
||||
SHARED_LIBS= cups 2.3 \
|
||||
cupsimage 2.3
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (cups-1.2.4-source.tar.bz2) = 528650aba3b56541f75370ef09541850
|
||||
RMD160 (cups-1.2.4-source.tar.bz2) = eb8414dafa5e8a108ae6644a1a62f68ae8cfdc13
|
||||
SHA1 (cups-1.2.4-source.tar.bz2) = 4a6cb772cf64242b71a716711896c004c3636ad7
|
||||
SIZE (cups-1.2.4-source.tar.bz2) = 3546082
|
||||
MD5 (cups-1.2.5-source.tar.bz2) = 3e5d2c127890fd3ed97e2249c278b6e8
|
||||
RMD160 (cups-1.2.5-source.tar.bz2) = 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc
|
||||
SHA1 (cups-1.2.5-source.tar.bz2) = 25703de2bc09aa161bfd1ece88d30926269156df
|
||||
SIZE (cups-1.2.5-source.tar.bz2) = 3565622
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-locale_cups_de_po,v 1.1 2006/10/07 14:03:09 mbalmer Exp $
|
||||
--- locale/cups_de.po.orig Sat Oct 7 15:51:32 2006
|
||||
+++ locale/cups_de.po Sat Oct 7 15:56:01 2006
|
||||
@@ -76,7 +76,7 @@ msgid "Auto"
|
||||
msgstr "Automatisch"
|
||||
|
||||
msgid "Enter your username and password or the root username and password to access this page."
|
||||
-msgstr "Für Zugang Benutzername und Passwort (oder Benutzername und Password für root) eingeben."
|
||||
+msgstr "Für Zugang Benutzername und Passwort (oder Benutzername und Passwort für root) eingeben."
|
||||
|
||||
msgid "You must use a https: URL to access this page."
|
||||
msgstr "Eine https:-URL ist für den Zugriff erforderlich."
|
||||
@@ -103,7 +103,7 @@ msgid "The printer or class was not foun
|
||||
msgstr "Drucker oder Klasse nicht gefunden."
|
||||
|
||||
msgid "The printer-uri must be of the form \"ipp://HOSTNAME/classes/CLASSNAME\"."
|
||||
-msgstr "Die printer-uri muss in der Form \"ipp://HOSTNAME/classes/KLASSENNAME\" sein."
|
||||
+msgstr "Die Drucker-uri muss in der Form \"ipp://HOSTNAME/classes/KLASSENNAME\" sein."
|
||||
|
||||
#, c-format
|
||||
msgid "The printer-uri \"%s\" contains invalid characters."
|
||||
@@ -401,7 +401,7 @@ msgid "status\t\tshow status of daemon a
|
||||
msgstr "status\t\tzeigt den Status von Diensten und Warteschlangen\n"
|
||||
|
||||
msgid "?Invalid help command unknown\n"
|
||||
-msgstr "?Ungültig Hilfebefehl nicht bekannt\n"
|
||||
+msgstr "?Ungültiger Hilfebefehl nicht bekannt\n"
|
||||
|
||||
#, c-format
|
||||
msgid "\tprinter is on device '%s' speed -1\n"
|
||||
@@ -1884,7 +1884,7 @@ msgid "Unable to add printer:"
|
||||
msgstr "Kann Drucker nicht hinzufügen:"
|
||||
|
||||
msgid "Set Printer Options"
|
||||
-msgstr "Druckereinstellugen setzen"
|
||||
+msgstr "Druckereinstellungen setzen"
|
||||
|
||||
msgid "Missing form variable!"
|
||||
msgstr "Vermisse Formularvariable!"
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2006/10/02 09:59:05 mbalmer Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2006/10/21 10:58:24 mbalmer Exp $
|
||||
@conflict LPRng-*
|
||||
@newgroup _cups:541
|
||||
@newuser _cups:541:541:daemon:CUPS:/nonexistent:/sbin/nologin
|
||||
@ -371,6 +371,69 @@ share/cups/templates/es/set-printer-options-trailer.tmpl
|
||||
share/cups/templates/es/test-page.tmpl
|
||||
share/cups/templates/es/trailer.tmpl
|
||||
share/cups/templates/es/users.tmpl
|
||||
share/cups/templates/et/
|
||||
share/cups/templates/et/add-class.tmpl
|
||||
share/cups/templates/et/add-printer.tmpl
|
||||
share/cups/templates/et/admin.tmpl
|
||||
share/cups/templates/et/choose-device.tmpl
|
||||
share/cups/templates/et/choose-make.tmpl
|
||||
share/cups/templates/et/choose-model.tmpl
|
||||
share/cups/templates/et/choose-serial.tmpl
|
||||
share/cups/templates/et/choose-uri.tmpl
|
||||
share/cups/templates/et/class-added.tmpl
|
||||
share/cups/templates/et/class-confirm.tmpl
|
||||
share/cups/templates/et/class-deleted.tmpl
|
||||
share/cups/templates/et/class-jobs-header.tmpl
|
||||
share/cups/templates/et/class-modified.tmpl
|
||||
share/cups/templates/et/classes-header.tmpl
|
||||
share/cups/templates/et/classes.tmpl
|
||||
share/cups/templates/et/edit-config.tmpl
|
||||
share/cups/templates/et/error-op.tmpl
|
||||
share/cups/templates/et/error.tmpl
|
||||
share/cups/templates/et/header.tmpl
|
||||
share/cups/templates/et/help-header.tmpl
|
||||
share/cups/templates/et/help-printable.tmpl
|
||||
share/cups/templates/et/job-cancel.tmpl
|
||||
share/cups/templates/et/job-hold.tmpl
|
||||
share/cups/templates/et/job-moved.tmpl
|
||||
share/cups/templates/et/job-release.tmpl
|
||||
share/cups/templates/et/job-restart.tmpl
|
||||
share/cups/templates/et/jobs-header.tmpl
|
||||
share/cups/templates/et/jobs.tmpl
|
||||
share/cups/templates/et/maintenance.tmpl
|
||||
share/cups/templates/et/modify-class.tmpl
|
||||
share/cups/templates/et/modify-printer.tmpl
|
||||
share/cups/templates/et/norestart.tmpl
|
||||
share/cups/templates/et/option-boolean.tmpl
|
||||
share/cups/templates/et/option-conflict.tmpl
|
||||
share/cups/templates/et/option-header.tmpl
|
||||
share/cups/templates/et/option-pickmany.tmpl
|
||||
share/cups/templates/et/option-pickone.tmpl
|
||||
share/cups/templates/et/option-trailer.tmpl
|
||||
share/cups/templates/et/pager.tmpl
|
||||
share/cups/templates/et/printer-accept.tmpl
|
||||
share/cups/templates/et/printer-added.tmpl
|
||||
share/cups/templates/et/printer-configured.tmpl
|
||||
share/cups/templates/et/printer-confirm.tmpl
|
||||
share/cups/templates/et/printer-default.tmpl
|
||||
share/cups/templates/et/printer-deleted.tmpl
|
||||
share/cups/templates/et/printer-jobs-header.tmpl
|
||||
share/cups/templates/et/printer-modified.tmpl
|
||||
share/cups/templates/et/printer-purge.tmpl
|
||||
share/cups/templates/et/printer-reject.tmpl
|
||||
share/cups/templates/et/printer-start.tmpl
|
||||
share/cups/templates/et/printer-stop.tmpl
|
||||
share/cups/templates/et/printers-header.tmpl
|
||||
share/cups/templates/et/printers.tmpl
|
||||
share/cups/templates/et/restart.tmpl
|
||||
share/cups/templates/et/samba-export.tmpl
|
||||
share/cups/templates/et/samba-exported.tmpl
|
||||
share/cups/templates/et/search.tmpl
|
||||
share/cups/templates/et/set-printer-options-header.tmpl
|
||||
share/cups/templates/et/set-printer-options-trailer.tmpl
|
||||
share/cups/templates/et/test-page.tmpl
|
||||
share/cups/templates/et/trailer.tmpl
|
||||
share/cups/templates/et/users.tmpl
|
||||
share/cups/templates/header.tmpl
|
||||
share/cups/templates/help-header.tmpl
|
||||
share/cups/templates/help-printable.tmpl
|
||||
@ -709,6 +772,61 @@ share/doc/cups/es/images/button-view-error-log.gif
|
||||
share/doc/cups/es/images/button-view-page-log.gif
|
||||
share/doc/cups/es/images/button-view-printable-version.gif
|
||||
share/doc/cups/es/index.html
|
||||
share/doc/cups/et/
|
||||
share/doc/cups/et/images/
|
||||
share/doc/cups/et/images/button-accept-jobs.gif
|
||||
share/doc/cups/et/images/button-add-class.gif
|
||||
share/doc/cups/et/images/button-add-printer.gif
|
||||
share/doc/cups/et/images/button-add-this-printer.gif
|
||||
share/doc/cups/et/images/button-cancel-all-jobs.gif
|
||||
share/doc/cups/et/images/button-cancel-job.gif
|
||||
share/doc/cups/et/images/button-change-settings.gif
|
||||
share/doc/cups/et/images/button-clean-print-heads.gif
|
||||
share/doc/cups/et/images/button-clear.gif
|
||||
share/doc/cups/et/images/button-continue.gif
|
||||
share/doc/cups/et/images/button-delete-class.gif
|
||||
share/doc/cups/et/images/button-delete-printer.gif
|
||||
share/doc/cups/et/images/button-edit-configuration-file.gif
|
||||
share/doc/cups/et/images/button-export-samba.gif
|
||||
share/doc/cups/et/images/button-help.gif
|
||||
share/doc/cups/et/images/button-hold-job.gif
|
||||
share/doc/cups/et/images/button-manage-classes.gif
|
||||
share/doc/cups/et/images/button-manage-jobs.gif
|
||||
share/doc/cups/et/images/button-manage-printers.gif
|
||||
share/doc/cups/et/images/button-manage-server.gif
|
||||
share/doc/cups/et/images/button-modify-class.gif
|
||||
share/doc/cups/et/images/button-modify-printer.gif
|
||||
share/doc/cups/et/images/button-move-job.gif
|
||||
share/doc/cups/et/images/button-move-jobs.gif
|
||||
share/doc/cups/et/images/button-print-self-test-page.gif
|
||||
share/doc/cups/et/images/button-print-test-page.gif
|
||||
share/doc/cups/et/images/button-publish-printer.gif
|
||||
share/doc/cups/et/images/button-reject-jobs.gif
|
||||
share/doc/cups/et/images/button-release-job.gif
|
||||
share/doc/cups/et/images/button-restart-job.gif
|
||||
share/doc/cups/et/images/button-save-changes.gif
|
||||
share/doc/cups/et/images/button-search.gif
|
||||
share/doc/cups/et/images/button-set-allowed-users.gif
|
||||
share/doc/cups/et/images/button-set-as-default.gif
|
||||
share/doc/cups/et/images/button-set-printer-options.gif
|
||||
share/doc/cups/et/images/button-show-active.gif
|
||||
share/doc/cups/et/images/button-show-all.gif
|
||||
share/doc/cups/et/images/button-show-completed.gif
|
||||
share/doc/cups/et/images/button-show-next.gif
|
||||
share/doc/cups/et/images/button-show-previous.gif
|
||||
share/doc/cups/et/images/button-sort-ascending.gif
|
||||
share/doc/cups/et/images/button-sort-descending.gif
|
||||
share/doc/cups/et/images/button-start-class.gif
|
||||
share/doc/cups/et/images/button-start-printer.gif
|
||||
share/doc/cups/et/images/button-stop-class.gif
|
||||
share/doc/cups/et/images/button-stop-printer.gif
|
||||
share/doc/cups/et/images/button-unpublish-printer.gif
|
||||
share/doc/cups/et/images/button-use-default-config.gif
|
||||
share/doc/cups/et/images/button-view-access-log.gif
|
||||
share/doc/cups/et/images/button-view-error-log.gif
|
||||
share/doc/cups/et/images/button-view-page-log.gif
|
||||
share/doc/cups/et/images/button-view-printable-version.gif
|
||||
share/doc/cups/et/index.html
|
||||
share/doc/cups/favicon.ico
|
||||
share/doc/cups/help/
|
||||
share/doc/cups/help/api-array.html
|
||||
@ -1032,6 +1150,7 @@ share/examples/cups/ssl/
|
||||
@sample ${SYSCONFDIR}/cups/ssl/
|
||||
share/locale/de/cups_de.po
|
||||
share/locale/es/cups_es.po
|
||||
share/locale/et/cups_et.po
|
||||
share/locale/ja/cups_ja.po
|
||||
share/locale/pl/cups_pl.po
|
||||
share/locale/sv/cups_sv.po
|
||||
|
||||
Loading…
Reference in New Issue
Block a user