--- cupsys-1.2.1.orig/debian/po/templates.pot
+++ cupsys-1.2.1/debian/po/templates.pot
@@ -0,0 +1,219 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr ""
--- cupsys-1.2.1.orig/debian/po/da.po
+++ cupsys-1.2.1/debian/po/da.po
@@ -0,0 +1,263 @@
+# translation of cupsys_1.1.20final+cvs20040317-3_da.po to Danish
+# translation of da.po to Danish
+# translation of Debian cupsys debconf to Danish
+#
+# Claus Hindsgaul <claus_h@image.dk>, 2004.
+# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: da\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2006-03-20 15:58+0100\n"
+"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Ønsker du at sætte BSD lpd-kompatibilitetsserveren op?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Denne pakke indeholder en server, der kan modtage print-jobs på BSD-form og "
+"sende dem videre til CUPS. Du behøver kun at sætte den op, hvis du har andre "
+"computere, der sender jobs over netværket via servicerne \"BSD\" eller \"LPR"
+"\", og disse computere ikke kan ændres til at benytte den IPP-protokol, som "
+"CUPS benytter."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Ønsker du at CUPS skal udskrive ukendte jobs som rå jobs?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Alle print-jobs i IPP får en MIME-type. Da ikke alle printjob-kilder kan "
+"medsende den relevante type, vil mange jobs blive sendt med MIME-typen "
+"\"application/octet-stream\". Derfor vil CUPS forsøge at gætte formatet, når "
+"den modtager sådan et job. Som udgangspunkt vil den afvise jobbet, hvis den "
+"ikke kan gætte typen."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Du kan få CUPS til at behandle alle ikke-genkendte jobs med denne MIME-type "
+"som et \"råt\" job, som bliver sendt direkte til printeren uden yderligere "
+"behandling."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
+"denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
+"lokal driver MIME-typen \"application/octet-stream\". Samba sender sine jobs "
+"på samme måde."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "parallel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "seriel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "sokkel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Printer-kommunikationsveje:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS bruger bagvedliggende programmer til at kommunikere med printerenheden "
+"eller -porten."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Desværre giver nogle af disse bagvedliggende programmer visse problemer (f."
+"eks. bryder kernen sammen på nogle PPC-maskiner med parallel-programmet)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
+"passende under de mest almindelige forhold."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater er "
+"gyldige:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Portnummer  (631);\n"
+" - værtsnavn   (debian.example.com);\n"
+" - Vært:Port   (debian.example.com:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Du kan kombinere disse i en liste adskilt med mellemrum."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
+"\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et selvstændigt "
+"miljø op."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket og "
+"detektere printere på netværket automatisk."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
+"rundsendinger for at detektere printere."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Ugyldig værdi indtastet"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Ret venligst din indtastning."
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Vælg det bagvedliggende program, du ønsker."
--- cupsys-1.2.1.orig/debian/po/de.po
+++ cupsys-1.2.1/debian/po/de.po
@@ -0,0 +1,270 @@
+# translation of de.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Jens Nachtigall <nachtigall@web.de>, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: de\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 20:58+0100\n"
+"Last-Translator: Jens Nachtigall <nachtigall@web.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Wollen Sie den BSD-lpd Kompatibilitäts-Server einsetzen?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Dieses Paket enthält einen Server, der BSD-artige Druckaufträge "
+"entgegennimmt und diese an CUPS weiterleitet. Sie sollten diesen Server nur "
+"einsetzen, wenn andere Rechner über Ihren Rechner Druckaufträge via »bsd« "
+"oder »lpr« absetzen und diese Rechner nicht auf das von CUPS verwendete IPP-"
+"Protokoll umgestellt werden können."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Wollen Sie, dass CUPS unbekannte Druckaufträge unbearbeitet druckt?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Bei IPP bekommen alle Druckaufträge einen MIME-Typen.  Da nicht jeder "
+"Erzeuger von Druckaufträgen den geeigneten Typen anhängen kann, werden viele "
+"Aufträge mit dem MIME-Typen »application/octet-stream« abgesendet.  Wenn "
+"CUPS einen Auftrag mit diesem MIME-Typen erhält, versucht CUPS deshalb das "
+"Datei-Format herauszufinden.  Die Standardeinstellung ist, den Auftrag "
+"abzulehnen, wenn es den richtigen Typen nicht herausfinden kann."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Es ist möglich CUPS zu veranlassen alle unerkannten Aufträge mit diesem MIME-"
+"Typen als rohe (engl. »raw«) Aufträge zu behandeln. Das bedeutet diese "
+"Aufträge ohne Bearbeitung direkt an den Drucker zu senden."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Sollten Sie Druckaufträge von Windows-Rechnern entgegennehmen, ist es ratsam "
+"diese Option zu setzen, da Windows allen IPP-Druckaufträgen, die von einem "
+"lokalen Treiber verarbeitet werden, den MIME-Typen »application/octet-"
+"stream« gibt. Samba übergibt seine Druckaufträge auf die gleiche Art."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "parallel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "serial"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Backends für die Kommunikation mit dem Drucker:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr "CUPS verwendet Backend-Programme zur Kommunikation mit dem Drucker."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Leider verursachen manche Backend-Programme Probleme. (Zum Beispiel stürzen "
+"einige PPC-Kernel mit dem Parallel-Backend ab)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Bitte wählen Sie das Backend-Programm, das mit CUPS verwendet werden soll. "
+"Die Voreinstellung sollte normalerweise den meisten Umgebungen gerecht "
+"werden."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port oder/und Host-Name auf dem CUPS lauschen soll:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Bitte geben Sie den Port oder Host-Namen an, auf dem der CUPS-Daemon "
+"lauschen soll. Die folgenden Formate sind erlaubt:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Port-Nummer (631);\n"
+" - Host-Name   (debian.beispiel.de);\n"
+" - Host:Port   (debian.beispiel.de:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+"Sie können mehrere davon angeben, indem Sie die einzelnen Werte durch "
+"Leerzeichen trennen."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Der Standard-Port 631 ist für das Internet Printing Protocol (IPP) "
+"reserviert. Für einen Einzelrechner ist aus Sicherheitsgründen "
+"»localhost:631« empfohlen."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+"CUPS-Drucker-Informationen im Netzwerk aussenden und/oder diese empfangen?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"Der CUPS-Daemon kann für Clients im Netzwerk Drucker-Informationen "
+"aussenden. Dadurch können diese automatisch die im Netzwerk verfügbaren "
+"Drucker finden."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Wenn Sie hier zustimmen, dann wird der CUPS-Daemon periodisch UDP-Broadcasts "
+"senden um im Netzwerk Drucker zu finden."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Sie haben einen falschen Wert eingegeben"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+"Beim Einlesen der Port-Nummer oder des Host-Namens ist ein Fehler "
+"aufgetreten."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Bitte korrigieren Sie Ihre Eingabe."
--- cupsys-1.2.1.orig/debian/po/cs.po
+++ cupsys-1.2.1/debian/po/cs.po
@@ -0,0 +1,259 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 16:00+0100\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Chcete spustit server kompatibilní s BSD lpd?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Tento balík obsahuje server, který umí přijímat tiskové úlohy ve stylu BSD a "
+"přeposílat je systému CUPS. Měli byste jej povolit pouze v případě, že máte "
+"na síti po�íta�e, které posílají úlohy přes služby \"BSD\" nebo \"LPR\" a "
+"nedají se přemluvit, aby používaly protokol IPP."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Chcete, aby CUPS tisknul neznámé úlohy jako typ \"raw\"?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Všechny tiskové úlohy IPP mají přiřazen typ MIME, podle kterého CUPS pozná, "
+"v jakém formátu je úloha zaslána. Protože ne všechny zdroje tiskových úloh "
+"umí nastavit správný typ, je mnoho úloh zasíláno s MIME typem application/"
+"octet-stream a CUPS pak musí hádat, o jaký formát dat se jedná. Pokud CUPS "
+"formát neuhodne, implicitně úlohu odmítne."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Zde můžete nastavit, aby CUPS považoval všechny nerozpoznané úlohy s tímto "
+"MIME typem jako úlohy typu \"raw\". Takové úlohy se nijak nezpracovávají a "
+"jsou odesílány rovnou na tiskárnu."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Pokud budete přijímat tisky z windowsových po�íta�ů, pravděpodobně budete "
+"chtít tuto volbu zapnout, protože Windows nastavují všem tiskům přes IPP "
+"(zpracovaných lokálním ovlada�em) MIME typ application/octet-stream. Stejně "
+"pracuje i Samba."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "paralelní"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "sériový"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Ovlada�e pro komunikaci s tiskárnou:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr "CUPS používá ovlada� pro komunikaci s tiskárnou nebo jejím portem."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Bohužel některé ovlada�e nejsou stabilní. (Například některá PPC jádra v "
+"kombinaci s paralelním ovlada�em spadnou.)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Vyberte ovlada�, který má CUPS  použít. Implicitní volba se hodí do většiny "
+"běžných prostředí."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port a/nebo jméno po�íta�e, na kterém má CUPS naslouchat:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Zadejte prosím port nebo jméno po�íta�e, na kterém má daemon CUPS naslouchat "
+"příchozím spojením. Povoleny jsou následující formáty:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Číslo portu    (631);\n"
+" - Jméno po�íta�e (debian.priklad.cz);\n"
+" - Po�íta�:Port   (debian.priklad.cz:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Můžete jich zadat libovolný po�et, sta�í je oddělit mezerami."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Výchozí port 631 je rezervovaný právě pro Internet Printing Protocol (IPP). "
+"Pro samostatný po�íta� se z bezpe�nostních důvodů doporu�uje nastavení "
+"\"localhost:631\"."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "Vysílat a/nebo poslouchat na síti informace o CUPS tiskárnách?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"Daemon CUPS může do sítě vysílat své informace o tiskárnách a také umí na "
+"síti zjišťovat tiskárny nové."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Povolíte-li tuto volbu, daemon CUPS bude periodicky vysílat celoplošné UDP "
+"dotazy, kterými bude zjišťovat nové tiskárny."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Zadána chybná hodnota"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "Při zpracovávání �ísla portu nebo názvu po�íta�e se vyskytla chyba."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Opravte prosím svou odpově�."
--- cupsys-1.2.1.orig/debian/po/es.po
+++ cupsys-1.2.1/debian/po/es.po
@@ -0,0 +1,251 @@
+# cupsys debconf translation to spanish
+# Copyright (C) 2003, 2004 Software in the Public Interest
+# This file is distributed under the same license as the cupsys package.
+#
+# Changes:
+# - Initial translation
+#        Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2003, 2004
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys 1.1.20final-15\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2004-02-28 16:35+0100\n"
+"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
+"Language-Team: Debian L10n Spanish Team <debian-l10n-spanish@lists.debian."
+"org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "¿Desea configurar el servidor de compatibilidad lpd de BSD?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Este paquete incluye un servidor que acepta trabajos de impresión al estilo "
+"BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya "
+"otras máquinas que envíen trabajos de impresión mediante la red, usando "
+"servicios \"BSD\" o \"LPR\" y no puedan usar el protocolo IPP que utiliza "
+"CUPS."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "¿Quiere que CUPS imprima en bruto los trabajos desconocidos?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no "
+"todas las fuentes de trabajos de impresión asignan correctamente algún tipo "
+"MIME, muchos llegan con el tipo application/octet-stream. Por ello, cuando "
+"CUPS recibe un trabajo con ese tipo MIME, intenta adivinar su formato. De "
+"manera predeterminada, si no puede adivinar el tipo apropiado, lo rechaza."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Es posible hacer que CUPS trate todos los trabajos no reconocidos, con este "
+"tipo MIME, como trabajos «en bruto», con lo que se mandan directamente a la "
+"impresora sin procesar."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Si va a recibir trabajos de impresión desde sistemas Windows es muy probable "
+"que desee activar esta opción, ya que Windows da a los trabajos de impresión "
+"IPP que procesa localmente el tipo application/octet-stream. Samba también "
+"envía los trabajos de impresión de esta manera."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr ""
--- cupsys-1.2.1.orig/debian/po/fr.po
+++ cupsys-1.2.1/debian/po/fr.po
@@ -0,0 +1,279 @@
+# translation of fr.po to French
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+# Christian Perrier <bubulle@debian.org>, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 18:48+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Faut-il installer le serveur compatible avec le démon lpd de BSD ?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Ce paquet comporte un serveur capable d'accepter des demandes d'impression "
+"au style BSD et de les donner à CUPS. Installez-le seulement si vous avez "
+"des machines qui envoient leurs demandes à travers le réseau via les "
+"services « BSD » ou « LPR » et qui ne peuvent pas accepter le protocole IPP "
+"utilisé par CUPS."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "CUPS doit-il imprimer les demandes sans type MIME sous forme brute ?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Selon le protocole IPP (« Internet Printing Protocol »), chaque demande "
+"d'impression comporte un type MIME. Comme certaines sources de demandes "
+"d'impression ne peuvent pas affecter un type MIME adapté, de nombreuses "
+"demandes sont soumises avec le type MIME application/octet-stream. Lorsque "
+"CUPS reçoit une demande d'impression avec ce type MIME, il tente d'en "
+"déterminer le format. Par défaut, si cette tentative échoue, la demande est "
+"rejetée."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"CUPS peut traiter toutes ces demandes sans type reconnu comme des demandes "
+"au format brut et les envoyer sans aucun traitement à l'imprimante."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Si vous acceptez des demandes d'impression émises par des ordinateurs "
+"utilisant Windows, vous devriez utiliser cette option car Windows affecte le "
+"type MIME application/octet-stream à toutes les demandes émises par un "
+"pilote local d'impression. Samba soumet également ses demandes d'impression "
+"de cette manière."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "IPP"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "parallèle"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "SCSI"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "série"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "USB"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Mode de communication avec les imprimantes :"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"Vous pouvez choisir ici la méthode de communication qui sera utilisée par "
+"CUPS dans ses échanges avec l'imprimante ou le port d'impression."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Malheureusement, certaines de ces méthodes sont connues pour causer certains "
+"problèmes (par exemple, plantage de certains noyaux PPC avec la "
+"communication parallèle)."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr "Le choix par défaut est adapté à la majorité des environnements."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port ou nom d'hôte où CUPS sera à l'écoute :"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Veuillez indiquer le port ou le nom d'hôte où le démon CUPS sera à l'écoute. "
+"Les formats suivants peuvent être utilisés :"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - numéro de port seul (p. ex. 631) ;\n"
+" - nom d'hôte seul (p. ex. debian.asso.fr) ;\n"
+" - hôte:port (p. ex. debian.asso.fr:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+"Ces trois formats peuvent être combinés ensemble, séparés par des espaces."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Le port par défaut (631) est le port réservé pour le protocole d'impression "
+"Internet (« Internet Printing Protocol » : IPP). Pour des raisons de "
+"sécurité, la valeur « localhost:631 » est recommandée pour un environnement "
+"autonome."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+"Faut-il annoncer les imprimantes sur le réseau et en détecter de nouvelles ?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"Le démon CUPS peut faire connaître les imprimantes qu'il gère aux clients "
+"sur le réseau et détecter automatiquement de nouvelles imprimantes."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Si vous choisissez cette option, le démon CUPS utilisera périodiquement des "
+"diffusions UDP pour détecter de nouvelles imprimantes."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Valeur saisie incorrecte"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+"Une erreur s'est produite lors de l'analyse du nom d'hôte ou du numéro de "
+"port."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Veuillez corriger votre saisie."
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr ""
+#~ "IPP (Protocole d'impression Internet), LPD (« Line Printer Daemon »), "
+#~ "Parallèle, SCSI, Série, Socket, USB"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Méthode de communication avec l'imprimante :"
--- cupsys-1.2.1.orig/debian/po/gl.po
+++ cupsys-1.2.1/debian/po/gl.po
@@ -0,0 +1,256 @@
+# Galician translation of cupsys' debconf templates.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cupsys package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2006-04-07 15:38+0200\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "¿Quere activar o servidor de compatibilidade con lpd de BSD?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Este paquete contén un servidor que pode aceptar traballos de impresión "
+"estilo BSD e envialos a CUPS. Só se debería activar se ten outros "
+"ordenadores que envían traballos pola rede mediante servizos \"BSD\" ou \"LPR"
+"\" e eses ordenadores non se poden converter para que empreguen o protocolo "
+"IPP que emprega CUPS."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr ""
+"¿Quere que CUPS imprima os traballos descoñecidos coma traballos en cru?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Todos os traballos de impresión en IPP teñen un tipo MIME. Como non todas as "
+"fontes de traballos de impresión poden indicar un tipo axeitado, moitos "
+"traballos envíanse co tipo MIME application/octet-stream. Debido a isto, "
+"cando CUPS recibe un traballo con ese tipo MIME trata de adiviñar o formato. "
+"Por defecto, se non pode adiviñar o tipo correcto, rexeita o traballo."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"É posible facer que CUPS trate todos os traballos que non recoñeza con este "
+"tipo MIME coma traballos \"en cru\", o que fai que se envíen directamente á "
+"impresora sen os procesar."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Se vai aceptar traballos de impresión de ordenadores con Windows, "
+"probablemente sexa mellor activar esta opción, xa que Windows envía os "
+"traballos de impresión IPP procesados cun controlador local co tipo MIME "
+"application/octet-stream. Samba tamén envía os seus traballos de impresión "
+"do mesmo xeito."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "paralelo"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "serie"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Sistemas de comunicación coa impresora:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS emprega varios programas para se comunicar co dispositivo ou porto da "
+"impresora."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Por desgracia, algúns destes programas causan problemas (por exemplo, algúns "
+"núcleos para PPC fallan co adaptador paralelo)."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Escolla o programa que debe empregar CUPS. A opción por defecto debería "
+"axustarse aos ambientes máis habituais."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Porto e/ou nome de servidor no que CUPS ha escoitar:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Especifique o porto ou nome de servidor no que ha escoitar o servizo de "
+"CUPS. Admítense os seguintes formatos:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Número de porto  (631);\n"
+" - Nome de servidor (debian.exemplo.com);\n"
+" - Servidor:Porto   (debian.exemplo.com:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Pode combinalos facendo unha lista de elementos separados por comas."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"O porto por defecto, 631, está reservado para o Protocolo de Impresión de "
+"Internet (IPP). Recoméndase que empregue \"localhost:631\" para crear un "
+"sistema aillado por motivos de seguridade."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "¿Emitir e/ou escoitar información de impresoras de CUPS na rede?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"O servizo CUPS pode emitir información de impresoras para os clientes da "
+"rede, e pode detectar automaticamente as impresoras da rede."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Se escolle esta opción, o servizo CUPS ha enviar paquetes \"broadcast\" UDP "
+"para detectar as impresoras."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Introduciuse un valor incorrecto"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "houbo un erro ao analizar o número de porto ou o nome do servidor."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Corrixa o que introduciu."
--- cupsys-1.2.1.orig/debian/po/ja.po
+++ cupsys-1.2.1/debian/po/ja.po
@@ -0,0 +1,272 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys 1.2\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 13:24+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "BSD lpd 互�サー�をセットアップ����?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"��パッケージ� BSD スタイル��刷ジョブを��付��CUPS ��れを�るサー�"
+"を�ん����。\"BSD\" ��� \"LPR\" サービス経由��ットワーク越��ジョブ"
+"を�る���コンピュータ��り����れら�コンピュータ� CUPS �使���る "
+"IPP プロトコルを使�よ�変更��������場����セットアップ����"
+"�。"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "未知�ジョブを生データ (raw) ジョブ��� CUPS ��刷�����?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"IPP �������刷ジョブ� MIME 形�を����。�刷ジョブ�����ソース"
+"��切�形��付���る���ら��多��ジョブ� MIME 形� application/"
+"octet-stream ����られ��。�����CUPS ���よ�� MIME 形�付��"
+"ジョブを���る����フォーマット�何�を推測�よ�����。デフォルト�"
+"��も��当�形�を推測����場����ジョブを拒����。"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"�� MIME 形������未知�ジョブを�加工�る����プリンタ�直接�るよ"
+"�生データ（\"raw\"）ジョブ���扱�よ�� CUPS を設定����。"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"も� Windows コンピュータ�ら��刷ジョブを��付�る場����ら���オプ"
+"ションを設定�����。����も�Windows ����� IPP �刷ジョブをローカ"
+"ルドライ��よ�� MIME 形� application/octet-stream �加工�る�ら��。"
+"Samba も�様����刷ジョブを��やり方��り��。"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "IPP"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "LPD"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "パラレル"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "SCSI"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "シリアル"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "ソケット"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "USB"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "プリンタ通信�ックエンド:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS �プリンタデ�イス����ート�会話�る���ックエンドプログラムを使�"
+"��。"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"困������������ックエンドプログラム��題を引�起����。(���"
+"���る種� PPC カー�ル� parallel �ックエンド�クラッシュ���)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"CUPS �利用����ックエンドプログラムを�択������。デフォルト��択�"
+"�����一般的�環境�������。"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "CUPS �監視�る�ート���ホスト�:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"CUPS デーモン�監視��る�ート���ホスト�を指定������。次�よ��書"
+"�を利用����:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - �ート番�      (631);\n"
+" - ホスト�        (debian.example.com);\n"
+" - ホスト�:�ート (debian.example.com:631);\n"
+" - ファイルドメインソケット (/var/run/cups/cups.sock)。"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "スペース�区切��リスト��れらを組����る��も����。"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"デフォルト�ート 631 � Internet Printing Protocol (IPP) �予約�れ����。"
+"\"localhost:631\" �セキュリティ上��由�らスタンドアロン�環境�セットアッ"
+"プ�る��推奨�れ��。"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+"�ットワーク上� CUPS プリンタ情報�ブロードキャスト�よ�監視を行����?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"CUPS デーモン��ットワーク上�クライアント�プリンタ情報をブロードキャスト�"
+"�り��ットワーク上�プリンタを自動的�検出��り����。"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"���択肢を����CUPS デーモン�プリンタを検出�る��� UDP ブロードキャ"
+"ストを定期的��り��。"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "�正�値�入力�れ���"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "�ート番����ホスト��解釈中�エラー�発生����。"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "入力値を修正������。"
+
+#~ msgid "Admin password:"
+#~ msgstr "管�者パスワード:"
+
+#~ msgid "Please enter the password for the admin (username 'root') of CUPS."
+#~ msgstr "CUPS 管�者 (ユーザ� 'root') 用�パスワードを入力������。"
+
+#~ msgid ""
+#~ "You can add/replace/delete CUPS password information by using lpadmin."
+#~ msgstr "lpadmin を使�� CUPS パスワード情報を追加/変更/削除����。"
--- cupsys-1.2.1.orig/debian/po/nl.po
+++ cupsys-1.2.1/debian/po/nl.po
@@ -0,0 +1,255 @@
+# 
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys 1.1.20candidate6\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2004-03-30 12:28+0100\n"
+"Last-Translator: Tim Dijkstra <tim@famdijkstra.org>\n"
+"Language-Team: Debian Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr ""
+"Wilt u de server die zorgt voor compatibiliteit met de BSD-lpd instellen?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Dit pakket bevat een server die BSD-stijl afdrukopdrachten kan accepteren om "
+"ze daarna naar CUPS te sturen. De server dient alleen ingesteld te worden "
+"als er andere computers zijn die afdrukopdrachten over het netwerk sturen "
+"via \"BSD\"- of \"LPR\" -services én deze computers niet kunnen worden "
+"ingesteld om het IPP-protocol (gebruikt door CUPS) te gebruiken."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Wilt u dat CUPS onbekende opdrachten onbewerkt naar de printer stuurt?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Alle afdrukopdrachten in IPP krijgen een MIME-type. Omdat niet alle bronnen "
+"van afdrukopdrachten een geschikt type aan de opdracht kunnen verbinden, "
+"worden veel opdrachten verstuurd als het MIME-type application/octet-stream. "
+"CUPS zal daarom als het een opdracht krijgt met dit MIME-type proberen te "
+"raden wat het bestandsformaat is. Standaard zal CUPS, als het niet is gelukt "
+"het formaat te raden, de opdracht afwijzen."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Het is mogelijk om CUPS alle niet-herkende opdrachten met dit MIME-type te "
+"laten behandelen als onbewerkte opdrachten. Dit zorgt er voor dat de "
+"opdracht direct naar de printer wordt gestuurd zonder het verder te "
+"verwerken."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Als u printopdrachten van Windows-computers wilt accepteren, dan kunt u deze "
+"optie het beste aanzetten. Windows geeft namelijk alle afdrukopdrachten die "
+"zijn verwerkt door een lokaal stuurprogramma het MIME-type application/octet-"
+"stream. Ook Samba verstuurt afdrukopdrachten op deze manier."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS gebruikt een backend-programma voor de communicatie met de printer of "
+"de printerpoort."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Helaas kunnen sommige backend-programma's problemen veroorzaken. (Bijv. "
+"sommige PPC-kernels kunnen vastlopen met de 'parallel'-backend."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Kies een backend-programma dat door CUPS gebruikt moet worden. De standaard "
+"keuze zou voor de meest voorkomende omgevingen moeten voldoen."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr ""
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Selecteer het backend dat u wilt."
--- cupsys-1.2.1.orig/debian/po/ru.po
+++ cupsys-1.2.1/debian/po/ru.po
@@ -0,0 +1,269 @@
+# translation of cupsys-ru.po to Russian
+# translation of cupsys_1.1.23-12_ru.po to Russian
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys_1.1.23-12_ru.po\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 16:32+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Хотите у�тановить �ервер �овме�тимо�ти � BSD lpd?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Этот пакет �одержит �ервер, который может принимать задани� печати в �тиле "
+"BSD и по�ылать их в CUPS. Его рекомендует�� у�танавливать только в том "
+"�лучае, е�ли в �ети е�ть другие компьютеры, которые отправл�ют задани� по "
+"�ети � помощью \"BSD\" или \"LPR\" �ерви�ов, и �ти компьютеры не могут "
+"работать � протоколом IPP, который и�пользует�� в CUPS."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr ""
+"Хотите чтобы CUPS печатал неизве�тные задани� как необработанные задани�?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"В�е задани� печати � помощью IPP имеют тип MIME. Так как не в�е и�точники "
+"заданий печати могут при�оедин�ть �оответ�твующий тип, многие задани� "
+"по�ылают�� � MIME типом application/octet-stream. Из-за �того, когда CUPS "
+"принимает задание � таким MIME типом, он пытает�� определить формат "
+"полученных данных. По умолчанию, е�ли тип определить не удаёт��, задание "
+"отбра�ывает��."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Данна� у�тановка за�тавл�ет CUPS во�принимать нера�познанные задани� � таким "
+"MIME типом как \"�ырые\" задани�, которые по�ылают�� на принтер напр�мую, "
+"без обработки."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Е�ли вы получаете задани� печати � компьютеров � Windows, то, веро�тно, "
+"лучше у�тановить �тот параметр, так как Windows при�ваивает в�ем задани�м "
+"печати IPP, обработанным локальным драйверов MIME тип application/octet-"
+"stream. Samba также отправл�ет �вои задани� печати в таком виде."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "parallel"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "serial"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Интерфей�ные программы дл� �в�зи � принтером:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS и�пользует интерфей�ные программы дл� �в�зи � у�трой�твом печати или "
+"портом."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"К �ожалению, некоторые интерфей�ные программы могут вызывать проблемы. "
+"(�апример, некоторые �дра PPC падают при и�пользовании интерфей�а parallel)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Выберите интерфей�ные программу, котора� будет и�пользовать�� CUPS. Выбор по "
+"умолчанию должен работать � большин�твом оборудовани�."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+"Порт или/и им� машины через который будет о�уще�твл�ть�� подключение к CUPS:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Укажите порт или им� машины на котором будет работать демон CUPS. Допу�тимы "
+"�ледующие форматы:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - �омер порта (631);\n"
+" - Им� машины  (debian.example.com);\n"
+" - Машина:Порт (debian.example.com:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Можно и�пользовать не�колько любых типов, раздел�� их пробелом."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Порт по умолчанию 631 зарезервирован дл� протокола печати в Интернет "
+"(Internet Printing Protocol, IPP). В цел�х безопа�но�ти дл� автономных "
+"�и�тем рекомендует�� и�пользовать на�тройку \"localhost:631\"."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "�нон�ировать и/или �лушать CUPS информацию о принтере в �ети?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"Демон CUPS может анон�ировать информацию о принтере дл� �етевых клиентов, и "
+"обнаруживать другие принтеры в �ети автоматиче�ки."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"При выборе �того параметра демон CUPS будет периодиче�ки по�ылать "
+"широковещательные UDP пакеты дл� обнаружени� принтеров."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Введено недопу�тимое значение"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "при разборе номера порта или имени машины произошла ошибка."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Пожалуй�та и�правьте вводимые данные."
--- cupsys-1.2.1.orig/debian/po/sv.po
+++ cupsys-1.2.1/debian/po/sv.po
@@ -0,0 +1,297 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys 1.1.23-13\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-17 08:14+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Vill du konfigurera den BSD-kompatibla lpd-servern?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Detta paket innehåller en server som kan acceptera utskriftsjobb av BSD-stil "
+"och skicka dom till CUPS. Den bör endast sättas upp om du har andra datorer "
+"som skickar jobb över nätverket via \"BSD\" eller \"LPR\"-tjänster och dessa "
+"datorer inte kan konverteras för att använda IPP-protokollet som CUPS "
+"använder."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Vill du att CUPS ska skriva ut okända jobb som \"raw\"-jobb?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Alla utskriftjobb i IPP får en MIME-typ. Eftersom inte alla källor för "
+"utskriftsjobb kan skicka med en lämplig typ blir många jobb skickade som "
+"MIME-typen \"application/octet-stream\". Av denna anledning försöker CUPS "
+"gissa vilket format det är när den tar emot ett jobb av den MIME-typen. Som "
+"standard nekar den att ta emot jobb om den inte kan gissa den korrekta typen."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Det är möjligt att ställ in så att CUPS behandlar alla okända jobb med denna "
+"MIME-typ som \"raw\"-jobb vilket orsakar att de skickas direkt till "
+"skrivaren utan att behandlas först."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
+"antagligen välja denna funktion eftersom Windows sätter alla IPP-"
+"utskriftsjobb som hanteras av en lokal drivare till MIME-typen \"application/"
+"octet-stream\". Samba skickar också sina utskriftsjobb på detta sätt."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "parallell"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "seriell"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "socket"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Baksystem för skrivarkommunikation:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS använder ett baksystemprogram för att kommunicera med skrivarenhet "
+"eller port."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Tyvärr kan några baksystemprogram skapa problem. (Till exempel kan vissa PPC-"
+"kärnor krascha med parallella baksystem)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Vänligen välj det baksystemprogram som ska användas av CUPS. Det förvalda "
+"valet bör passa den flesta vanliga miljöer."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. "
+"Följande format är tillåtna:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" - Portnummer (631);\n"
+" - Värdnamn   (debian.exempel.se);\n"
+" - Värd:Port   (debian.exempel.se:631)."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr "Du kan kombinera flera av dessa genom att avgränsa med mellanslag."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Standardport 631 är reserverad för Internet Printing Protocol (IPP). "
+"\"localhost:631\" är rekommenderad för att ställa in en fristående miljö av "
+"säkerhetsskäl."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+"Vill du sända ut och/eller lyssna efter skrivarinformation för CUPS på "
+"nätverket?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"CUPS-demonen kan sända ut skrivarinformation för klienter på nätverket och "
+"automatiskt identifiera skrivare på nätverket."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Om du valde detta alternativ kommer CUPS-demonen att med jämna mellanrum "
+"sända UDP-broadcast för att identifiera skrivare."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Felaktigt värde angivet"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "ett fel inträffade vid tolkning av portnumret eller värdnamnet."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Vänligen rätt till det."
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallell, scsi, seriell, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Välj det baksystem du vill använda."
+
+#~ msgid "Specify the port or/and host name that wants to be listened."
+#~ msgstr "Ange port och/eller värdnamn som ska lyssnas på."
+
+#~ msgid "- Port number (631)"
+#~ msgstr "- Portnummer (631)"
+
+#~ msgid "- Host name   (debian.example.com)"
+#~ msgstr "- Värdnamn   (debian.exempel.se)"
+
+#~ msgid "- Host:Port   (debian.example.com:631)"
+#~ msgstr "- Värd:Port   (debian.exempel.se:631)"
+
+#~ msgid "It is possible to combine by delimiting two or more values in space."
+#~ msgstr ""
+#~ "Det är möjligt att kombinera genom att avgränsa två eller fler värden med "
+#~ "mellanslag."
+
+#~ msgid ""
+#~ "When this option is accepted, CUPS daemon will broadcast and detect by "
+#~ "using UDP periodically."
+#~ msgstr ""
+#~ "När denna funktion accepteras kommer CUPS-demonen att sända ut och "
+#~ "identifiera genom att använda UDP med jämna mellanrum."
+
+#~ msgid "The wrong value is found in the input."
+#~ msgstr "Fel värde matades in."
--- cupsys-1.2.1.orig/debian/po/tr.po
+++ cupsys-1.2.1/debian/po/tr.po
@@ -0,0 +1,248 @@
+# Turkish translation of cupsys.
+# This file is distributed under the same license as the cupsys package.
+# Gürkan Aslan <gurkan@iaslan.com>, 2004. 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2004-04-25 10:34+0300\n"
+"Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=1; plural=0;\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "BSD lpd uyumlu sunucuyu ayarlamak ister misiniz?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Bu paket BSD tipi baskı görevlerini kabul edebilen ve onları CUPS'a gönderen "
+"bir sunucu içerir. Eğer diğer bilgisayarlar \"BSD\" veya \"LPR\" servisleri "
+"ile ağ üzerinden görevler gönderiyor ve bu bilgisayarların CUPS'ın "
+"kullandığı IPP protokolünü kullanmalarını sağlamak mümkün olmuyorsa bu "
+"paketin ayarlanması önerilir."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "CUPS'ın bilinmeyen ham (raw) görevleri yazdırmasını istiyor musunuz?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"IPP içindeki tüm yazdırma görevlerine bir MIME tipi atanır.  Her yazdırma "
+"görevine uygun bir MIME tipi atanamayabileceğinden, bir çok görev "
+"application/octet-stream MIME tipiyle gönderilir.  Bundan dolayı, CUPS bir "
+"görevi bu MIME tipinde aldığında, onun hangi biçemde olduğunu saptamaya "
+"çalışır.  Öntanımlı olarak, eğer tam olarak hangi tipte olduğunu "
+"saptayamazsa, görevi geri çevirir."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"CUPS'ın bu MIME tipindeki tanınmayan bütün yazıcı görevlerine  \"raw\" "
+"görevler olarak muamele etmesini sağlamak mümkündür.  Böylece bu tip "
+"görevler herhangi bir işleme tâbî tutulmadan yazıcıya gönderilecektir."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Eğer Windows bilgisayarlardan gelen yazıcı görevlerini kabul etmek "
+"istiyorsanız, muhtemelen bu seçeneği tercih edeceksiniz.  Zira Windows yerel "
+"sürücüdeki tüm IPP yazıcı görevlerine application/octet-stream MIME tipini "
+"atar.  Samba da görevleri bu şekilde gönderir."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"CUPS, yazıcı aygıtı veya portu ile iletişim kurmak için arkayüz programını "
+"kullanır."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Malesef bazı arkayüz programları sorun çıkartmaktadır. (Örneğin, paralel "
+"arkayüz ile bazı PPC çekirdek çökmeleri gibi)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Lütfen CUPS tarafından kullanılacak arkayüz programını seçin. Öntanımlı "
+"seçim çoğu ortam için uygundur."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, paralel, scsi, seri, soket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "İstediğiniz arkayüzü seçin."
--- cupsys-1.2.1.orig/debian/po/vi.po
+++ cupsys-1.2.1/debian/po/vi.po
@@ -0,0 +1,260 @@
+# Vietnamese Translation for CupSys.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys 1.1.24\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2005-12-19 17:24+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.5.1b\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Bạn có muốn thiết lập trình phục vụ tương thích với lpd BSD không?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Gói này chứa một trình phục vụ có thể chấp nhận việc in kiểu BSD và đệ trình "
+"chúng vào hệ thống in CUPS. Chỉ nên thiết lập nó nếu bạn có máy tính khác đệ "
+"trình việc in qua mạng bằng dịch vụ « BSD » hay « LPR », và không thể chuyển "
+"đổi máy tính đó để dùng giao thức IPP do CUPS dùng."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Bạn có muốn CUPS in m�i việc in lạ như là việc thô không?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Trong IPP, m�i việc in được một kiểu MIME. Vì không phải tất cả các nguồn "
+"việc in có thể đính kèm kiểu thích hợp, nhi�u việc in được đệ trình với kiểu "
+"MIME « application/octet-stream » (ứng dụng/dòng dạng bộ tám đi�u). Do đó, "
+"khi CUPS nhận một việc in có kiểu MIME đó, nó cố đoán dang thức nó. Mặc định "
+"là nếu nó không thể đoán kiểu đúng nên từ chối việc in."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"Có thể đặt CUPS phân loại m�i việc in chưa nhận ra và có kiểu MIME này như "
+"là việc in « thô ». Như thế thì, CUPS sẽ gởi chúng thẳng vào máy in, không "
+"xử lý gì trước."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Nếu bạn sẽ cần phải nhận việc in từ máy tính chạy hệ đi�u hành Windows thì "
+"rất có thể là bạn muốn lập tùy ch�n này, vì phần m�m Windows gán m�i việc in "
+"IPP được xử lý bởi trình đi�u khiển địa phương, kiểu MIME « application/"
+"octet-stream ». Phần m�m Samba cũng đệ trình các việc in bằng cách đó."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr "ipp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr "lpd"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr "song song"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr "scsi"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr "nối tiếp"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr "ổ cắm"
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr "usb"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr "Các hậu phương liên lạc với máy in:"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"Phần m�m CUPS dùng trình hậu phương để truy�n thông với thiết bị in hay cổng."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Rất tiếc là một số chương trình hậu phương có gây ra lỗi. (Lấy thí dụ, hậu "
+"phương song song gây ra một số hạt nhân PPC bị h�ng.)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Hãy ch�n chương trình hậu phương mà phần m�m CUPS sẽ dùng. Tùy ch�n mặc định "
+"nên khớp với các môi trư�ng thư�ng dùng."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr "Cổng và/hay tên máy nơi CUPS se lắng nghe:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+"Hãy gõ cổng hay tên máy trên mà trình n�n CUPS sẽ lắng nghe. Cho phép những "
+"khuôn dạng theo đây:"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+#, fuzzy
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+" • sổ cổng (v.d. 631)\n"
+" • tên máy (v.d. vi_du.vnoss.org)\n"
+" • máy:cổng (v.d. vi_du.vnoss.org:631)"
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+"Bạn có thể kết hợp vài khuôn dạng phân cách bởi khoảng trắng trong danh sách."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+"Cổng mặc định 631 dành cho Giao thức In Mạng (Internet Printing Protocol: "
+"IPP). Khuyên bạn dùng « localhost:631 » để thiết lập môi trư�ng độc lập vì "
+"lý do bảo mật. "
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr "Phát thanh và/hay lắng nghe thông tin máy in CUPS trên mạng không?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+"Trình n�n CUPS có thể phát thanh thông tin v� máy in cho trình khách trên "
+"mạng nghe, và tự động phát hiện máy in nào trên mạng."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+"Nếu bạn lập tùy ch�n này, trình n�n CUPS sẽ gởi định kỳ việc phát thanh UDP "
+"để phát hiện máy in."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr "Gõ sai giá trị"
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr "gặp lỗi khi phân tách số cổng hay tên máy."
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr "Hãy sửa dữ liệu gõ."
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, song song, scsi, nối tiếp, ổ cắm, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Hãy ch�n hậu phương nào bạn muốn."
--- cupsys-1.2.1.orig/debian/po/POTFILES.in
+++ cupsys-1.2.1/debian/po/POTFILES.in
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] cupsys-bsd.templates
+[type: gettext/rfc822deb] cupsys.templates
--- cupsys-1.2.1.orig/debian/po/pt_BR.po
+++ cupsys-1.2.1/debian/po/pt_BR.po
@@ -0,0 +1,257 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cupsys\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-03-29 14:05+0000\n"
+"PO-Revision-Date: 2004-08-06 22:07-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid "Do you want to set up the BSD lpd compatibility server?"
+msgstr "Você quer configurar o servidor de compatibilidade lpd BSD ?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys-bsd.templates:4
+msgid ""
+"This package contains a server that can accept BSD-style print jobs and "
+"submit them to CUPS. It should only be set up if you have other computers "
+"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
+"computers cannot be converted to use the IPP protocol that CUPS uses."
+msgstr ""
+"Este pacote contém um servidor que pode aceitar trabalhos de impressão no "
+"estilo BSD e enviá-los ao CUPS. Isto deverá ser configurado somente se você "
+"possui outros computadores, envia trabalhos de impressão pela rede via "
+"serviços \"BSD\" ou \"LPR\" e estes computadores não podem ser convertidos "
+"para usar o protocolo IPP que o CUPS utitliza."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid "Do you want CUPS to print unknown jobs as raw jobs?"
+msgstr "Você deseja que o CUPS imprima jobs desconhecidos como jobs raw ?"
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
+"can attach an appropriate type, many jobs get submitted as the MIME type "
+"application/octet-stream. Because of this, when CUPS receives a job with "
+"that MIME type, it attempts to guess what the format is. By default, if it "
+"cannot guess the proper type, it rejects the job."
+msgstr ""
+"Todos os jobs de impressão em IPP possuem um tipo MIME. Uma vez que nem "
+"todas as fontes de jobs de impressão podem anexar um tipo apropriado, muitos "
+"jobs são submetidos com seu tipo MIME como appliction/octet-stream. Devido a "
+"isso, quando o CUPS recebe um job com esse tipo MIME, o mesmo tenta "
+"adivinhar em qual formato o job está. Por padrão, caso o CUPS não consiga "
+"adivinhar o tipo correto, o job é rejeitado."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
+"type as \"raw\" jobs, which causes them to be sent directly to the printer "
+"without processing."
+msgstr ""
+"É possível fazer com que o CUPS trate todos os jobs não reconhecidos com "
+"esse tipo MIME como jobs \"raw\", o que fará com que os mesmos sejam "
+"enviados diretamente para a impressora sem processamento prévio."
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:4
+msgid ""
+"If you will be accepting print jobs from Windows computers, you probably "
+"want this option set, as Windows gives all IPP print jobs processed by a "
+"local driver the MIME type application/octet-stream. Samba also submits its "
+"print jobs this way."
+msgstr ""
+"Caso você esteja planejando aceitar jobs de impressão de computadores "
+"Windows, você provavelmente irá precisar dessa opção habilitada, uma vez que "
+"o Windows atribui a todos os jobs de impressão IPP processados por um driver "
+"local o tipo MIME application/octet-stream. O Samba também submite jobs de "
+"impressão desta maneira."
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "ipp"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "lpd"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "parallel"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "scsi"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "serial"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "socket"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../cupsys.templates:22
+msgid "usb"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid "Printer communication backends:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"CUPS uses backend programs for communication with printer device or port."
+msgstr ""
+"O CUPS utiliza uma programa backend para comunicação com o dispositivo de "
+"impressão ou com a porta de impressão."
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Unfortunately, some backend programs cause some trouble. (For example, some "
+"PPC kernel crashes with the parallel backend)"
+msgstr ""
+"Infelizmenete, alguns programas backends causam alguns problemas. (Por "
+"exemplo, alguns kernels PowerPC travam com o backend paralelo)"
+
+#. Type: multiselect
+#. Description
+#: ../cupsys.templates:24
+msgid ""
+"Please choose the backend program to be used by CUPS. The default choice "
+"should fit the most common environments."
+msgstr ""
+"Por favor, selecione o programa backend a ser usado pelo CUPS. A escolha "
+"padrão deve se encaixar na maiorias dos ambientes."
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "Port or/and host name where CUPS will listen to:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"Please specify the port or the host name CUPS daemon will listen to. The "
+"following formats are allowed:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+" - Port number (631);\n"
+" - Host name   (debian.example.com);\n"
+" - Host:Port   (debian.example.com:631);\n"
+" - File domain socket (/var/run/cups/cups.sock)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid "You can combine any of these by delimiting in a space-separated list."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../cupsys.templates:36
+msgid ""
+"The default port 631 is reserved for the Internet Printing Protocol (IPP). "
+"\"localhost:631\" is recommended to setup a standalone environment for "
+"security reasons."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid "Broadcast and/or listen for CUPS printer information on the network?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"CUPS daemon can broadcast printer information for clients on the network, "
+"and detect printers on the network automatically."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cupsys.templates:54
+msgid ""
+"If you choose this option, the CUPS daemon will periodically send UDP "
+"broadcasts to detect printers."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Incorrect value entered"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "an error occurred while parsing the port number or the host name."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../cupsys.templates:63
+msgid "Please correct your input."
+msgstr ""
+
+#~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
+#~ msgstr "ipp, lpd, parallel, scsi, serial, socket, usb"
+
+#~ msgid "Select the backends you want."
+#~ msgstr "Selecione o backend desejado."
--- cupsys-1.2.1.orig/debian/pam
+++ cupsys-1.2.1/debian/pam
@@ -0,0 +1,3 @@
+@include common-auth
+@include common-account
+@include common-session
--- cupsys-1.2.1.orig/debian/cupsys-client.preinst
+++ cupsys-1.2.1/debian/cupsys-client.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh
+# preinst script for cupsys-client
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if [ ! -L /usr/share/doc/cupsys-client ]; then
+	    rm -rf /usr/share/doc/cupsys-client
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/libcupsimage2.postinst
+++ cupsys-1.2.1/debian/libcupsimage2.postinst
@@ -0,0 +1,46 @@
+#! /bin/sh
+# postinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        ldconfig
+        ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/NEWS
+++ cupsys-1.2.1/debian/NEWS
@@ -0,0 +1,11 @@
+cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
+
+  * This is EXPERIMENTAL version.
+    - By ABI incompatibility, KDE control center will complain.
+  * 'enable' and 'disable' commands are removed.
+    Use 'cupsenable' and 'cupsdisable' instead of them.
+  * /etc/cups/client.conf has been removed upstream. Now it becomes
+    obsolete.
+
+  
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 16 Apr 2006 17:39:36 +0900
--- cupsys-1.2.1.orig/debian/dirs
+++ cupsys-1.2.1/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- cupsys-1.2.1.orig/debian/docs
+++ cupsys-1.2.1/debian/docs
@@ -0,0 +1,8 @@
+CGI.txt
+CHANGES.txt
+CREDITS.txt
+ENCRYPTION.txt
+INSTALL.txt
+INSTALL_fr.txt
+LICENSE.txt
+README.txt
--- cupsys-1.2.1.orig/debian/suid
+++ cupsys-1.2.1/debian/suid
@@ -0,0 +1 @@
+usr/lib/cups/backend/lpd
--- cupsys-1.2.1.orig/debian/HOWTO_BUGREPORT.txt
+++ cupsys-1.2.1/debian/HOWTO_BUGREPORT.txt
@@ -0,0 +1,28 @@
+Debian users,
+
+For making clear your printing problem, I need some information.
+
+1. Please describe your CUPS version/revision. This will be written
+   automatically if you use Debian bug system tools.
+2. Please describe Your printer vendor and model, and how to connect (usb,
+   parallel, serial, lpd, ipp, http, socket, smb).
+3. Please attach your /etc/cups/printers.conf (only about problematic printer)
+4. Set LogLeveld as "debug" in your /etc/cups/cupsd.conf and reload by
+   /etc/init.d/cupsys reload. After you do something causes a problem,
+   please attach gzippped your /var/log/cups/error_log.
+5. Please attach gzipped PPD file in /etc/cups/ppd/.
+
+Before you report...
+1. If you use gs as filter, please check /usr/bin/gs indicates gs-esp.
+   gs-gnu doesn't support some drivers. If gs indicates gs-gnu, please
+   change by 'update-alternatives --config gs'.
+2. Please don't set severity to 'grave' or 'critical' if you couldn't success
+   to print out. I usually test by my printer, then upload. (it means at
+   least I can success to print out) 
+   I promise to look over your report. Please use 'important' for
+   "I can't print out by my printer!".
+
+Thanks,
+-- 
+Kenshi Muto
+kmuto@debian.org
--- cupsys-1.2.1.orig/debian/control
+++ cupsys-1.2.1/debian/control
@@ -0,0 +1,169 @@
+Source: cupsys
+Priority: optional
+Section: net
+Maintainer: Debian CUPS Maintainers <pkg-cups-devel@lists.alioth.debian.org>
+Standards-Version: 3.6.2
+Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>> 4.1.0), po-debconf, cdbs, sharutils, dpatch (>= 1.11)
+Uploaders: Kenshi Muto <kmuto@debian.org>, Masayuki Hatta <mhatta@debian.org>, Jeff Licquia <licquia@debian.org>, Martin-Éric Racine <q-funk@iki.fi>
+
+Package: cupsys
+Priority: optional
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, adduser (>= 3.12), debconf (>= 1.2.9) | debconf-2.0, patch, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3)
+Replaces: cupsys-pstoraster
+Conflicts: cupsys-pstoraster (<< 2)
+Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters
+Suggests: cupsys-bsd, cupsys-driver-gutenprint | cupsys-driver-gimpprint, foomatic-filters-ppds, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf, hplip
+Description: Common UNIX Printing System(tm) - server
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the CUPS scheduler/daemon and related files.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: cupsys-client
+Priority: optional
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, adduser
+Conflicts: lprng
+Recommends: cupsys-bsd
+Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp
+Replaces: cupsys (<= 1.1.18-3)
+Description: Common UNIX Printing System(tm) - client programs (SysV)
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the System V style print client programs.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsys2
+Priority: optional
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: libcupsys2-gnutls10
+Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
+Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
+Description: Common UNIX Printing System(tm) - libs
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the base shared libraries for CUPS.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsys2-gnutls10
+Priority: optional
+Section: libs
+Architecture: all
+Depends: libcupsys2 (>= 1.1.23-12)
+Description: Common UNIX Printing System(tm) - dummy libs for transition
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package is for transition to libcupsys2.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsys2-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Depends: libcupsys2 (= ${Source-Version}), libgnutls-dev
+Provides: libcupsys-dev
+Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
+Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
+Description: Common UNIX Printing System(tm) - development files
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the files necessary for developing CUPS-aware
+ applications and CUPS drivers.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsimage2
+Priority: optional
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libcupsys2 (<= 1.1.18-2)
+Description: Common UNIX Printing System(tm) - image libs
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the image libraries for handling the CUPS
+ raster format.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: libcupsimage2-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Depends: libcupsimage2 (= ${Source-Version}), libcupsys2-dev (= ${Source-Version}), libpng-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev
+Provides: libcupsimage-dev
+Conflicts: libcupsimage-dev
+Replaces: libcupsys1-dev, libcupsimage-dev, libcupsys2-dev (<= 1.1.18-2)
+Description: Common UNIX Printing System(tm) - image development files
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the files necessary for developing applications
+ that use the CUPS raster image format.
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
+
+Package: cupsys-bsd
+Priority: extra
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, cupsys-client (= ${Source-Version}), debconf, netbase
+Conflicts: lpr, lprng, manpages-fr (<< 0.9.5-1)
+Provides: lpr
+Replaces: lpr, cupsys (<= 1.1.15-2), manpages-fr (<< 0.9.5-1)
+Description: Common UNIX Printing System(tm) - BSD commands
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
+ general replacement for lpd and the like.  It supports the Internet 
+ Printing Protocol (IPP), and has its own filtering driver model for 
+ handling various document types.
+ .
+ This package provides the BSD commands for interacting with CUPS.  It
+ is provided separately to allow CUPS to coexist with other printing
+ systems (to a small degree).
+ .
+ The terms "Common UNIX Printing System" and "CUPS" are trademarks of
+ Easy Software Products (www.easysw.com), and refer to the original
+ source packages from which these packages are made.
--- cupsys-1.2.1.orig/debian/cupsys-bsd.postinst
+++ cupsys-1.2.1/debian/cupsys-bsd.postinst
@@ -0,0 +1,80 @@
+#! /bin/sh
+# postinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+# Debconf
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+
+	# Set documentation symlinks
+	if [ -d /usr/share/doc/cupsys ]; then
+	    if [ ! -e /usr/share/doc/cupsys-bsd ]; then
+		ln -sf cupsys /usr/share/doc/cupsys-bsd
+	    fi
+	fi
+
+	# Add cups-lpd to inetd.conf
+	db_get cupsys-bsd/setuplpd
+	if [ "$RET" = "true" ]; then
+	    update-inetd --add 'printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd'
+	fi
+
+	# Manage printcap file and associated symlinks
+	if [ -e /etc/cups/cupsd.conf ]; then
+	    if [ -e /etc/printcap.cups ]; then
+		rm -f /etc/printcap.cups
+	    fi
+	    if [ -L /etc/printcap -a ! -e /etc/printcap ]; then
+		rm -f /etc/printcap
+	    fi
+
+	    printcap_file=`egrep '^Printcap ' /etc/cups/cupsd.conf | awk '{print $2}'`
+	    if [ "$printcap_file" != "" ]; then
+		touch $printcap_file 2>/dev/null || true
+		if [ ! -e /etc/printcap -a -e $printcap_file ]; then
+		    ln -s $printcap_file /etc/printcap
+		fi
+	    fi
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/cupsys.files
+++ cupsys-1.2.1/debian/cupsys.files
@@ -0,0 +1,43 @@
+var/log/cups
+var/spool/cups
+etc/cups/cupsd.conf
+etc/cups/ppd
+etc/cups/mime.*
+usr/lib/cups/backend
+usr/lib/cups/cgi-bin
+usr/lib/cups/monitor
+usr/lib/cups/daemon/cups-polld
+usr/lib/cups/daemon/cups-deviced
+usr/lib/cups/daemon/cups-driverd
+usr/lib/cups/filter/gziptoany
+usr/lib/cups/filter/hpgltops
+usr/lib/cups/filter/imagetops
+usr/lib/cups/filter/imagetoraster
+usr/lib/cups/filter/pstops
+usr/lib/cups/filter/rastertodymo
+usr/lib/cups/filter/rastertoepson
+usr/lib/cups/filter/rastertohp
+usr/lib/cups/filter/texttops
+usr/lib/cups/filter/rastertolabel
+usr/lib/cups/notifier
+usr/sbin/cupsd
+usr/share/cups/banners
+usr/share/cups/charsets
+usr/share/cups/charmaps
+usr/share/cups/data
+usr/share/cups/doc-root
+usr/share/cups/fonts
+usr/share/cups/model
+usr/share/cups/templates
+usr/share/locale
+usr/share/man/man7/backend.7.gz
+usr/share/man/man7/filter.7.gz
+usr/share/man/man5/classes.conf.5.gz
+usr/share/man/man5/cupsd.conf.5.gz
+usr/share/man/man5/mime.convs.5.gz
+usr/share/man/man5/mime.types.5.gz
+usr/share/man/man5/printers.conf.5.gz
+usr/share/man/man8/cups-polld.8.gz
+usr/share/man/man8/cupsd.8.gz
+usr/share/man/man8/cups-deviced.8.gz
+usr/share/man/man8/cups-driverd.8.gz
--- cupsys-1.2.1.orig/debian/cupsys.prerm
+++ cupsys-1.2.1/debian/cupsys.prerm
@@ -0,0 +1,42 @@
+#! /bin/sh
+# prerm script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ -L /usr/lib/cups/backend/smb ]; then
+    rm -f /usr/lib/cups/backend/smb 2>/dev/null || true
+fi
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	(cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/local/browsing_status
+++ cupsys-1.2.1/debian/local/browsing_status
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+# (C) 2005  Canonical Ltd.
+#
+# Get the status of IPP network browsing through exit code:
+#
+# 0: browsing is disabled (default configuration)
+# 1: browsing is enabled for LAN
+# 2: the configuration was adapted manually; in this case enable_browsing cannot
+#    be used
+
+MAINCONF=/etc/cups/cupsd.conf
+BROWSECONF=/etc/cups/cups.d/browse.conf
+
+[ -f $MAINCONF -a -f $BROWSECONF ] || exit 2
+
+# if BROWSECONF is not included -> custom
+egrep -qi "^[[:space:]]*Include[[:space:]]+($BROWSECONF|$(basename $BROWSECONF))[[:space:]]*(#.*)?\$" $MAINCONF || exit 2
+
+if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(No|Off)[[:space:]]*(#.*)?$' $BROWSECONF; then
+    exit 0
+fi
+if egrep -qi '^[[:space:]]*Browsing[[:space:]]+(Yes|On)[[:space:]]*(#.*)?$' $BROWSECONF; then
+    exit 1
+fi
+exit 2
--- cupsys-1.2.1.orig/debian/local/sharing_status
+++ cupsys-1.2.1/debian/local/sharing_status
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+# (C) 2005  Canonical Ltd.
+#
+# Get the status of IPP network browsing through exit code:
+#
+# 0: sharing is disabled (default configuration)
+# 1: sharing is enabled for LAN
+# 2: the configuration was adapted manually; in this case enable_sharing cannot
+#    be used
+
+MAINCONF=/etc/cups/cupsd.conf
+PORTSCONF=/etc/cups/cups.d/ports.conf
+
+[ -f $MAINCONF -a -f $PORTSCONF ] || exit 2
+
+# if PORTSCONF is not included -> custom
+egrep -qi "^[[:space:]]*Include[[:space:]]+($PORTSCONF|$(basename $PORTSCONF))[[:space:]]*(#.*)?\$" $MAINCONF || exit 2
+
+if egrep -qi '^[[:space:]]*(Port|Listen)[[:space:]]+(631)[[:space:]]*(#.*)?$' $PORTSCONF; then
+    exit 1
+fi
+if egrep -qi '^[[:space:]]*Listen[[:space:]]+(localhost:631)[[:space:]]*(#.*)?$' $PORTSCONF; then
+    exit 0
+fi
+exit 2
--- cupsys-1.2.1.orig/debian/local/enable_sharing
+++ cupsys-1.2.1/debian/local/enable_sharing
@@ -0,0 +1,66 @@
+#!/bin/sh -e
+
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+# (C) 2005  Canonical Ltd.
+#
+# Configure CUPS IPP LAN printer sharing; this is only possible if
+# cups.d/ports.conf is included by cupsd.conf and "Listen" is present in
+# ports.conf (i. e. sharing_status returns 0 or 1). If the setting
+# changed, CUPS will be restarted.
+#
+# Argument:
+# 0: disable sharing 
+# 1: enabled sharing
+# Return 0 on success, or 1 on failure (prints error to stderr)
+
+STATUS_SCRIPT=/usr/share/cups/sharing_status
+PORTSCONF=/etc/cups/cups.d/ports.conf
+
+[ -x $STATUS_SCRIPT ] || {
+    echo "Error: cannot execute $STATUS_SCRIPT" >&2
+    exit 1
+}
+
+set +e
+$STATUS_SCRIPT
+STATUS=$?
+set -e
+
+case "$1" in
+    0)
+	NEWVAL=Off
+	;;
+    1)
+	NEWVAL=On
+	;;
+    *)
+	echo "Invalid argument (must be 0 or 1)" >&2
+	exit 1
+	;;
+esac
+
+[ $STATUS = 0 -o $STATUS = 1 ] || {
+    echo "Error: cannot modify custom configuration" >&2
+    exit 1
+}
+
+# nothing to do?
+[ $1 != $STATUS ] || exit 0
+
+
+if [ $1 = 0 ]; then
+	sed -ri "s/^[[:space:]]*(Port|Listen)[[:space:]]+631\\>/Listen localhost:631/i" $PORTSCONF
+else
+	sed -ri "s/^[[:space:]]*Listen[[:space:]]+localhost:631\\>/Listen 631/i" $PORTSCONF
+fi
+	
+
+# restart CUPS
+# Automatically added by dh_installinit
+if [ -x "/etc/init.d/cupsys" ]; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke-rc.d cupsys restart || exit 0
+    else
+	/etc/init.d/cupsys restart || exit 0
+    fi
+fi
--- cupsys-1.2.1.orig/debian/local/enable_browsing
+++ cupsys-1.2.1/debian/local/enable_browsing
@@ -0,0 +1,60 @@
+#!/bin/sh -e
+
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+# (C) 2005  Canonical Ltd.
+#
+# Configure CUPS IPP network browsing; this is only possible if
+# cups.d/browse.conf is included by cupsd.conf and "Browsing" is present in
+# browse.conf (i. e. browsing_status returns 0 or 1). If the setting
+# changed, CUPS will be restarted.
+#
+# Argument:
+# 0: disable browsing 
+# 1: enabled browsing
+# Return 0 on success, or 1 on failure (prints error to stderr)
+
+CONF=/etc/cups/cups.d/browse.conf
+STATUS_SCRIPT=/usr/share/cups/browsing_status
+
+[ -x $STATUS_SCRIPT ] || {
+    echo "Error: cannot execute $STATUS_SCRIPT" >&2
+    exit 1
+}
+
+set +e
+$STATUS_SCRIPT
+STATUS=$?
+set -e
+
+case "$1" in
+    0)
+	NEWVAL=Off
+	;;
+    1)
+	NEWVAL=On
+	;;
+    *)
+	echo "Invalid argument (must be 0 or 1)" >&2
+	exit 1
+	;;
+esac
+
+[ $STATUS = 0 -o $STATUS = 1 ] || {
+    echo "Error: cannot modify custom configuration" >&2
+    exit 1
+}
+
+# nothing to do?
+[ $1 != $STATUS ] || exit 0
+
+sed -ri "s/^([[:space:]]*Browsing[[:space:]]+)(No|Off|Yes|On)([[:space:]]*(#.*)?)\$/\\1$NEWVAL\\3/i" $CONF
+
+# restart CUPS
+# Automatically added by dh_installinit
+if [ -x "/etc/init.d/cupsys" ]; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke-rc.d cupsys restart || exit 0
+    else
+	/etc/init.d/cupsys restart || exit 0
+    fi
+fi
--- cupsys-1.2.1.orig/debian/cupsys.config
+++ cupsys-1.2.1/debian/cupsys.config
@@ -0,0 +1,143 @@
+#!/bin/sh
+
+set -e
+
+CONF=/etc/cups/cupsd.conf
+PORTS=/etc/cups/cups.d/ports.conf
+BROWSE=/etc/cups/cups.d/browse.conf
+
+# Move cupsd-browsing.conf to new location and name
+if [ -f /etc/cups/cupsd-browsing.conf -a ! -e /etc/cups/cups.d/browse.conf ]; then
+    echo "Moving /etc/cups/cupsd-browsing.conf to new location /etc/cups/cups.d/browse.conf..." >&2
+    mkdir -p /etc/cups/cups.d
+    mv /etc/cups/cupsd-browsing.conf /etc/cups/cups.d/browse.conf
+fi
+
+# Debconf library
+. /usr/share/debconf/confmodule
+
+is_ports () {
+  # syntax: parse_ports string (0: success 1: error)
+  VAL=$(echo "$1" | LC_ALL=C perl -e '$ret = ""; while (<STDIN>) { chomp;
+    @values = split(/\s+/);
+    foreach(@values) {
+      if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
+        # PORT
+        $ret .= "Port $_\\n";
+      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
+        # IP
+        $ret .= "Listen $_\\n";
+      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
+        my($tmp) = $_;
+        if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
+          if ($1 < 0 || $1 > 65535) {
+            # ERROR
+            $ret = "";
+            last;
+          }
+        }
+        # HOSTNAME
+        $ret .= "Listen $_\\n";
+      } elsif (/^\//) {
+	# domain socket
+	$ret .= "Listen $_\\n";
+      } else {
+        # ERROR
+        $ret = "";
+        last;
+      }
+    }
+    print $ret;
+  }')
+
+  if [ -z "$VAL" ]; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+db_get cupsys/raw-print
+OLD_RET=$RET
+
+db_input low cupsys/raw-print || true
+db_go
+
+db_get cupsys/raw-print
+if [ "$OLD_RET" != "$RET" ]; then
+    db_fset cupsys/raw-print changed true
+fi
+
+# remove parallel from PPC default
+ARCH=`dpkg --print-architecture`
+if [ "$ARCH" = "ppc" -o "$ARCH" = "ppc-none" ]; then
+  db_fget cupsys/backend seen
+  if [ "$RET" = "false" ]; then
+    db_set cupsys/backend "ipp, lpd, socket, usb"
+  fi
+fi
+
+db_input low cupsys/backend || true
+db_go
+
+RET=
+if [ -f "$CONF" ]; then
+  if [ "$(grep -h "Include[[:space:]]\+$PORTS" $CONF)" -a -f "$PORTS" ]; then
+    RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF $PORTS | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
+  else
+    RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
+  fi
+  if [ "$RET" ]; then
+    db_set cupsys/ports $RET
+  fi
+  db_input low cupsys/ports || true
+  db_go
+  db_get cupsys/ports
+  STATE=0
+  while ! is_ports "$RET"; do
+    db_input critical cupsys/portserror || true
+    db_go
+    db_fset cupsys/ports seen false
+    STATE=$(expr $STATE + 1)
+    if [ "$STATE" = "5" ]; then
+      echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+      exit 1
+    fi
+    db_input high cupsys/ports || true
+    db_go
+    db_get cupsys/ports
+  done
+
+  if [ "$(grep -h "Include[[:space:]]\+\($BROWSE\|cupsd-browsing.conf\)" $CONF)" -a -f "$BROWSE" ]; then
+    RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF $BROWSE | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
+  else
+    RET=$(grep -h -e "^Browsing[[:space:]]\+" $CONF | head -1 | sed -e "s/Browsing[[:space:]]\+//" | tr "A-Z" "a-z")
+  fi
+  if [ "$RET" = "off" ]; then
+    db_set cupsys/browse false
+  elif [ "$RET" = "on" ]; then
+    db_set cupsys/browse true
+  fi
+  db_input low cupsys/browse || true
+  db_go
+else
+  db_input low cupsys/ports || true
+  db_go
+  db_get cupsys/ports
+  STATE=0
+  while ! is_ports "$RET"; do
+    db_input critical cupsys/portserror || true
+    db_go
+    db_fset cupsys/ports seen false
+    STATE=$(expr $STATE + 1)
+    if [ "$STATE" = "5" ]; then
+      echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
+      exit 1
+    fi
+    db_input low cupsys/ports || true
+    db_go
+    db_get cupsys/ports
+  done
+  db_input low cupsys/browse || true
+  db_go
+fi
--- cupsys-1.2.1.orig/debian/rules
+++ cupsys-1.2.1/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+unpatch: deapply-dpatches
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --disable-pdftops --disable-launchd --with-cups-user=cupsys --with-cups-group=lp --with-system-groups=lpadmin --enable-privilege-dropping
+DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
+#DESTDIR=$(DEB_DESTDIR) BINDIR=$(DEB_DESTDIR)/usr/bin SBINDIR=$(DEB_DESTDIR)/usr/sbin INCLUDEDIR=$(DEB_DESTDIR)/usr/include LIBDIR=$(DEB_DESTDIR)/usr/lib SERVERBIN=$(DEB_DESTDIR)/usr/lib/cups SERVERROOT=$(DEB_DESTDIR)/etc/cups BUILDROOT=$(DEB_DESTDIR)
+DEB_DH_INSTALLINIT_ARGS := -u'defaults 19'
+
+clean::
+	-rm core
+	-$(MAKE) clean
+	-rm man/*.gz man/*.z man/*.1 man/*.5 man/*.8 man/*.o man/mantohtml
+	-rm -f doc/help/man-*.html doc/help/standard.html doc/index.html
+	-rm -f conf/pam.std packaging/cups.list templates/edit-config.tmpl
+	-rm cups/libcups.so
+	-rm cups/libcups.a
+	-rm filter/libcupsimage.so
+	-rm filter/libcupsimage.a
+	-rm pdftops/libxpdf.a
+	-rm scheduler/testdirsvc scheduler/testdirsvc.o
+	-rm cups/testfile cups/testfile.o cups/http-addrlist.o
+	-rm backend/http
+	-rm systemv/disable systemv/enable systemv/reject
+	-rm cups-config cups.list conf/cupsd.conf conf/pam.conf
+	-rm config.log config.h config.cache config.status Makedefs cups.sh
+	-rmdir --ignore-fail-on-non-empty debian/patched
+	-rm -f doc/es/index.html doc/ja/index.html man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man man/cupsd.conf.man man/lpoptions.man templates/ja/header.tmpl templates/es/header.tmpl templates/header.tmpl init/cups.sh init/cups-lpd
+
+common-install-prehook-impl::
+	(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
+$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
+	dh_movefiles -p$(cdbs_curpkg)
+binary-post-install/cupsys::
+	mv debian/cupsys/usr/lib/cups/backend/* debian/cupsys/usr/lib/cups/backend-available
+	install -o root -g root -m 644 doc/favicon.ico debian/cupsys/usr/share/cups/doc-root
+	(cd $(DEB_DESTDIR) && mv var/spool var/log $(DEB_DESTDIR)/../cupsys/var)
+	(cd $(DEB_DESTDIR) && mv etc/cups/interfaces etc/cups/ppd $(DEB_DESTDIR)/../cupsys/etc/cups)
+	(cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf ../../cups/doc-root online-docs)
+	#(cd $(DEB_DESTDIR)/../cupsys/usr/share/man && mv man1/backend.1 man1/cups-backend.1 && mv man1/filter.1 man1/cups-filter.1)
+	(install -m 755 -o root -g root $(DEB_DESTDIR)/../pdftops $(DEB_DESTDIR)/../cupsys/usr/lib/cups/filter/)
+	install -o root -g root -m 644 debian/cupsys.default debian/cupsys/etc/default/cupsys
+	install -m 755 debian/local/browsing_status debian/local/enable_browsing debian/local/sharing_status debian/local/enable_sharing $(DEB_DESTDIR)/../cupsys/usr/share/cups
+
+	# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
+	# http://wiki.debian.org/PpdFileStructureSpecification
+	for i in $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/*.ppd; do \
+	  m=$$(sed -n -e '/^\*Manufacturer:/s/.*"\([^"]*\)".*/\1/p' $$i); \
+	  mkdir -p "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m"; \
+	  mv $$i "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m/"; \
+	done
+
+	# Compatibility for programs which still look in the old location
+	ln -s ../../ppd/cups-included $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/cups-included
+	ln -s ../../ppd/custom $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/custom
+
+binary-post-install/libcupsimage2-dev::
+	rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
+	ln -s libcupsimage2 debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
+binary-post-install/libcupsys2-gnutls10::
+	rm -r debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
+	ln -s libcupsys2 debian/libcupsys2-gnutls10/usr/share/doc/libcupsys2-gnutls10
+binary-post-install/cupsys-bsd::
+	rm -r debian/cupsys-bsd/usr/share/doc/cupsys-bsd
+	ln -s libcupsys2 debian/cupsys-bsd/usr/share/doc/cupsys-bsd
+binary-post-install/libcupsys2-dev::
+	rm -r debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
+	ln -s libcupsys2 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
+binary-post-install/cupsys-client::
+	rm -r debian/cupsys-client/usr/share/doc/cupsys-client
+	ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client
--- cupsys-1.2.1.orig/debian/cupsys-bsd.config
+++ cupsys-1.2.1/debian/cupsys-bsd.config
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# Debconf library
+. /usr/share/debconf/confmodule
+
+db_input medium cupsys-bsd/setuplpd || true
+db_go
--- cupsys-1.2.1.orig/debian/cupsys.postinst
+++ cupsys-1.2.1/debian/cupsys.postinst
@@ -0,0 +1,226 @@
+#! /bin/sh
+# postinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+# Debconf
+. /usr/share/debconf/confmodule
+
+# Default Configuration file
+if [ -e /etc/default/cupsys ]; then
+	. /etc/default/cupsys
+fi
+
+case "$1" in
+    configure)
+	[ -f /etc/cups/printers.conf.save ] && mv /etc/cups/printers.conf.save /etc/cups/printers.conf
+	[ -f /etc/cups/classes.conf.save ] && mv /etc/cups/classes.conf.save /etc/cups/classes.conf
+
+	# Set up lpadmin group.
+	if [ -z "`getent group lpadmin`" ]; then 
+	    addgroup --system lpadmin
+	fi
+	if [ -n "`getent group lpadmin | awk -F: '{ print $4 }' | awk -F, '{ for (i=1; i <= NF; i++ ) print $i }' |grep '^root$'`" ]; then
+	    # Bug#214746
+	    echo "Deleting root from lpadmin group. If you use NIS/LDAP, change this manually."
+	    deluser root lpadmin || true
+	fi
+
+	# Set up cupsys user.
+	if [ -z "`getent passwd cupsys`" ]; then
+	    adduser --quiet --system --no-create-home --ingroup lpadmin cupsys
+	fi
+	
+	# necessary for access to local parallel and usb printers
+	adduser --quiet cupsys lp
+	# necessary for access to local serial printers
+	adduser --quiet cupsys dialout
+	# necessary for web authentication
+	# disabled by default since lpadmin membership is sufficient
+	# adduser --quiet cupsys shadow
+	# necessary for access to printer/scanner combo devices
+	if [ -z "`getent group scanner`" ]; then
+	    addgroup --system scanner
+	fi
+	adduser --quiet cupsys scanner
+
+	if [ -d /etc/cups/certs ]; then
+	    rm -rf /etc/cups/certs
+	fi
+	if [ -d /var/spool/cups/certs ]; then
+	    mv /var/spool/cups/certs/* /var/run/cups/certs || true
+	    rm -rf /var/spool/cups/certs
+	fi
+
+	[ -f /etc/cups/ppds.dat ] && mv /etc/cups/ppds.dat /var/cache/cups/ppd
+
+	# Set up smb backend by symlinking to smbspool.
+	if [ -x /usr/bin/smbspool -a ! -e /usr/lib/cups/backend/smb ]; then
+	    ln -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
+	fi
+
+	# Generate raw MIME handling files if they don't already exist.
+	if [ ! -e /etc/cups/raw.types ]; then
+	    cat >/etc/cups/raw.types <<EOF
+# This file was generated by the cupsys package.  You may change it, or
+# reconfigure this file with dpkg-reconfigure.  If it is removed, it
+# will be regenerated by the package scripts.
+
+application/octet-stream
+EOF
+	fi
+	if [ ! -e /etc/cups/raw.convs ]; then
+	    cat >/etc/cups/raw.convs <<EOF
+# This file was generated by the cupsys package.  You may change it, or
+# reconfigure this file with dpkg-reconfigure.  If it is removed, it
+# will be regenerated by the package scripts.
+
+application/octet-stream	application/vnd.cups-raw	0	-
+EOF
+	fi
+
+	# Set up raw printing of application/octet-stream if desired.
+	db_fget cupsys/raw-print changed
+	if [ "$RET" = "true" ]; then
+	    mv /etc/cups/raw.convs /etc/cups/raw.convs-convert
+	    db_get cupsys/raw-print
+	    if [ "$RET" = "true" ]; then
+		sed 's/^\s*#\s*application/application/' \
+		    < /etc/cups/raw.convs-convert > /etc/cups/raw.convs
+	    else
+		sed 's/^application/#application/' \
+		    < /etc/cups/raw.convs-convert > /etc/cups/raw.convs
+	    fi
+	    rm -f /etc/cups/raw.convs-convert
+	    db_fset cupsys/raw-print changed false
+	fi
+	# Set up backends
+	(cd /usr/lib/cups/backend && rm -f http ipp lpd parallel scsi serial socket usb)
+	db_get cupsys/backend && SELECTED=$RET
+	list=`echo $SELECTED | sed -e 's/, /,/g'`
+	save_IFS=$IFS
+	IFS=,
+	for module in $list; do
+	  ln -s ../backend-available/$module /usr/lib/cups/backend/$module
+	  if [ "$module" = "ipp" ]; then
+            ln -s ipp /usr/lib/cups/backend/http
+	  fi
+	done
+
+	# Create password file for Digest authentication
+        # (removed: Debian CUPS uses PAM and basic authentication)
+	#db_get cupsys/adminpassword
+        #VAL=$(echo -n "root:CUPS:$RET" | md5sum | cut -d' ' -f1)
+	#if [ -f /etc/cups/passwd.md5 ]; then
+        #  if [ "$(grep "^root:" /etc/cups/passwd.md5)" ]; then
+	#    sed -e "s/^root:lpadmin:.*/root:lpadmin:$VAL/" /etc/cups/passwd.md5 > /etc/cups/passwd.md5.$$
+	#    mv /etc/cups/passwd.md5.$$ /etc/cups/passwd.md5
+        #  else
+	#    echo "root:lpadmin:$VAL" >> /etc/cups/passwd.md5
+        #  fi
+	#else
+	#  echo "root:lpadmin:$VAL" > /etc/cups/passwd.md5
+	#  chown root:nogroup /etc/cups/passwd.md5
+	#  chmod 600 /etc/cups/passwd.md5
+	#fi
+
+	# Create /etc/cups/cups.d/ports.conf and /etc/cups/cups.d/browse.conf
+	db_get cupsys/ports
+	VAL=$(echo "$RET" | perl -e '$ret = ""; while (<STDIN>) { chomp;
+	    @values = split(/\s+/);
+	    foreach(@values) {
+	      if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
+	        # PORT
+	        $ret .= "Port $_\\n";
+	      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
+	        # IP
+	        $ret .= "Listen $_\\n";
+	      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
+	        my($tmp) = $_;
+	        if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
+	          if ($1 < 0 || $1 > 65535) {
+	            # ERROR
+	            $ret = "";
+	            last;
+	          }
+	        }
+	        # HOSTNAME
+	        $ret .= "Listen $_\\n";
+	      } elsif (/^\//) {
+	        # domain socket
+	        $ret .= "Listen $_\\n";
+	      } else {
+	        # ERROR
+	        $ret = "";
+	        last;
+	      }
+	    }
+	    print $ret;
+	  }')
+
+	if [ -z "$VAL" ]; then
+	  echo "Error: debconf has an invalid value. Run 'dpkg-reconfigure cupsys' again."
+	  return 1
+	else
+	  /bin/echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
+	fi
+
+	db_get cupsys/browse
+	if [ "$RET" = "true" ]; then
+	  /bin/echo "Browsing on" > /etc/cups/cups.d/browse.conf
+	else
+	  /bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
+	fi
+
+	# fix browse.conf Include directive for upgrades
+	if dpkg --compare-versions "$2" le-nl "1.1.23-10ubuntu4" &&
+	   test -e /etc/cups/cupsd.conf &&
+	   grep -q '^Include cupsd-browsing.conf\>' /etc/cups/cupsd.conf; then
+	    sed -i 's_^Include cupsd-browsing.conf_Include /etc/cups/cups.d/browse.conf_' /etc/cups/cupsd.conf
+	fi
+
+	# fix permissions for upgrades which might have written cache files as
+	# root
+	if [ -d /var/cache/cups ]; then
+	    chown -R cupsys:lp /var/cache/cups || true
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+db_stop
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/cupsys.init.d
+++ cupsys-1.2.1/debian/cupsys.init.d
@@ -0,0 +1,81 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/cupsd
+NAME=cupsd
+PIDFILE=/var/run/cups/$NAME.pid
+DESC="Common Unix Printing System"
+
+unset TMPDIR
+
+test -f $DAEMON || exit 0
+
+set -e
+
+. /lib/lsb/init-functions
+
+# Get the timezone set.
+if [ -z "$TZ" -a -e /etc/timezone ]; then
+    TZ=`cat /etc/timezone`
+    export TZ
+fi
+
+case "$1" in
+  start)
+	log_begin_msg "Starting $DESC: $NAME"
+	chown root:lpadmin /usr/share/ppd/custom 2>/dev/null || true
+	chmod 3775 /usr/share/ppd/custom 2>/dev/null || true
+	mkdir -p `dirname "$PIDFILE"`
+	chown cupsys:lp `dirname "$PIDFILE"`
+
+	# create the logs file since cupsd can't
+	for l in access_log page_log error_log; do
+	    if [ ! -e /var/log/cups/$l ]; then
+		 touch /var/log/cups/$l
+		 chmod 640 /var/log/cups/$l
+		 chown cupsys:lpadmin /var/log/cups/$l
+	    fi
+	done
+
+	# load modules for parallel printer support which are not covered by
+	# udev
+	modprobe lp 2>/dev/null || true
+	modprobe ppdev 2>/dev/null || true # for ISO-1284 device name detection
+
+	start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON
+	log_end_msg $?
+	;;
+  stop)
+	log_begin_msg "Stopping $DESC: $NAME"
+	start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	log_begin_msg "Restarting $DESC: $NAME"
+	if start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME; then
+		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON
+	fi
+	log_end_msg $?
+	;;
+  status)
+	echo -n "Status of $DESC: "
+	if [ ! -r "$PIDFILE" ]; then
+		echo "$NAME is not running."
+		exit 3
+	fi
+	if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
+		echo "$NAME is running."
+		exit 0
+	else
+		echo "$NAME is not running but $PIDFILE exists."
+		exit 1
+	fi
+	;;
+  *)
+	N=/etc/init.d/${0##*/}
+	echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- cupsys-1.2.1.orig/debian/libcupsimage2.files
+++ cupsys-1.2.1/debian/libcupsimage2.files
@@ -0,0 +1,2 @@
+usr/lib/libcupsimage.so.*
+usr/lib64/libcupsimage.so.*
--- cupsys-1.2.1.orig/debian/changelog
+++ cupsys-1.2.1/debian/changelog
@@ -0,0 +1,2343 @@
+cupsys (1.2.1-0ubuntu1) dapper-updates; urgency=low
+
+  * Upgrade to new upstream version 1.2.1 (backported from edgy):
+    - fix for printing on Xerox IPP printers; Closes: LP#47387
+    - fix for banners on single page
+    - fix for custom page sizes (cups ignores them now in some cases)
+    - fix for -u and -U switches for lpadmin
+    - fix for printing on some Canon printers
+    - fix for printing on CUPS server < 1.1.17 (RHEL3 and older)
+      (partly fixes LP bug #42802)
+    - couple of fixes for imagetoraster
+  * Add debian/patches/00_r5643.dpatch: Pull some fixes from upstream SVN
+    scheduled to go into 1.2.2:
+    - The lpstat command did not use the correct character
+      set when reporting the date and time (STR #1751)
+    - The cupsaddsmb command and web interface did not update
+      the Windows PPD files properly, resulting in corrupt
+      PPD files for the Windows client to use (STR #1750)
+    - The cupsd.conf man page didn't describe the Listen
+      domain socket syntax (STR #1753)
+    - The scheduler no longer tries to support more than
+      FD_SETSIZE file descriptors.
+    - The USB backend now reports a "no such device" error
+      when using the old filename-based USB URIs instead of
+      the "success" error.
+    - Increased the HTTP and IPP read timeouts to 10 seconds,
+      as 1 second was too short on congested networks (STR
+      #1719)
+    - Fixed another file descriptor leak when printing raw
+      files (STR #1736)
+    - The scheduler didn't always choose the least costly
+      filter.
+    - Fixed parsing of IPv6 addresses in Allow, Deny,
+      BrowseAllow, BrowseDeny, and BrowseRelay directives
+      (STR #1713)
+    - Special cases for the "localhost" hostname did not
+      work, causing printing to not work when the /etc/hosts
+      file did not contain a localhost entry (STR #1723)
+    - Updated the Spanish translation (STR #1720)
+    - Reverse-order page output was broken when N-up or
+      landscape orientations were used (STR #1725)
+    - The parallel, serial, socket, and USB backends needed
+      print data before they would report back-channel data,
+      causing problems with several new drivers (STR #1724)
+  * Ship /etc/cups/ssl directory. Closes: LP#44931
+  * Removed debian/patches/svn*.dpatch, these were backported from 1.2.1 in
+    1.2.0-0ubuntu3.
+  * debian/cupsys.init.d: Add missing log_end_msg. Closes: LP#48116
+  * Bump up shlibs to >= 1.2.1 for compatibility safety.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  6 Jul 2006 19:25:04 +0200
+
+cupsys (1.2.0-0ubuntu5) dapper; urgency=low
+
+  * Remove debian/patches/56_revert_svn_5438.dpatch: The reason for this
+    reversion has now been fixed in gnome-cups-manager 0.31-1.1ubuntu8. This
+    fixes the handling of spaces in manufacturer names. Closes: LP#33545
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 17 May 2006 13:18:05 +0200
+
+cupsys (1.2.0-0ubuntu4) dapper; urgency=low
+
+  * Add debian/patches/svn5530_str1667_octet_stream.dpatch: Fix printing of
+    application/octet-stream jobs (usually from Windows clients with locally
+    installed driver). (STR #1667) Closes: LP#43145
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 17 May 2006 08:58:16 +0200
+
+cupsys (1.2.0-0ubuntu3) dapper; urgency=low
+
+  * Pull some bug fixes from SVN head:
+  * Add debian/patches/svn5512_KCMYcm_fix.dpatch: Fix bug in KCMYcm handling
+    (typo in variable name).
+  * Add debian/patches/svn5518_12bitraster.dpatch: Make sure we swap 12/16 bit
+    chunky data in raster filter.
+  * Add debian/patches/svn5523_1_2_4bit_raster.dpatch:
+    - Fix imagetoraster generation of 1/2/4-bit raster data.
+    - Fix cupsRasterWritePixels() - bad double line termination.
+  * Add debian/patches/svn5526_str1676_stopped_jobs_active.dpatch: Fix stopped
+    jobs to be considered active (STR #1676).
+  * Add debian/patches/svn5527_LDAP_define.dpatch: Fix typo in #ifdef:
+    s/OPENDAP/OPENLDAP/.
+  * Add debian/patches/svn5527_str1683_lpstaterror.dpatch: The lpstat command
+    displayed the wrong error message for a missing destination (STR #1683).
+  * Add debian/patches/svn5527_str1689_printeroptions.dpatch: "Set Printer
+    Options" in the web interface did not update the DefaultImageableArea or
+    DefaultPaperDimension attributes in the PPD file (STR #1689).
+  * Add debian/patches/svn5528_str1680_load_custom_options.dpatch: ppdOpen*()
+    did not load custom options properly (STR #1680).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 16 May 2006 12:39:35 +0200
+
+cupsys (1.2.0-0ubuntu2) dapper; urgency=low
+
+  * debian/cupsys.init:
+    - Load the 'lp' module. Earlier installers did not put it in /etc/modules
+      and we keep getting dozens of bug reports about that, so let's just fix it
+      here once and for all.
+    - Load the 'ppdev' module. This should fix detection of parallel printers.
+      Closes: LP#29050
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 11 May 2006 11:09:59 +0200
+
+cupsys (1.2.0-0ubuntu1) dapper; urgency=low
+
+  * Final 1.2.0 upstream release (bug fixes only). Closes: LP#43898
+  * Remove debian/patches/01_cupsimage.dpatch, fixed upstream.
+  * Remove debian/patches/57_svn_5461.dpatch, fixed upstream.
+  * debian/patches/58_cupsd.conf-AllowLocal.dpatch: Fix typo: @LOCAL@ ->
+    @LOCAL. Closes: LP#43933
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 10 May 2006 12:09:54 +0200
+
+cupsys (1.1.99.rc3-0ubuntu4) dapper; urgency=low
+
+  * Add debian/patches/58_cupsd.conf-AllowLocal.dpatch: Add 'Allow @LOCAL'
+    to server ACL to actually allow LAN computers to access the printer if
+    sharing is enabled. This avoid having to change two things for enabling
+    printer sharing (a source of much confusion and a FAQ). This does not
+    change the default behavior (port only listens on localhost by default).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue,  9 May 2006 17:53:02 +0200
+
+cupsys (1.1.99.rc3-0ubuntu3) dapper; urgency=low
+
+  * debian/cupsys.config: Print migration note to stderr, not stdout, to not
+    confuse debconf. Closes: LP#41716
+  * debian/cupsys.postinst: Fix ownership of files in /var/cache/cups/ so that
+    they are writable by non-root cupsd. Earlier dapper versions got the
+    ownership wrong, so fix this for intra-dapper upgrades. Closes: LP#40795
+  * Add debian/local/{sharing_status,enable_sharing}: Scripts to control
+    printer sharing (by opening or closing the TCP port). Thanks to Ante
+    Karamatić for his initial scripts and research!
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue,  9 May 2006 16:33:19 +0200
+
+cupsys (1.1.99.rc3-0ubuntu2) dapper; urgency=low
+
+  * debian/cupsys.init.d: Fix log creation for real. Closes: LP#41267
+  * debian/cupsys.logrotate: Create files as cupsys:lpadmin, not root:lp.
+    (Also part of LP#41267)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue,  2 May 2006 19:36:22 +0200
+
+cupsys (1.1.99.rc3-0ubuntu1) dapper; urgency=low
+
+  * New upstream bug fix release 1.2RC3, UVF exception approved by Matt
+    Zimmerman.
+  * Add debian/patches/56_revert_svn_5438.dpatch: Revert upstream svn commit
+    5438 (fixed handling of products/manufacturers with spaces in the name)
+    for now since it causes regressions in gnome-cups-add. Will be reactivated
+    later when the issue is sorted out with upstream.
+  * Update patches for new upstream release.
+  * Remove debian/patches/20_httpGetHostname_crash.dpatch, fixed upstream.
+  * Add debian/patches/14_dont_force_ssl.dpatch: Upstream now requires
+    encryption by default for accessing /admin/, but our GUI frontends do not
+    yet cope with that. Disable SSL requirement for now to revert to the old
+    behaviour.
+  * debian/patches/08_cupsd.conf.conf.d.dpatch:
+    - Set "BrowseAddress @LOCAL"; without this, sending browsing information
+      does not work (Browsing still has to be enabled). Since enable_browsing
+      now works for exporting printers, too, this Closes: LP#17981
+    - Add some comments to point out that the Port and Browsing settings are
+      moved to /etc/cups/cups.d/.
+  * debian/cupsys.postrm: Clean up passwd.md5 on purge.
+  * debian/cupsys.init.d: Pre-create error_log, too, and clean up code a bit.
+    Closes: LP#41267
+  * debian/cupsys.postinst: If upgrading from Breezy, adapt the inclusion of
+    external browsing configuration in cupsd.conf to retain the correct
+    setting for modified cupsd.conf files.
+  * debian/cupsys.config:
+    - Fix handling of cupsd-browsing.conf -> cups.d/browse.conf transition for
+      breezy->dapper upgrades.
+    - Fix browse.conf parsing to set the correct debconf default value, so
+      that the browse setting is not reset to 'off' on upgrades.
+      Closes: LP#38704
+  * Add debian/patches/57_svn_5461.dpatch:
+    - Properly HTML-quote the printer name so that names containing e. g. '+'
+      work properly in the web interface.
+    - Upstream svn commit 5461.
+    - Closes: LP#37018
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 25 Apr 2006 20:09:37 +0200
+
+cupsys (1.1.99.rc2-0ubuntu2) dapper; urgency=low
+
+  * debian/cupsys-client.links: Fix cupsenable/cupsdisable manpage link.
+    Closes: LP#40725
+  * debian/patches/09_runasuser.dpatch: Do not drop additional group
+    privileges in scheduler/process.c. This should fix a range of bugs
+    concerning detection of parallel port printers and other 'permission
+    denied' bugs.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 24 Apr 2006 19:17:12 +0200
+
+cupsys (1.1.99.rc2-0ubuntu1) dapper; urgency=low
+
+  * Many changes have been applied in Debian now; reapply remaining Ubuntu
+    changes from scratch to clean up some cruft (see below for details). Also,
+    maintain Ubuntu package as SVN branch of the Debian one.
+  * debian/rules: Enable --with-cups-user=cupsys and
+    --enable-privilege-dropping to not run cupsd as root.
+  * debian/control: Remove libdbus-1-dev build dependency, dbus support is not
+    something for dapper.
+  * debian/cupsys.init.d: Disable reload (it doesn't work as normal user),
+    change force-reload to restart.
+  * debian/cupsys.init.d: Pre-create access_log and error_log since cupsd
+    can't create them as normal user.
+  * debian/rules: Set rc runlevel priority to 19.
+  * debian/cupsys.{postinst,postrm}, debian/cupsys-client.postinst:
+    Setup/remove cupsys user and its needed groups.
+  * debian/cupsys.templates: Disable browsing by default due to our 'no open
+    ports in the default install' policy.
+  * debian/README.Debian: Explain disabling of administrative functions in web
+    interface and describe how to re-enable it.
+  * debian/cupsys.preinst:
+    - Migrate /etc/cups/cupsd-browsing.conf to /etc/cups/cups.d/browse.conf
+      for smooth upgrades from Hoary.
+    - Fix owner of /etc/cups/ppd/* on upgrades.
+  * debian/patches/ubuntu-nowebadmin.dpatch: Explain disabling of
+    administrative functions in the web interface and point to doc how to
+    reenable it.
+  * debian/patches/55_ppd_okidata_name.dpatch: Change "Oki" manufacturer name
+    to "Okidata" to be consistent with other PPD files.
+  * Implement http://wiki.debian.org/PpdFileStructureSpecification:
+    - debian/dirs: Create /usr/share/ppd/cups-included/.
+    - debian/rules: Install shipped PPDs into
+      /usr/share/ppd/cups-included/<Manufacturer>/ and provide a symlink to
+      the old /usr/share/cups/model directory for backwards compatibility.
+  * debian/libcupsys2.shlibs: Remove Debian revision to allow -0ubuntuN
+    number.
+  * Support custom PPD installation by lpadmin members (through e. g.
+    gnome-cups-manager):
+    - debian/cupsys.dirs: Create /usr/share/ppd/custom/.
+    - debian/cupsys.init.d: Fix permissions of that dir to root:lpadmin 3775.
+    - debian/rules: Install compatibility symlink
+      /usr/share/cups/model/custom.
+  * debian/cupsys.dirs: Ship /usr/lib/cups/driver/ to avoid error messages if
+    it's missing.
+  * debian/patches/09_runasuser.dpatch, scheduler/cert.c: Change root
+    certificate permissions from 0440 to 0240, so that the CGI programs cannot
+    read it any more. Without this patch, cupsd presented its own certificate
+    to itself, and *every* user could do admin tasks without authentication.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 21 Apr 2006 16:19:37 +0200
+
+cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
+
+  [ Kenshi Muto ]
+  * New upstream release 1.2RC2.
+    - Because -fpie config becomes optional, compiler works on amd64 and
+      other architectures. (closes: #335199)
+  * Enable LDAP support.
+  * Remove duplicated update-rc.d (closes: #356911)
+  * Stopped asking admin password because it works only if user chooses
+    digest authentication. The default configuration of Debian uses
+    PAM and basic authentication.
+  * Enable dbus support.
+  * 03_clean.dpatch: Remove produced and remained files during build.
+  * Now CUPS uses 'lp' user/group privilege to call backend or any other
+    programs.
+    CUPS SystemGroup is 'lpadmin'. You need to add users who are allowed
+    to add/modify/remove printers/jobs/classes.
+  * Remove image.h.patch from source. It is no longer needed.
+  * 02_configure.dpath: Remove -rpath from configure.
+  * Fix typo in cupsys-bsd description. (closes: #362070)
+  * Add Galician debconf translation. (closes: #361258)
+  * Update Danish debconf translation. (closes: #357969)
+  * Use 'reload' during logrotate instead of 'restart'. It looks safe
+    on CUPS 1.2. (though job-restart problem still remains)
+  * set TZ in init script only if TZ isn't defined yet.
+  * Use if-fi structure style for postrotate of logrotate script.
+    It solves error when cupsys is not running. (closes: #347641)
+  * Unset TMPDIR environment variable before running daemon. (closes: #347829)
+  * Removed /etc/cups/pdftops.conf because it was for pdftops of upstream
+    version. Debian CUPS uses xpdf-utils wrapper and doesn't need
+    pdftops.conf.
+  * Notice: /etc/cups/client.conf has been removed upstream.
+  * Notice: {dis,en}able have been renamed to cups{dis,en}able.
+
+  [ Martin Pitt ]
+  * debian/patches/48_stdlib.dpatch: Adapted to new upstream version.
+  * debian/cupsys.init.d:
+    - Fix arguments of start-stop-daemon and remove the hideous kill
+      algorithm.
+    - Ensure that /var/run/cupsd exists; this makes the init script work with
+      /var/run mounted on a tmpfs.
+  * debian/libcupsys2-dev.files, debian/libcupsimage2-dev.files: Remove static
+    library; upstream does not build them any more, and they are useless
+    anyway.
+  * Add debian/patches/06_disable_backend_setuid.dpatch: Remove the uid
+    changing in scheduler/cups-deviced.c which was introduced recently in
+    upstream. It totally breaks device node access (e. g. /dev/lp0 is root:lp
+    0660, which is inaccessible for a process which runs as lp:root).
+  * debian/rules: Remove --with-cups-user, upstream does not support
+    it any more.
+  * debian/patches/09_runasuser_fixes.dpatch: RunAsUser was removed upstream;
+    rename the patch to 09_runasuser.dpatch and rewrite it:
+    - Enclose all changes in an #if CUPS_DROP_PRIVILEGES, so that it is easy to
+      enable this feature.
+    - scheduler/main.c: Drop privileges after initialization.
+    - scheduler/conf.c: If we build with CUPS_DROP_PRIVILEGES, set RunUser to
+      User instead of getuid(), since at that point we will always run as root
+      (privileges cannot yet be dropped at that point).
+    - config-scripts/cups-defaults.m4: Add --enable-privilege-dropping option.
+    - config.h.in: Add CUPS_DROP_PRIVILEGES option template.
+  * Add debian/patches/09_runasuser_autoconf.dpatch: autoconf changes for
+    09_runasuser_fixes.dpatch changes.
+  * debian/pdftops: Fix reading from stdin (https://launchpad.net/bugs/17124)
+  * debian/cupsys.preinst: Remove dangling /etc/cups/pdftops.conf symlink on
+    upgrades to unbreak printing with poppler-utils.
+  * debian/control: Add poppler-utils alternative for xpdf-utils dependency.
+  * Add debian/patches/12_quiesce_ipp_logging.dpatch:
+    - Drop successful IPP messages to log level 'debug' and unsuccessful ones
+      to 'info'.
+    - Do not flood access_log with successful CUPS-Get-Printers and
+      Get-Printer-Attributes queries (which are generated by e. g.
+      gnome-cups-icon every 3 seconds).
+    - Closes: #280718
+  * Add debian/patches/13_default_log_warn.dpatch: Raise default log severity
+    to 'warning' to not log gazillions of IPP requests by default. (other part
+    of #280718)
+  * debian/rules, debian/cupsys.postinst: Remove obsolete /etc/cups/certs and
+    /var/lib/cups/certs (certificates are managed in /var/run/certs now).
+  * debian/cupsys.preinst: Remove obsolete /etc/cups/certs symlink on upgrades.
+  * debian/cupsys-client.files: Install cupstestdsc and manpage.
+  * debian/cupsd.init: Have force-reload to reload, not restart.
+  * debian/cupsys.logrotate: Use force-reload instead of reload, since the
+    latter is not required to exist by Debian Policy.
+  * debian/rules: Ship browsing_status and enable_browsing.
+  * debian/patches/20_httpGetHostname_crash.dpatch: Add some robustifications
+    to httpGetHostname() to hopefully fix a reported crash.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 16 Apr 2006 17:49:57 +0900
+
+cupsys (1.1.99.b1.r4929-0ubuntu9) dapper; urgency=low
+
+  * Correct permissions of /var/run/cups in the init script.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 19 Apr 2006 14:15:14 +0100
+
+cupsys (1.1.99.b1.r4929-0ubuntu8) dapper; urgency=low
+
+  * Disable 53_usr_share_ppd_support.dpatch again, too many
+    packages still have /usr/share/cups/model hardcoded.
+  * Symlink /usr/share/cups/model/cups-included to /usr/share/ppd/cups-included.
+  * Place ppd files in manufacturer specific subdirectories.
+  * Change "Oki" manufacturer name to "Okidata".
+  * Symlink /usr/share/cups/model/custom to /usr/share/ppd/custom.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 12 Apr 2006 19:26:18 +0200
+
+cupsys (1.1.99.b1.r4929-0ubuntu7) dapper; urgency=low
+
+  * debian/cupsys.init.d: Move log_end_msg to the right place again.
+  * Add debian/patches/53_usr_share_ppd_support.dpatch:
+    - Look for PPDs in /usr/share/ppd, according to
+      http://wiki.debian.org/PpdFileStructureSpecification.
+    - Fixes Debian bug #358186.
+  * debian/rules: Install PPD files into /usr/share/ppd/cups-included,
+    according to above specification.
+  * debian/patches/54_cups-config_modeldir.dpatch: Add --modeldir to
+    cups-config so that other packages can use it to figure out the correct
+    PPD base path.
+  * debian/libcupsys2.shlibs: Bump version number so that other packages can
+    rely on cups-config's modeldir.
+  * Re-add debian/patches/51_dont_log_ipp_printer_query.dpatch, since these
+    log messages are routed through a different code path.
+  * debian/cupsys.init.d: Change custom PPD path from /usr/share/cups/ppd to
+    /usr/share/ppd/custom.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  7 Apr 2006 17:14:25 +0200
+
+cupsys (1.1.99.b1.r4929-0ubuntu6) dapper; urgency=low
+
+  * Add debian/patches/51_ipp_log_severity_info.dpatch: Drop successful IPP
+    messages to log level 'debug' and unsuccessful ones to 'info'. This is a
+    more generic approach to avoid ridiculously huge logs due to polling by
+    gnome-cups-icon and friends.
+  * Drop debian/patches/51_dont_log_ipp_printer_query.dpatch, obsoleted by
+    above patch.
+  * Add debian/patches/52_default_log_level_warning.dpatch: Raise default log
+    level from info to warning. Closes: LP#38042
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  6 Apr 2006 12:05:45 +0200
+
+cupsys (1.1.99.b1.r4929-0ubuntu5) dapper; urgency=low
+
+  * debian/patches/51_dont_log_ipp_printer_query.dpatch: Suppress logging of
+    successful CUPS_GET_DEFAULT messages, too. Closes: LP#29895
+  * debian/pdftops: Fix reading from stdin. Closes: LP#17124
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 30 Mar 2006 19:52:20 +0200
+
+cupsys (1.1.99.b1.r4929-0ubuntu4) dapper; urgency=low
+
+  * debian/cupsys.postinst: Make sure that the scanner group exists before
+    trying to add the cupsys user to it.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu,  9 Mar 2006 08:20:02 +0000
+
+cupsys (1.1.99.b1.r4929-0ubuntu3) dapper; urgency=low
+
+  * debian/rules: Do not install dangling pdftops.conf symlink. (Malone #26785)
+  * debian/cupsys.preinst: Remove a dangling pdftops.conf symlink on upgrades
+    to this version.
+  * debian/cupsys.postinst: Add cupsys to group 'scanner' to be able to access
+    printer/scanner combined devices. (Malone #29050)
+  * debian/patches/44_fixconfdirperms.dpatch: Make /etc/cups/ppd group
+    writable. (Malone #31533)
+  * debian/cupsys.init.d: Make sure that page_log exists with the right
+    permissions. (Malone #33409)
+  * Add debian/patches/51_dont_log_ipp_printer_query.dpatch: Do not flood
+    access_log with successful CUPS-Get-Printers and Get-Printer-Attributes
+    queries (which are generated by gnome-cups-icon every 3 seconds). This is
+    a hideous and hackish patch, but it has to do until we dbusify cupsys
+    properly. (Malone #29895)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon,  6 Mar 2006 16:08:32 +0100
+
+cupsys (1.1.99.b1.r4929-0ubuntu2) dapper; urgency=low
+
+  * Add 50_truncate_ppd.dpatch:
+    - cups/file.c: Do not forget to write the pending uncompressed tail when
+      copying a compressed file. Fixes cropped PPD files in /etc/cups/ppd.
+    - Patch taken from upstream svn commit 4942.
+    - Malone #28642
+  * debian/cupsys.init.d: Create access_log with proper permissions if it does
+    not yet exist. (Malone #28492)
+  * debian/cupsys.preinst: If we upgrade from a version earlier than this one,
+    change all root-owned PPD files in /etc/cups/ppd to be owned by cupsys.
+    (Malone #12879)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 19 Jan 2006 16:55:51 +0100
+
+cupsys (1.1.99.b1.r4929-0ubuntu1) dapper; urgency=low
+
+  * New upstream snapshot with lots of bug fixes.
+  * Remove debian/patches/50_local_username_check.dpatch: Adopted upstream.
+  * debian/patches/02_configure.patch: Greatly simplified to be more robust
+    against upstream changes; renamed to debian/patches/02_disable_pie.patch
+    for clarity.
+  * Disable debian/patches/48_stdlib.dpatch, it shouldn't be necessary on at
+    least our platforms.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Jan 2006 16:44:47 +0100
+
+cupsys (1.1.99.b1.r4892-0ubuntu1) dapper; urgency=low
+
+  * New upstream snapshot.
+  * Adapt patches to new upstream version:
+    - 02_configure.dpatch
+    - 48_stdlib.dpatch
+    - ubuntu-nowebadmin.dpatch
+  * Add debian/patches/50_local_username_check.dpatch: Fix the restriction
+    of changing/cancelling of print jobs to the owner.
+    - scheduler/auth.c: Disable weird code that bypasses user name check for
+      local authentication.
+    - scheduler/ipp.c: Copy the determined user name of the connection to the
+      con structure, so that cupsdCheckPolicy() has a chance to actually
+      verify it.
+    - Ubuntu #12177
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 Jan 2006 15:28:22 +0100
+
+cupsys (1.1.99.b1.r4841-1ubuntu8) dapper; urgency=low
+
+  * debian/cupsys.init.d: Remove the hideous killing hacks and just invoke
+    start-stop-daemon with the correct arguments.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 11 Jan 2006 19:23:47 +0100
+
+cupsys (1.1.99.b1.r4841-1ubuntu7) dapper; urgency=low
+
+  * debian/cupsys.init.d: Make sure that the PID file directory /var/run/cups
+    exists. The new approach of mounting /var/run as tmpfs removes the
+    directory that is shipped in the deb. (Ubuntu #22261)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 11 Jan 2006 13:47:45 +0100
+
+cupsys (1.1.99.b1.r4841-1ubuntu6) dapper; urgency=low
+
+  * debian/cupsys.init: Call stop/start in the 'restart/force-reload' section
+    to make use of the much more robust 'stop' handling. This should avoid
+    frequent failures of force-reload. (Ubuntu #21787)
+  * debian/cupsys.postinst:
+    - Set permissions of /etc/cups/interfaces to root:lpadmin 2775.
+    - Make /etc/printcap writable for group lpadmin.
+    - This fixes third-party printer drivers and command line tools.
+    - Ubuntu #20891
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu,  5 Jan 2006 18:11:51 +0100
+
+cupsys (1.1.99.b1.r4841-1ubuntu5) dapper; urgency=low
+
+  * Synchronize to Debian's svn head to get the various configuration handling
+    RC bug fixes, but keep Ubuntu upstream version at r4841 since 4885 has
+    serious regressions.
+  * All non-Ubuntu specific patches have been applied in Debian now.
+  * Drop the following patches (accepted in Debian):
+    - ubuntu-sanitize-conffile-handling.dpatch
+    - ubuntu-localports.dpatch
+    - ubuntu-include-conf.d.dpatch
+    - ubuntu-nowebadmin.dpatch
+    - ubuntu-cupsimage.dpatch
+  * ubuntu-runasuser.dpatch: Remove the upstream code fixes (already in Debian
+    now), just add the 'RunAsUser' directive to cupsd.conf.
+  * debian/cupsys.templates: Disable browsing by default.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 22 Dec 2005 15:08:51 +0100
+
+cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
+
+  [ Kenshi Muto ]
+  * New SVN release taken from rr4885.
+  * Updated Russian debconf translation, taken from cupsys trunk.
+  * Downgrade port and browse question to low.
+  * Add timeout routine to avoid lockup.
+  * debian/patches/08_cupsd.conf.conf.d.dpatch:
+    - Commented out Port/Listen/Browsing from cupsd.conf.in.
+      CUPS crashes when there is a duplicate definition.
+  * Updated Swedish debconf translation.
+  * Set seen false flag when ports configuration is failed.
+  * Allow '*' for hostname in ports.conf.
+  * Use /bin/echo instead of shell built-in echo.
+  * Improve cupsys.templates.
+  * Updated Russian, German, Czech,French, Vietnamese debconf translation.
+  * Removed example descriptions from init.d script.
+  * Fix IPv4 validation.
+
+  [ Martin Pitt ]
+  * Adapt debian/patches/02_configure.dpatch to r4885.
+  * Move forcefully killing of cupsd if start-stop-daemon fails from
+    postinst to init script, where it belongs to. Do not kill all running
+    cupsd processes, but only the one in the pid file; this will unbreak cupsd
+    behaviour in chroots.
+  * debian/cupsys.default: Remove obsolete FORCE_RESTART option.
+  * Resurrect debian/patches/01_cupsimage.dpatch (formerly
+    03_cupsimage.dpatch), as we get unresolved symbols if libcupsimage
+    isn't properly linked to libcupsys, causing other packages to FTBFS.
+    Thanks to Adam Conrad.
+  * debian/cupsys.init.d: Add --oknodo to not fail if cupsd is already
+    running.
+  * debian/rules: In clean rule, clean up a lot of files that are left behind
+    by 'make clean'.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 23 Dec 2005 06:33:05 +0000
+
+cupsys (1.1.99.b1.r4876-1) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * debian/local/{enable_browsing,browsing_status}: Adapt configuration file
+    locations to new conf.d structure.
+  * debian/cupsys.templates: Fix default value for cupsys/browse: 'yes' is an
+    invalid bool option, change to true.
+  * debian/cupsys.init.d: Use LSB init functions. Add lsb-base package
+    dependency.
+  * debian/cupsys.postinst: Wait a second between kill -9'ing cupsys and
+    checking if the process still exists to avoid false positives and upgrade
+    failures.
+  * Clean up support for /etc/cups/conf.d:
+    - Add debian/patches/08_cupsd.conf.conf.d.dpatch: Add include commands to
+      default cupsd.conf file.
+    - debian/cupsys.postinst: Remove fiddling with cupsd.conf.
+    - This will ensure that cupsd.conf will remain an unchanged conffile.
+  * debian/rules: Remove empty debian/patched on clean.
+  * debian/patches/10_cupsd.conf2.dpatch: Re-enable listening to localhost to
+    make the web interface work.
+  * debian/patches/44_fixconfdirperms.dpatch:
+    - Put configuration files into group root instead of nobody to avoid
+      privilege escalation of nobody/nogroup and comply to Debian standards.
+    - Use CUPS_DEFAULT_GROUP instead of 'nobody' as the default group for
+      setgid'ing to and conffiles which must be writable for cupsd.
+    - Disable changing permissions of cupsd.conf conffile.
+  * Add debian/patches/09_runasuser_fixes.dpatch:
+    - scheduler/main.c: Generate a certificate even when running as user, just
+      as in 1.1.x; this unbreaks local certificate authorization for cupsd
+      when it runs as normal user.
+    - scheduler/main.c: When running as non-root, call initgroups() instead of
+      setgroups() to allow auxiliary groups. These are required to access
+      different device types (lp for USB/parallel printers, dialout for serial
+      printers, etc.)
+
+  [ Kenshi Muto ]
+  * New SVN release taken from r4876.
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu,  8 Dec 2005 21:26:22 +0900
+
+cupsys (1.1.99.b1.r4841-1) experimental; urgency=low
+
+  * EXPERIMENTAL
+  * New SVN release taken from r4841.
+  * Remove -pie and -fpie from compiler option. pie option causes
+    a problem with Debian binutils.
+    I hope this change avoids FTBFS on sparc and others. (closes: #339120)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 16 Nov 2005 12:27:27 +0000
+
+cupsys (1.1.99.b1.r4748-4) experimental; urgency=low
+
+  * EXPERIMENTAL
+  * 00_r4835.dpatch: Taken from r4835.
+    Well, r4835 removes some files. It means dpkg-buildpackage always
+    fails when we rebuild source. Maybe it's time to change orig source.
+    Moved obsolete patches to patches/obsolete.
+  * 48_stdlib.dpatch: Fix FTBFS for arm, mips, and mipsel.
+  * 03_manext.dpatch: Don't use upstream's manpage file handling.
+    Debian uses dh_installman.
+  * 04_freebsd.dpatch: Apply Brian's patch to support GNU/kFreeBSD
+    (closes: #338266)
+  * Install lppasswd as owner 'lp'.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri,  4 Nov 2005 13:56:27 +0000
+
+cupsys (1.1.99.b1.r4748-3) experimental; urgency=low
+
+  * EXPERIMENTAL
+  * 47_pid.dpatch: Modified to allow to configure location of pid file.
+    (closes: #337093)
+    You can change this location by PidFile directive at your cupsd.conf.
+  * Remove example comments from init script. (closes: #334842)
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu,  3 Nov 2005 11:39:07 +0000
+
+cupsys (1.1.99.b1.r4748-2) experimental; urgency=medium
+
+  * EXPERIMENTAL
+  * 02_configure.dpatch: Modified to remove -pie/-fpie if arch = x86_64.
+    (closes: #335199)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 24 Oct 2005 11:42:59 +0000
+
+cupsys (1.1.99.b1.r4748-1) experimental; urgency=low
+
+  * EXPERIMENTAL
+  * CUPS 1.2 snapshot (r4748) from SVN.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed,  5 Oct 2005 12:54:27 +0000
+
+cupsys (1.1.23-13) UNRELEASED; urgency=low
+
+  * 38_pdftopscan.dpatch: Apply CAN-2005-0064, CAN-2004-0888,
+    and CAN-2005-2097 patches. (closes: #324459, #324460, #324464)
+    Because Debian cupsys uses xpdf wrapper instead of forked pdftops,
+    users aren't affected these security problems.
+    This patch is just for users who want to create own pdftops from
+    source.
+  * Move Port/Listen and Browsing configurations from /etc/cups/
+    cupsd.conf to /etc/cups/cups.d/.
+
+    /etc/cups/cups.d/ports.conf: Port/Listen configuration.
+    /etc/cups/cups.d/browse.conf: Browsing configuration
+
+    Migration will be done automatically.
+    You can configure these values by using "dpkg-reconfigure cupsys".
+    (closes: #235906, #297695, #178838, #288838)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 22 Aug 2005 18:50:26 +0900
+
+cupsys (1.1.23-12) unstable; urgency=medium
+
+  * foomatic-rip may be treated as recommended tool.
+    Modified control file. (closes: #320196)
+  * Add debconf-2.0 as debconf alternative.
+  * Migrated to libgnutls12. (closes: #322087)
+    libcupsys2 backed as real library. libcupsys2-gnutls10 became
+    transitional package. (closes: #322018)
+  * Add procps to Depends: of cupsys. ps command is used by
+    cupsys.postinst.
+  * 47_pid.dpatch: Added a patch to make forked PID file.
+    Now init script use this file instead of one created by
+    start-stop-daemon.
+    I hope this solves Samba starting bug. (closes: #315017)
+  * Back gs-esp to Depends:. (closes: #312244)
+    PostScript printer owners may claim this, but currently
+    we Debian CUPS Maintainers team have massive complains about
+    missing gs-esp dependency. It's current best workaround to
+    avoid such printing problems.
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu, 28 Jul 2005 11:35:27 +0900
+
+cupsys (1.1.23-11) unstable; urgency=low
+
+  * "At Debconf 5" release.
+  * Now CUPS is maintained by Debian CUPS Maintainers Team.
+    <pkg-cups-devel@lists.alioth.deban.org>
+  * Do "sleep 2" to wait daemon's wake up. (this is just workaround...
+    needs better solution, for #309794 and #315017)
+  * Added Vietnamese translation. (closes: #310152)
+  * Check whether daemon is running or not before restart in logrotate.
+    (closes: #310535)
+  * Add description about foomatic-rip (in foomatic-filters package)
+    to README.Debian. (closes: #309399)
+  * Remove unnecessary comment from debian/po/de.po (closes: #314135)
+  * Apply status option for init script (closes: #312683). Thanks Stephen.
+  * Suggests cupsys-driver-gutenprint, this package is new name of
+    cupsys-driver-gimpprint.
+  * 46_ppdsdat: Move /etc/cups/ppds.dat to /var/lib/cups/ppds.dat and
+    make symlink. (closes: #317905)
+  * Unapply NOAUTH handling from 33_jobauthorize. A user warns me
+    it's dangerous to use.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 20 May 2005 11:07:42 +0900
+
+cupsys (1.1.23-10ubuntu4) breezy; urgency=low
+
+  * Add debian/patches/ubuntu-disable-conffile-chmod.dpatch:
+    - Stop fiddling with the /etc/cups/cupsd.conf permissions at server
+      startup. The default permissions as shipped (root:root 0644) are just
+      fine for that file, and cupsys modifies it in a way that normal users
+      cannot read them any more, which breaks gnome-cups-manager.
+    - Ubuntu #15165
+  * debian/cupsys.postinst:
+    - If the package is upgraded from a version earlier than this one, correct
+      permissions of cupsd.conf.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 14 Sep 2005 14:52:13 +0200
+
+cupsys (1.1.23-10ubuntu3) breezy; urgency=low
+
+  * Fix installation of /usr/share/cups/{enable-browsing,browsing_status} to
+    ship these scripts again. (Ubuntu #14546 )
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  2 Sep 2005 12:00:02 +0200
+
+cupsys (1.1.23-10ubuntu2) breezy; urgency=low
+
+  * Added debian/patches/ubuntu-confpermissions.dpatch:
+    - Add and document ConfigFilePerm to cupsd.conf and set it to 0600 to
+      avoid exposing SMB passwords to lpadmin members. This makes it slightly
+      harder to intercept the password. (Ubuntu #12036)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 23 Jun 2005 12:44:14 +0200
+
+cupsys (1.1.23-10ubuntu1) breezy; urgency=low
+
+  * Debian adopted many changes and MOM output was messy; reapplied remaining
+    Ubuntu changes to pristine Debian version. Mention them here again to
+    ease further merges and Debian adoptions.
+  * Convert Ubuntu patches to dpatch and added descriptions.
+  * Convert to poppler:
+    - debian/patches/ubuntu-pdf2ps_poppler.dpatch: Replace pdftops/pdftops.cxx
+      with a port from xpdf-utils to libpoppler.
+    - debian/control: Add build dependency libpoppler-dev, remove xpdf-utils
+      dependency.
+    - Disable 06_replacepdftops.dpatch to build the pdftops/ subdir again.
+    - debian/rules: Install newly built pdftops into /usr/lib/cups/.
+  * Run as user 'cupsys' instead of root:
+    - debian/patches/ubuntu-runasuser.dpatch: Enable RunAsUser in
+      configuration.
+    - debian/patches/ubuntu-auxgroups.dpatch: When running as non-root, call
+      initgroups() instead of setgroups() to allow auxiliary groups.
+    - debian/rules: Configure with --with-cups-user=cupsys.
+    - debian/cupsys.postinst, debian/cupsys-client.postinst: Create cupsys
+      user and setup permissions.
+    - debian/cupsys.postrm: Remove cupsys user on purge.
+  * Disable web interface to avoid putting the user 'cupsys' into group
+    shadow:
+    - debian/README.Debian: Explain the change.
+    - debian/patches/ubuntu-nowebadmin.dpatch: Explain the disabled
+      administrator pages in the web interface.
+    - Add debian/local/ja-nowebadmin.ptch: Add the same explanation to the
+      Japanese translation in patches/ja.tar.gz.uu.
+    - debian/rules: Apply debian/local/ja-nowebadmin.ptch.
+  * Automatic detection of LAN printers (browsing):
+    - Add debian/local/{enable_browsing,browsing_status,cupsd-browsing.conf}
+      and install them in debian/rules.
+    - debian/patches/ubuntu-externalbrowseconf.dpatch: Externalize browsing
+      setting to cupsd-browsing.conf.
+  * Listen to local port only by default to comply to Ubuntu Security Policy:
+    - debian/patches/ubuntu-localports.dpatch
+  * debian/cupsys.init.d: LSB init script.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 23 Jun 2005 11:23:37 +0200
+
+cupsys (1.1.23-10) unstable; urgency=high
+
+  * Recovered http backend. -8 and -9 missed it. (closes: #305169)
+  * Use absolete path for doc-root instead of relative path.
+    (closes: #305339)
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 19 Apr 2005 20:47:49 +0900
+
+cupsys (1.1.23-9) unstable; urgency=medium
+
+  * Remove unnecessary and toxic space in doc-base file.
+    (closes: #305084)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 18 Apr 2005 08:08:03 +0900
+
+cupsys (1.1.23-8) unstable; urgency=medium
+
+  * "Brush up for Sarge" release.
+  * Introduced dpatch for source management.
+  * Included Spanish man pages.
+  * 43_filtercost: Applied a patch for wrong computation of cost
+    (closes: #304205)
+  * Applied many part of ubuntu patch, http://people.ubuntu.com/~scott/patches/cupsys/cupsys_1.1.23-7ubuntu1.patch.
+    (User 'cupsys' feature and Browsing feature aren't applied at this time.
+     They are post-Sarge things)
+  * Applied improved dvifilter patch. (Although you need to modify
+    /etc/cups/mime.convs and some other files to use it) (closes: #198100)
+  * Provides /var/run/cups/cupsd.pid. (closes: #301804)
+  * Added cupsys documentation to doc-base structure. (closes: #171396, #304333)
+  * Included filter for PostScript from Windows PostScript driver, created by
+    Matt Swift <swift@alum.mit.edu>.
+    If you want to use, put /usr/share/doc/cupsys/examples/filters/samba-postscript.* to /etc/cups,
+    and put /usr/share/doc/cupsys/examples/filters/samba-ps-to-ps to /usr/lib/cups/filter. (closes: #246577)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 16 Mar 2005 10:01:57 +0900
+
+cupsys (1.1.23-7ubuntu2) breezy; urgency=low
+
+  * debian/control:
+    - Add build dependency libpoppler-dev.
+    - Drop cupsys dependency xpdf-utils.
+  * Added debian/patches/ubuntu-pdf2ps_poppler.patch:
+    - Replace pdftops/pdftops.cxx with the latest version from xpdf-3.00 code;
+      it was modified to use poppler's include files and use GooString instead
+      of GString (a simple rename in poppler).
+    - Adapt build rule.
+  * debian/rules: Install newly built pdftops into /usr/lib/cups/.
+  * debian/pdftops: Change path to pdftops from /usr/bin to /usr/lib/cups.
+  * Removed debian/patches/06replacepdftops.patch: This patch prevented the
+    building of pdftops/, but we want that again.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 24 May 2005 14:39:14 +0200
+
+cupsys (1.1.23-7ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian. (#9281)
+  * Fixed merging conflicts in debian/rules.
+  * Dropped patch ubuntu-lppasswd_noexistingconf.patch, now included in
+    Debian.
+  * debian/cupsys.postinst: Include /etc/default/cupsys to make the
+    #298040 patch effective (this somehow got lost in MOM).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 15 Apr 2005 13:20:17 +0200
+
+cupsys (1.1.23-7) unstable; urgency=low
+
+  * Drop /etc/cups/printers.conf and /etc/cups/classes.conf from
+    configuration files. (closes: #298103)
+    Migration will be done automatically.
+  * Add /etc/default/cupsys. You can change force stop behavior by
+    changing FORCE_RESTART in this file. (closes: #298040)
+  * Add hplip to Suggests:. (closes: #297776)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat,  5 Mar 2005 12:27:32 +0900
+
+cupsys (1.1.23-6) unstable; urgency=medium
+
+  * Fix missing adduser dependency in cupsys-client. (closes: #296849)
+  * Apply parallel backend improvement patch.
+    - don't receive signal during writing (closes: #296222)
+    - fix 64bit problem (closes: #296223)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 26 Feb 2005 08:07:39 +0000
+
+cupsys (1.1.23-5) unstable; urgency=low
+
+  * Improve postinst message (closes: #295642). Thanks Adam.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 18 Feb 2005 21:23:10 +0900
+
+cupsys (1.1.23-4) unstable; urgency=low
+
+  * 20defaultport.patch is merged in upstream source.
+  * ARGH, libcupsys2-dev should conflict/replace against <<1.1.22-3.
+    Fix control file. (closes: #292879)
+  * Remove obsolete README_fr.txt. (closes: #293274)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 30 Jan 2005 08:35:17 +0900
+
+cupsys (1.1.23-3) unstable; urgency=low
+
+  * Remove $Id$ from config file: 07cvsremovetag.patch (closes: #291629)
+  * Fix 'lppasswd does not work with nonexisting passwd file' by mpitt's patch:
+    41lppasswdnoexistingconf.patch (closes: 290011)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 22 Jan 2005 12:23:46 +0900
+
+cupsys (1.1.23-2) unstable; urgency=medium
+
+  * Move defvalue declaration to begin block for compile on
+    backports environment. Thanks Massimiliano.
+  * Fix Cyclades serial port name: 40cycladeserial.patch (closes: #270375)
+  * Upgrade shlibs of libcupsys2-gnutls10. cupsys-client needs newest
+    libcupsys2-gnutls10 (closes: #289930, #289939).
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 10 Jan 2005 13:48:32 +0900
+
+cupsys (1.1.23-1ubuntu12) hoary; urgency=low
+
+  * debian/cupsys.init.d:
+    - Make the start-stop-daemon invocation in restart use the schedule
+      syntax (--retry TERM/10) to keep trying to kill cupsd for 10
+      seconds before it gives up.  If it does fail, restart now fails
+      gracefully, rather than bringing down the shell. (Ubuntu #7847)
+    - Make the same changes to the stop target for consistency.
+
+ -- Adam Conrad <adconrad@0c3.net>  Tue, 22 Mar 2005 03:40:51 +0000
+
+cupsys (1.1.23-1ubuntu11) hoary; urgency=low
+
+  * debian/cupsys.postinst:
+    - cleanup kill code somewhat - use pidof instead of ps aux output.
+      should fix Debian bug#298040
+    - Don't die if the kill fails.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 17 Mar 2005 16:10:27 -0700
+
+cupsys (1.1.23-1ubuntu10) hoary; urgency=low
+
+  * debian/cupsys.postinst: 
+    - Remove "--home /" from adduser invocation; sometimes adduser chowns the
+      home directory even if --no-create-home is given.
+    - If upgrading from a previous version, chown / to 0:0 to fix the bug from
+      previous releases.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 10 Mar 2005 08:30:42 +0100
+
+cupsys (1.1.23-1ubuntu9) hoary; urgency=low
+
+  * Updated debian/patches/ubuntu-fixconfdirperms.patch:
+    - chmod /etc/cups/ppd to 2775 instead of 755 so that cupsd can actually
+      write into it. (Ubuntu #6816)
+  * Added debian/patches/ubuntu-slashprinternames.patch:
+    - When determining the path to a PPD or interface file, replace slashes
+      with underscores; otherwise the server will try to write into
+      nonexisting subdirectories of e. g. /etc/cups/ppd/. (Ubuntu #6816)
+  * Updated debian/patches/ubuntu-nowebadmin.patch:
+    - Corrected the gnome-cumps-manager menu path on all web pages and
+      translations. (Ubuntu #4725)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 28 Feb 2005 19:04:51 +0100
+
+cupsys (1.1.23-1ubuntu8) hoary; urgency=low
+
+  * debian/patches/ubuntu-localports.patch:
+    - Removed "Browsing" patch hunk.
+  * Added debian/patches/ubuntu-externalbrowseconf.patch:
+    - Replace "Browsing" setting by "Include cupsd-browsing.conf" and update
+      the documentation comment; this allows to enable/disable browsing
+      without changing the main configuration file (which avoids dpkg
+      questions on upgrades).
+    - Enable "BrowseAddress @LOCAL" by default.
+  * Added debian/local/cupsd-browsing.conf (single "Browsing" configuration
+    parameter, default Off) and install it to /etc/cups/.
+  * Added scripts to manage browsing status to debian/local and install them
+    to /usr/share/cups/:
+    - browsing_status: Return whether browsing is currently disabled (0),
+      enabled (1) or there is a custom configuration (2).
+    - enable_browsing: Enable (1) or disable (0) browsing. Only possible with
+      non-custom configurations and with root privileges.
+  * Backend part of Ubuntu bug #2251 (user-friendly browsing configuration).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 22 Feb 2005 13:46:02 +0100
+
+cupsys (1.1.23-1ubuntu7) hoary; urgency=low
+
+  * Reapply patch to background cupsd during startup.
+
+ -- Thom May <thom@planetarytramp.net>  Thu, 20 Jan 2005 17:28:30 +0000
+
+cupsys (1.1.23-1ubuntu6) hoary; urgency=low
+
+  * Must create cupsys user _AFTER_ we create the lpadmin group.  sigh.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 14 Jan 2005 15:01:21 -0700
+
+cupsys (1.1.23-1ubuntu5) hoary; urgency=low
+
+  * Need to possibly add cupsys user in cupsys-client postinst, too.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 14 Jan 2005 12:08:14 -0700
+
+cupsys (1.1.23-1ubuntu4) hoary; urgency=low
+
+  * Fix postrm to not horribly break debconf and die.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 13 Jan 2005 11:35:39 -0700
+
+cupsys (1.1.23-1ubuntu3) hoary; urgency=low
+
+  * debian/control: Added missing cupsys dependency 'procps'.
+  * Moved lppasswd permission setup from cupsys.postinst to
+    cupsys-client.postinst (to where it belongs).
+
+ -- Martin Pitt <martin.pitt@canonical.com>  Thu, 13 Jan 2005 11:27:09 +0100
+
+cupsys (1.1.23-1ubuntu2) hoary; urgency=low
+
+  * Added debian/patches/ubuntu-build_avoid_unknown_chown.patch:
+    - systemv/Makefile: do not try to install lppasswd with owner CUPS_USER
+      during build since user "cupsys" does not exist on the buildds; install
+      it as root:root 755 instead
+  * debian/cupsys.postinst: setup permissions of lppasswd to cupsys:root 4755
+  * Added debian/patches/ubuntu-lppasswd_noexistingconf.patch:
+    - lppasswd tries to rename /etc/passwd.md5 to /etc/passwd.old; do not fail
+      if the former does not exist (at the very first invocation of the
+      program)
+  * debian/rules: removed silly "DEB_DH_INSTALLINIT_ARGS := -n" introduced by
+    some Ubuntu upload; this completely broke install/upgrade service
+    stopping/starting/restarting
+  * Added debian/patches/ubuntu-fixconfdirperms.patch:
+    - scheduler/conf.c: chmod /etc/cups to 3755 instead of 755:
+      + setgid forces the correct group (lpadmin) to files like passwd.md5
+      + sticky denies removing root-owned files by lpadmin members
+
+ -- Martin Pitt <martin.pitt@canonical.com>  Wed, 12 Jan 2005 12:06:30 +0100
+
+cupsys (1.1.23-1ubuntu1) hoary; urgency=low
+
+  * Merged new Debian version
+  * Dropped patches (merged upstream):
+    + 39CAN-2004-1125.patch
+    + 40CAN-2004-1267.patch
+    + 41CAN-2004-1268+1269+1270.patch
+  * Moved change to cups/cups_C.h to ubuntu-nowebadmin.patch
+  * Reworked the following patches to work with new version:
+    + ubuntu-init.d.patch
+    + ubuntu-runasuser.patch
+  * Applied and removed Ubuntu-specific patches which patch files in debian/;
+    this plays better with merge-o-matic and my fellow developers like it that
+    way; however, it will make manual merges a pain:
+    + ubuntu-init.d.patch
+    + ubuntu-logrotate.patch
+    + ubuntu-runasuser.patch (only the parts touching debian/)
+    + ubuntu-runlevel-19.patch
+
+ -- Martin Pitt <martin.pitt@canonical.com>  Thu,  6 Jan 2005 10:21:18 +0100
+
+cupsys (1.1.23-1) unstable; urgency=low
+
+  * New upstream release
+  * lprng disabled ipp feature since 3.8.26-1. Remove conflicts: lprng
+    of cupsys. (closes: #288531)
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue,  4 Jan 2005 19:32:16 +0900
+
+cupsys (1.1.22-8) unstable; urgency=high
+
+  * Fix another security vulnerability since 1.1.21. Sigh...
+    (closes: #287835)
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 31 Dec 2004 13:16:54 +0900
+
+cupsys (1.1.22-7) unstable; urgency=medium
+
+  * Use Depends: xpdf-utils instead of Recommends:.
+    This is RC fix (closes: #287921)
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 31 Dec 2004 08:37:54 +0900
+
+cupsys (1.1.22-6) unstable; urgency=high
+
+  * Replaced upstream pdftops (derived from Xpdf) with pdftops.pl wrapper.
+    pdftops.pl is made by Helge Blischke, GNU GPL licensed.
+
+    CUPS 1.1.22 should enter to Sarge ASAP by some security reasons,
+    but upstream pdftops prevents to enter because it has libgcc_s.so
+    dependency and current gcc 3.4 faces difficult 'unwind' problem.
+    Now I believe cupsys 1.1.22-6 can enter soon without waiting
+    gcc problem.
+
+    If you want to print PDF files directly, you need to install
+    xpdf-utils. pdftops.pl calls pdftops in xpdf-utils package.
+  * Fix typo in control file.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 29 Dec 2004 14:59:28 +0000
+
+cupsys (1.1.22-5) unstable; urgency=high
+
+  * Apply upstream CVS patch (00cvs20041229.patch)
+    This includes fix of buffer overflow possibility in scheduler.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 29 Dec 2004 21:35:51 +0900
+
+cupsys (1.1.22-4) unstable; urgency=high
+
+  * Add Replaces migration for libcupsys2-dev.
+    It solves 'libcupsys2-dev overwrite a file in cupsys' problem.
+    (closes: #287609)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 29 Dec 2004 02:43:09 +0000
+
+cupsys (1.1.22-3) unstable; urgency=medium
+
+  * Remove unwanted ldflag: Back 02configure.patch (closes: #286450)
+  * Move fr/cups-config.1 to libcupsys2-dev (closes: #286449)
+    Thanks for your above two bug reports, Henrique.
+  * Note: [CAN-2004-1125] "xpdf buffer overflows" is already fixed in
+    previous Debian revision (1.1.22-2) with upstream patch.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 25 Dec 2004 23:40:15 +0900
+
+cupsys (1.1.22-2) unstable; urgency=medium
+
+  * Apply security fix patches from 1.1.23rc1.
+  * Revert logrotate to use 'reload'. (closes: #271872)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 19 Dec 2004 17:43:10 +0900
+
+cupsys (1.1.22-1) unstable; urgency=low
+
+  * New upstream release for unstable. Time is over, sarge isn't shipped.
+    I checked 1.1.21 to 1.1.22 migration doesn't break ABI quickly,
+    but I'm still scared...
+  * Apply gcc-4.0 patch for amd64: 37gfxfont.patch (closes: #285601)
+  * Do 'restart' instead of 'reload' when log is rotated.
+    'reload' sometime causes just shutdown daemon. (Unknown problem)
+  * Fix equation in cupsys.postscript. (closes: #285205)
+  * Apply Russell's patch: 38httpwait.patch (closes: #284829)
+    (This is trial. If there is any grave problem by this, I'll off this
+     patch)
+    - Made http_wait() handle EINTR.  This bug was causing cups
+      to print multiple copies of reports on remote printers.
+    - Lengthed the wait in ipp_http_read to handle connections
+      running over the internet.  The short wait was causing
+      unwated multiple copies of reports to be printed.
+    - While both these bugs need to be fixed, neither completely
+      solves the original multiple copies problem.  To solve
+      that no data should be printed if there was a read error.
+  * Add dependency version of smbclient. (closes: #284733)
+  * Fix SIGSEGV when remote destination goes timeout: 39remotetimeout.patch
+    (closes: #283500)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 15 Dec 2004 18:58:55 +0900
+
+cupsys (1.1.22-0.experimental4) experimental; urgency=low
+
+  * "I'm tired waiting Sarge forever" release.
+    I'm considering to upload 1.1.22 to unstable.
+  * I forgot to copy files from unstable version... FTBFS is solved.
+    (closes: #284574)
+  * Downgrade gs-esp dependency to Recommends.
+    I'm bore with attacks from stingy people.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue,  7 Dec 2004 21:39:55 +0900
+
+cupsys (1.1.22-0.experimental3) experimental; urgency=low
+
+  * Rebuild with -sa.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue,  7 Dec 2004 00:52:15 +0900
+
+cupsys (1.1.22-0.experimental2) experimental; urgency=low
+
+  * New upstream release
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon,  6 Dec 2004 23:10:18 +0900
+
+cupsys (1.1.21-0.experimental2) experimental; urgency=low
+
+  * Fix typo in templates and unfuzzied po files. (closes: Bug#274851)
+  * Update German translation (closes: Bug#274828)
+  * Make pam.d/cupsys standard @include style (closes: Bug#265299)
+  * Set up group lpadmin in postinst instead of rules.
+    Because lpadmin isn't there on initial build environemnt
+    (closes: Bug#274985)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon,  4 Oct 2004 23:09:51 +0900
+
+cupsys (1.1.21-0.experimental1) experimental; urgency=low
+
+  * Experimental.
+  * new upstream version.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun,  3 Oct 2004 18:15:23 +0900
+
+cupsys (1.1.20final+rc1-10ubuntu8) hoary; urgency=low
+
+  * debian/patches patches patching debian/.  sigh.
+
+ -- LaMont Jones <lamont@canonical.com>  Tue,  4 Jan 2005 09:29:48 -0700
+
+cupsys (1.1.20final+rc1-10ubuntu7) hoary; urgency=low
+
+  * Ignore errors on the stop phase of restart.  Closes: warty#4504
+
+ -- LaMont Jones <lamont@canonical.com>  Mon,  3 Jan 2005 20:10:54 -0700
+
+cupsys (1.1.20final+rc1-10ubuntu6) hoary; urgency=low
+
+  * SECURITY UPDATE: fixed multiple buffer overflows
+  * Added patch 39CAN-2004-1125.patch:
+    - cupsys contains code from xpdf, therefore CAN-2004-1125 applies, too.
+    - References:
+      CAN-2004-1125
+      http://www.idefense.com/application/poi/display?id=172
+  * Added patch 40CAN-2004-1267.patch:
+    - filter/hpgl-input.c, ParseCommand(): Prevent reading an arbitrary string
+      into statically sized buffer "buf"; clip string if necessary.
+    - patch taken from http://www.cups.org/str.php?L1024+P0+S-2+C0+I0+E0+Qhpgl
+    - Thanks to Ariel Berkman for spotting this.
+    - References:
+      CAN-2004-1267
+      http://tigger.uic.edu/~jlongs2/holes/cups.txt
+  * Added patch 41CAN-2004-1268+1269+1270.patch: fix several vulns in
+    systemv/lppasswd.c:
+    - Check return value of fputs() and fprintf() when writing to the new
+      password file. When ignoring them, an user can truncate the new passwd
+      file by filling up the disk at the right moment. Now unlink the file on
+      error and print out a message.
+    - If the passwd.new file reaches the maximum file size system limit, the
+      new file was not deleted, thus lppasswd could not be used again. Now
+      ignores all relevant signals and unlinks the new file on write error.
+    - Check that the output file is not stdin, stdout, or stderr; otherwise
+      error messages would be written into the output file which would destroy
+      it.
+    - Thanks to Bartlomiej Sieka for spotting this.
+    - References:
+      CAN-2004-1268
+      CAN-2004-1269
+      CAN-2004-1270
+      http://tigger.uic.edu/~jlongs2/holes/cups2.txt
+
+ -- Martin Pitt <martin.pitt@canonical.com>  Thu, 23 Dec 2004 11:18:50 +0100
+
+cupsys (1.1.20final+rc1-10ubuntu5) hoary; urgency=low
+
+  * Start cupsys using its -F switch and explicitly background it with
+    start-stop-daemon; this shaves seconds off the boot process.
+  * Rename debian/patches/ubuntu-runlevel-12.patch to
+    ubuntu-runlevel-19.patch, moving the start point from 12 to 19 and
+    migrating users who were at both 20 and 12.
+
+ -- Scott James Remnant <scott@canonical.com>  Thu,  9 Dec 2004 09:28:35 +0100
+
+cupsys (1.1.20final+rc1-10ubuntu4) hoary; urgency=low
+
+  * Unbreak debian/patches/ubuntu-nowebadmin.patch, so that it does not create
+    other patches in debian/patches (jp-nowebadmin.patch moved to
+    debian/local), or .orig files.
+  * Add debian/patches/ubuntu-runlevel-12.patch, which moves the runlevel of
+    the init script to 12, and performs the migration accordingly.
+
+ -- Daniel Stone <daniel.stone@canonical.com>  Mon,  6 Dec 2004 17:30:45 +0100
+
+cupsys (1.1.20final+rc1-10ubuntu3) hoary; urgency=low
+
+  * SECURITY: still CAN-2004-0888. Updated patch 36pdftopsoverflow.patch:
+    - pdftops/gmem.[ch]: change declarations of gmalloc and grealloc to use size_t
+      instead of int; int truncated sizes to 32 bits, which made xpdf still
+      vulnerable to integer (and eventually buffer) overflow attacks on 64 bit
+      platforms like amd64.
+    - pdftops/Xref.cxx: fix several unchecked negative integer conditions
+  * Thanks to Marcus Meissner <meissner@suse.de> for providing the patches.
+
+ -- Martin Pitt <mpitt@debian.org>  Mon,  1 Nov 2004 14:37:58 +0100
+
+cupsys (1.1.20final+rc1-10ubuntu2) hoary; urgency=low
+
+  * Fixed debian/patches/ubuntu-localports.patch: do not comment out the
+    'Listen' statement (Warty bug #3009).
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 29 Oct 2004 08:50:56 +0200
+
+cupsys (1.1.20final+rc1-10ubuntu1) hoary; urgency=low
+
+  * Resynchronized to Debian
+  * Now keep all Ubuntu specific modification as patches prefixed with
+    "ubuntu-" to ease further merges:
+    - ubuntu-auxgroups: allow cupsd to run in auxilliary groups
+    - ubuntu-init.d: pretty initscript, make /usr/share/cups/model
+      lpadmin-writeable to install custom printer drivers
+    - ubuntu-localports: listen on localhost port only by default
+    - ubuntu-logrotate: use 'restart', not 'reload' to restart cupsd after log
+      rotation (reload does not exist any more)
+    - ubuntu-nowebadmin: display a red warning on the web interface that
+      administrative functions are disabled for security reasons
+    - ubuntu-runasuser: do not run as 'root', but as 'cupsys' by default
+  * Ubuntu-specific debian/rules (can't be patched):
+    - configure with --with-cups-user=cupsys
+    - apply patch debian/patches/ja-nowebadmin.ptch (must be done after
+      uudecoding ja.tar.gz.uu)
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 28 Oct 2004 23:56:54 +0200
+
+cupsys (1.1.20final+rc1-8) unstable; urgency=medium
+
+  * Apply GNU Hurd configure patch for fix FTBFS. (closes: Bug#274599)
+  * Improve patch test routine. (closes: Bug#272952, Bug#274564)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun,  3 Oct 2004 13:07:43 +0900
+
+cupsys (1.1.20final+rc1-7) unstable; urgency=medium
+
+  * Fix french debconf translation (closes: Bug#272520).
+    This update is important because previous version shows
+    illegal debconf choice in French.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 21 Sep 2004 22:31:54 +0900
+
+cupsys (1.1.20final+rc1-6) unstable; urgency=high
+
+  * Applied patch from Alvaro Martinez Echevarria <ame@acm.org> to fix
+    daniel of service [scheduler/dirsvc.c, CAN-2004-0558]
+  * Apply GNU/Hurd patch (closes: Bug#263526)
+  * Update pt_PR debconf translation (closes: Bug#264096)
+  * Remove directory before making symlink (closes: Bug#270741)
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 24 Aug 2004 10:31:32 +0900
+
+cupsys (1.1.20final+rc1-5) unstable; urgency=low
+
+  * Apply anonymous patch for /jobs. This patch avoids many
+    client-error-forbidden. (closes: Bug#184361)
+    cupsd.conf will be automatically modified to use basic user
+    authentication (Add <Location /jobs>AuthType Basic
+    AuthType User</Location>).
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed,  4 Aug 2004 09:13:02 +0900
+
+cupsys (1.1.20final+rc1-4) unstable; urgency=medium
+
+  * Wait 10 seconds after reload for samba restart problem.
+    (closes: Bug#260969)
+  * Update Czech debconf translation (closes: Bug#260862)
+  * Built against libtiff4.
+  * Build against libgnutls11. (Though package name is still
+    libcupsys2-gnutls10)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 26 Jul 2004 22:12:18 +0900
+
+cupsys (1.1.20final+rc1-3) unstable; urgency=high
+
+  * Change guess order of USB device name for FHS compliant.
+    (closes: Bug#259965)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 18 Jul 2004 04:54:58 +0900
+
+cupsys (1.1.20final+rc1-2) unstable; urgency=medium
+
+  * Replace set-as-default icon of Japanese. Thanks Tomo-p.
+  * Provides libcupsys2 dummy package for smooth transition. (closes: #259378)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 14 Jul 2004 19:10:43 +0900
+
+cupsys (1.1.20final+rc1-1) unstable; urgency=low
+
+  * Apply a patch for fixing typo in DE templates. (Closes: Bug#250883)
+  * New upstream source, 2004-07-03 CVS.
+  * Add netbase dependency for cupsys-bsd.
+  * Move certs files to /var/lib/cups/certs. (Closes: Bug#254153)
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 26 May 2004 08:46:35 +0900
+
+cupsys (1.1.20final+cvs20040330-4) unstable; urgency=medium
+
+  * Now libgnutls10 migration starts at 'unstable'/'testing'.
+    Packages depending libcupsys2 should be rebuit with newer
+    libcupsys2-dev.
+  * Fix log rotation problem by adding 'sharedscripts' to
+    /etc/logrotate.d/cupsys. (Closes: Bug#249023)
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 25 May 2004 08:14:44 +0900
+
+cupsys (1.1.20final+cvs20040330-3experimental2) experimental; urgency=medium
+
+  * Rename libcupsys2 to libcupsys2-gnutls10.
+    This package doesn't 'Provides: libcupsys2' to migrate libgnutls10.
+    Sebastien Bacher plans cups/libgnutls10 migration.
+  * Add notes about backend configuration to README.Debian.
+  * Fix (I hope) log rotation problem by adding sharedscripts to
+    /etc/logrotate.d/cupsys. (Closes: Bug#249024)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 15 May 2004 11:17:16 +0900
+
+cupsys (1.1.20final+cvs20040330-3) unstable; urgency=low
+
+  * Remove EXPORT_SSLLIBS variable from cups-config (Closes: Bug#246102).
+    -lgnutls isn't necessary by software using libcups.
+  * Apply PJL detection patch from upstream.
+  * Translations
+    - Updated Turkish debconf messages (Closes: Bug#246075). Thanks
+      Recai and Gurkan.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 28 Apr 2004 00:23:59 +0900
+
+cupsys (1.1.20final+cvs20040330-2) unstable; urgency=low
+
+  * Fix typo in HOWTO_BUGREPORT.txt.
+  * Translations
+    - Update Dutch debconf messages (Closes: Bug#242260). Thanks Tim.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue,  6 Apr 2004 19:16:48 +0900
+
+cupsys (1.1.20final+cvs20040330-1) unstable; urgency=low
+
+  * New upstream CVS
+  * Revert pstops to old 1.1.20. (Closes: Bug#240792)
+  * Translations
+    - Updated Danish debconf messages.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 26 Mar 2004 19:00:01 +0900
+
+cupsys (1.1.20final+cvs20040317-4) unstable; urgency=low
+
+  * Chagnge backend question priority to low. (Closes: Bug#238847)
+    When you use PPC, parallel backend will be removed from default choice
+    automatically.
+    If you want to use parallel (and you know what you will do),
+    please run 'dpkg-reconfigure cupsys'.
+  * Translations
+    - Updated Danish debconf messages (Closes: Bug#239256). Thanks Claus.
+    - Updated French debconf messages (Closes: Bug#239756). Thanks Christian.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 24 Mar 2004 22:30:28 +0900
+
+cupsys (1.1.20final+cvs20040317-3) unstable; urgency=low
+
+  * Remove sysvinit. This package is essential. Thanks Thomas.
+  * Now choice menu is translatable (Closes: Bug#238821).
+  * Updated French debconf messages. Thanks Christian.
+  * Add socket to default choice. I think this backend doesn't
+    cause hang up anywhere.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 19 Mar 2004 17:16:48 +0900
+
+cupsys (1.1.20final+cvs20040317-2) unstable; urgency=medium
+
+  * Add sysvinit in dependency. (Closes: Bug#238763)
+  * Updated Brazilian Portuguese debconf messages. Thanks Andre.
+  * Fix printers.cgi crash (Closes: Bug#238800)
+  * Updated Japanese templates & images.
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 19 Mar 2004 09:00:04 +0900
+
+cupsys (1.1.20final+cvs20040317-1) unstable; urgency=low
+
+  * New CVS release.
+  * Add asking about backend program. This is not best way to solve
+    PPC crash / i386 serial hang-up, but at least user can choose what
+    he/she want to use. serial backend becomes 'not use' by default.
+    Add notice about 'parallel of PPC may cause a problem'.
+    (closes: Bug#237613, Bug#233529, Bug#211677, Bug#224760)
+  * Updated Spanish debconf messages (closes: Bug#236470). Thanks Carlos.
+  * Updated Danish debconf messages. Thanks Claus.
+  * Updated French debconf messages. Thanks Christian.
+  * Updated Czech debconf messages. Thanks Miroslav.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat,  6 Mar 2004 21:36:35 +0900
+
+cupsys (1.1.20final-16) unstable; urgency=low
+
+  * Improved init.d/cupsys message  (closes: Bug#235693). Thanks Lee.
+  * Add Czech debconf messages (closes: Bug#236276). Thanks Miroslav.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue,  2 Mar 2004 09:13:07 +0900
+
+cupsys (1.1.20final-15) unstable; urgency=low
+
+  * Add conflicts lprng for avoid conflicting ipp support.
+  * Add Danish debconf messages (closes: Bug#233067). Thanks Claus.
+  * Apply current CVS patch.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 14 Feb 2004 18:10:54 +0900
+
+cupsys (1.1.20final-14) unstable; urgency=medium
+
+  * Apply loop avoid patch. (closes: Bug#231676) Thanks Ray.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 11 Feb 2004 14:59:46 +0900
+
+cupsys (1.1.20final-13) unstable; urgency=medium
+
+  * Use pidof instead of start-stop-daemon for stopping cupsys.
+    I hope this will fix Bug#228967.
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu, 22 Jan 2004 09:12:25 +0900
+
+cupsys (1.1.20final-12) unstable; urgency=low
+
+  * Fix incorrect root detection routine (closes: Bug#227733). THanks David.
+  * Continue to install whether deluser is failed (for NIS/LDAP).
+  * 22ipprewrite.patch has critical bug. Fixed by better patch.
+    (closes: Bug#162613)
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 17 Jan 2004 12:57:47 +0900
+
+cupsys (1.1.20final-11) unstable; urgency=low
+
+  * Improved cupsys stop check.
+  * Apply username patch for Solaris lpd printing (closes: Bug#228078). Thanks
+    Lionel.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 17 Jan 2004 12:28:15 +0900
+
+cupsys (1.1.20final-10) unstable; urgency=low
+
+  * Apply Brazilian Portuguese debconf message (closes: Bug#227445). Thanks
+    Andre.
+  * Show verbose message when cups won't stop.
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 14 Jan 2004 08:38:55 +0900
+
+cupsys (1.1.20final-9) unstable; urgency=low
+
+  * Apply patch for avoid infinite loop (closes: Bug#225625).
+  * Apply patch for http password authenticaion cache (closes: Bug#227143).
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 12 Jan 2004 12:00:17 +0900
+
+cupsys (1.1.20final-8) unstable; urgency=low
+
+  * Fix typo in lpadmin.8.gz (one of Bug#226149). Thanks Dan.
+  * Unfortunately, I heard cupsys won't stop when upgrading.
+    I implemented Force-stop routine into postinst (closes: Bug#222464,
+    Bug#226140).
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon,  5 Jan 2004 21:11:30 +0900
+
+cupsys (1.1.20final-7) unstable; urgency=low
+
+  * Argh, I forgot to apply default port patch.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 30 Dec 2003 23:01:29 +0900
+
+cupsys (1.1.20final-6) unstable; urgency=low
+
+  * Apply Dutch debconf translation (closes: Bug#225410). Thanks Tim.
+  * Set default port when any Port/Listen isn't defined (closes: Bug#225208).
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 30 Dec 2003 08:57:10 +0900
+
+cupsys (1.1.20final-5) unstable; urgency=low
+
+  * Add pdftops.conf into /etc/cups/. This file is symlink to
+    /etc/xpdf/xpdfrc, and configuration for pdftops tool.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sun, 21 Dec 2003 11:45:38 +0900
+
+cupsys (1.1.20final-4) unstable; urgency=low
+
+  * Fix cups* commands don't work (closes: Bug#224585). Thanks Rainer.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 20 Dec 2003 20:52:24 +0900
+
+cupsys (1.1.20final-3) unstable; urgency=low
+
+  * Apply patch into lpd.c for true compatible with RFC1179
+    (closes: Bug#223432). Thanks Lionel.
+  * Hmm, PJL patch causes a problem. Since I don't have any PJL
+    printers, I simply unapply PJL patch and reopen Bug#220611 (closes:
+    Bug#223748)
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri, 12 Dec 2003 18:32:58 +0900
+
+cupsys (1.1.20final-2) unstable; urgency=low
+
+  * Apply PJL patch (closes: Bug#220611). Thanks Zed.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat,  6 Dec 2003 10:42:37 +0900
+
+cupsys (1.1.20final-1) unstable; urgency=low
+
+  * New upstream release
+  * cupsys set UTF-8 as defaultCharset, but it causes some browsing
+    problem, and looks don't need indeed. I changed defaultCharset to
+    invalid value. It will fix French screen (closes: Bug#221904).
+  * Fix dependency with libgnutls7 by dirty trick.
+    I hope libgnutls7 maintainer will fix Bug#221309.
+
+ -- Kenshi Muto <kmuto@debian.org>  Tue, 25 Nov 2003 19:17:57 +0900
+
+cupsys (1.1.20candidate6-6) unstable; urgency=low
+
+  * Set fixed version into Depends for cupsys, cupsys-client.
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 17 Nov 2003 21:35:55 +0900
+
+cupsys (1.1.20candidate6-5) unstable; urgency=high
+
+  * I'm sorry but openssl license conflicts. I use libgnutls (closes: Bug#220902).
+  * Add euc-jp text.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 15 Nov 2003 23:55:06 +0900
+
+cupsys (1.1.20candidate6-4) unstable; urgency=low
+
+  * Add French translation (closes: Bug#220805). Thanks, Christian.
+  * openssl, popular SSL implementation, becomes Debian main, so I think
+    it is no reason for using libgnutls. I changed depends openssl instead of
+    libgnutls.
+
+ -- Kenshi Muto <kmuto@debian.org>  Sat, 15 Nov 2003 10:24:38 +0900
+
+cupsys (1.1.20candidate6-3) unstable; urgency=low
+
+  * Remove -Wl from configure (closes: Bug#194353)
+  * Remove /etc/sups/raw.* when purged (closes: Bug#198126)
+  * Remove always Content-Type charset header. This is test (and ad-hoc)
+    case. I'll unapply if this patch causes a problem.
+  * Add Japanese resource.
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu, 13 Nov 2003 23:02:40 +0900
+
+cupsys (1.1.20candidate6-2) unstable; urgency=medium
+
+  * Fix FTBFS build error (closes: Bug#220534)
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu, 13 Nov 2003 15:52:00 +0900
+
+cupsys (1.1.20candidate6-1) unstable; urgency=low
+
+  * New upstream.
+  * Rename filter, backend man page (closes: Bug#220500).
+
+ -- Kenshi Muto <kmuto@debian.org>  Wed, 12 Nov 2003 23:41:02 +0900
+
+cupsys (1.1.19final-4) unstable; urgency=low
+
+  * "Welcome patch" release.
+  *  Transited packaging system to CDBS.
+     This release wll be final version for 1.1.19. I'll upload
+     1.1.20candidate version at next time.
+  * libcupsimage2.so.2 links libcupsys.so.2. (closes: Bug#193618)
+
+ -- Kenshi Muto <kmuto@debian.org>  Mon, 10 Nov 2003 10:01:58 +0900
+
+cupsys (1.1.19final-3) unstable; urgency=low
+
+  * Fix check routine of Printcap. (closes: Bug#200278)
+  * Removed "suggests qtcups". (closes: Bug#197267)
+
+ -- Kenshi Muto <kmuto@debian.org>  Fri,  7 Nov 2003 21:43:39 +0900
+
+cupsys (1.1.19final-2) unstable; urgency=low
+
+  * lpadmin group included root user, but I didn't understand why it needs.
+    This may cause security problem, so I remove this process and 
+    remove root from lpadmin group. (closes: Bug#214746)
+  * Support large file. (closes: Bug#215568)
+  * Support log rotation. (closes: Bug#200704)
+  * Force enable PAM (closes: Bug#183211, Bug#181512)
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu,  6 Nov 2003 18:31:02 +0900
+
+cupsys (1.1.19final-1.5) unstable; urgency=low
+
+  * New maintainer (acknowledged from Jeff Licquia).
+    Thanks Jeff!
+  * Changed templates.* to po-debconf style (closes: Bug#199236).
+  * Added Japanese debconf translation (closes: Bug#202273).
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu,  6 Nov 2003 09:50:29 +0900
+
+cupsys (1.1.19final-1.4) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Removed '#include <config.h>' line from image.h from the version
+    in libcupsimage2-dev with debian/image.h.patch (Closes: #200427)
+
+ -- Roland Stigge <stigge@antcom.de>  Thu,  4 Sep 2003 14:04:15 +0200
+
+cupsys (1.1.19final-1.3) unstable; urgency=low
+
+  * Non-maintainer upload
+  * cupsys Replaces: and Conflicts: cupsys-pstoraster (Closes: #206547)
+    NOTE: the Conflicts: was made versioned (<< 2) not to Conflict
+    with gs-esp which provides cupsys-pstoraster.
+  * Build-Depends: libpam0g-dev (new) instead of libpam-dev (removed from
+    archive)
+
+ -- Roland Stigge <stigge@antcom.de>  Wed,  3 Sep 2003 19:33:09 +0200
+
+cupsys (1.1.19final-1.2) unstable; urgency=low
+
+  * NMU.
+  * Completely remove dependency on libgnutls5-dev.
+
+ -- Robin Verduijn <robin@debian.org>  Wed, 27 Aug 2003 18:08:50 -0100
+
+cupsys (1.1.19final-1.1) unstable; urgency=low
+
+  * NMU.
+  * Built against libgnutls7-dev instead of (obsolete) libgnutls5-dev.
+    Closes: #203059.
+
+ -- Robin Verduijn <robin@debian.org>  Tue, 26 Aug 2003 19:28:21 -0100
+
+cupsys (1.1.19final-1) unstable; urgency=high
+
+  * New upstream final release.  DoS attack fixed; thus the urgency.
+  * Rebuilt with the latest libpng-dev, and fixed the explicit deps
+    in the control file.
+  * Removed rpath statment from output of cups-config --ldflags.
+    Closes: #194262.
+
+ -- Jeff Licquia <licquia@debian.org>  Thu, 29 May 2003 20:44:48 -0500
+
+cupsys (1.1.19candidate4-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * Includes upstream fix to the problem with 100% CPU consumption.
+    Closes: #189795.
+  * Added a dh_makeshlibs call for libcupsimage2.
+  * Made libcupsys2 conflict with cupsys-driver-gimpprint versions
+    built before the libcupsimage split.  Closes: #189175.
+  * Move /etc/printcap.cups to /var/run/cups/printcap, since it's
+    generated and non-editable.  Also, take care of the /etc/printcap
+    symlink.  Closes: #187954.
+  * Per suggestion from the KDE project, suggest the kdeprint package
+    instead of the kdelibs3-cups package.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 10 May 2003 13:05:33 -0500
+
+cupsys (1.1.19candidate1-3) unstable; urgency=low
+
+  * Make libcupsys2 conflict with gs-esp versions built before the
+    libcupsimage split.  This is part of the fix for bug 189175.
+  * Add a dep on libgnutls-dev for libcupsys2-dev.  Closes: #190877.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 28 Apr 2003 10:57:03 -0500
+
+cupsys (1.1.19candidate1-2) unstable; urgency=low
+
+  * Set Replaces: on cupsys-client to cover the move of the
+    French man page for cupstestppd.  Closes: #189737, #190042.
+  * Add cupsys-pt and xpp to Suggests for cupsys-client.
+    Closes: #168399, #170929.
+  * Added some more example filters: mailto and pstopdf.
+    Closes: #152001.
+  * Pass --system to addgroup when adding the lpadmin group.
+    Closes: #189835.
+  * Set section for the -dev packages to "libdevel".
+  * Fix shlibs files for libcupsys2 and libcupsimage2 to reference
+    the right package versions.  Closes: #174391.
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 22 Apr 2003 14:27:43 -0500
+
+cupsys (1.1.19candidate1-1) unstable; urgency=low
+
+  * New upstream version.  I will try to follow upstream's new
+    release policy by uploading release candidate versions to 
+    unstable.
+  * Wrote a new GNU TLS patch, which was accepted by upstream.
+    Re-enable SSL support based on this.
+  * Based on recent upstream work, wrote a libpaper patch which has
+    also been accepted upstream.  Closes: #60035, #88597, #101591.
+  * Upstream fix included to allow SLP-only browsing support to work.
+    Closes: #178380.
+  * Updated the Spanish debconf template for cupsys-bsd.
+    Closes: #167171.
+  * Added cupstestppd to cupsys-client.  Closes: #176941.
+  * Don't respect TMPDIR if we don't have write permissions to that
+    directory.  Closes: #176725.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 12 Apr 2003 14:36:20 -0500
+
+cupsys (1.1.18-3) unstable; urgency=low
+
+  * Split libcupsimage into its own package.  Closes: #187897.
+  * Added versioned build-dep on debhelper >= 2.
+
+ -- Jeff Licquia <licquia@debian.org>  Tue,  8 Apr 2003 02:59:57 -0500
+
+cupsys (1.1.18-2) unstable; urgency=high
+
+  * Disable SSL again.  Inexplicably, the GNU TLS people put the
+    OpenSSL compatibility layer under the GPL, not the LGPL.
+    This forces the effective license on libcupsys2 to GPL, which
+    I'm not comfortable with.  The urgency reflects possible
+    license conflicts for apps that link to libcupsys2.
+    Closes: #168056.
+  * Add a debconf question to ask whether unrecognized
+    application/octet-stream jobs should be printed as raw jobs.
+  * Forward-port some of the security fixes from woody.
+  * Set the default group for lppasswd to "lpadmin", in keeping
+    with the default in cupsd.  Closes: #172842.
+  * Replaced the conflict with manpages-fr, versioned this time
+    to allow for easy upgrades.  Also added a Replaces entry for
+    it.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun,  5 Jan 2003 23:36:50 -0500
+
+cupsys (1.1.18-1) unstable; urgency=high
+
+  * New upstream version.  This is a security update for problems that
+    include remote root exploits - thus the urgency.
+  * Remove the conflict with manpages-fr per reports that the offending
+    files are now all gone.  Closes: #158500.
+
+ -- Jeff Licquia <licquia@debian.org>  Fri, 20 Dec 2002 03:27:18 -0500
+
+cupsys (1.1.16-4) unstable; urgency=low
+
+  * Documentation updates.
+  * Change the GNU TLS patch to more explicitly control which SSL
+    library is linked to, and support switching SSL libraries in
+    the build.  By default, the package will not use OpenSSL, so
+    autobuilders won't accidentally build it that way.
+    Closes: #167489.
+  * Add libgnutls-dev to the Dependencies for libcupsys2-dev.
+  * Set the proper permissions on cupsys-client man pages.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat,  9 Nov 2002 16:39:54 -0500
+
+cupsys (1.1.16-3) unstable; urgency=low
+
+  * Totally nuke all script modifications for dh_installinit; do it
+    all manually instead.  Closes: #166878.
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 29 Oct 2002 23:06:20 -0500
+
+cupsys (1.1.16-2) unstable; urgency=low
+
+  * Add libpam-dev to Build-Depends.  Closes: #166556.
+  * Update clean target in debian/rules to clean a few more files
+    that are missed by the Makefiles.
+  * Remove SFont.cxx and T1Font.cxx from the pdftops Makefile;
+    these two files aren't needed, and including them would pull
+    in a build dep on xlibs-dev, which is bad news.  Closes: #166716.
+  * Tell dh_installdocs to not mess with the postinst/prerm, so
+    the compatibility symlinks aren't created.
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 29 Oct 2002 00:45:38 -0500
+
+cupsys (1.1.16-1) unstable; urgency=low
+
+  * New upstream version...  Closes: #165631.
+  * ...which includes bugfixes to several BSD utilities to avoid
+    segfaulting when certain options are misused.  Closes: #159597.
+  * Add upstream patch to scheduler that fixes certain printer
+    operations in the web interface.
+  * Re-enabled SSL support using the OpenSSL compatibility library
+    in libgnutls.  Closes: #150600.
+  * Use our own logic for stopping/restarting cupsd on upgrade,
+    instead of relying on dh_installinit.  Closes: #160345, #164435.
+  * Make cupsys-client Recommend cupsys-bsd.  Closes: #157974.
+  * Make sure we remove everything in /var/spool/cups on purge.
+    Closes: #163571.
+  * Make force-reload send SIGHUP, since policy prefers that mode
+    of operation.
+  * Add dependencies for libcupsys2-dev on the image libraries we
+    need.  Closes: #166451.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 26 Oct 2002 19:37:56 -0500
+
+cupsys (1.1.15-4) unstable; urgency=low
+
+  * Fix segfault in lp when passing "-q" by itself as the last
+    option.  Closes: #150819.
+  * Make the switch to libpng3, now that woody is out.
+    Closes: #156622.
+  * It seemed that the rastertoepson filter occasionally lost its
+    cookies under certain circumstances and passed NULL for a field.
+    Cancel the pending job if that happens.  Closes: #147119.
+  * Remove .cvsignore files.
+  * Turned browsing back on by default.  With no BrowseAddresses set,
+    no broadcast packets will go out, but cupsd will recognize and
+    accept incoming packets.  Closes: #155574.
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 20 Aug 2002 15:51:45 -0500
+
+cupsys (1.1.15-3) unstable; urgency=low
+
+  * Reorganized the French man pages so they appear in the proper
+    packages.
+  * Declared a Conflict between cupsys-bsd and manpages-fr, as the
+    latter package includes man pages for lpr, lpq, and lprm.
+  * Move lpinfo and lpmove utilities to cupsys-client, where they
+    belong.
+  * Added patch from upstream that fixes some problems with
+    Orientation settings made by some PostScript generators.
+    Closes: #155534.
+  * Fixed compiler settings for the static and shared versions of
+    libcupsys2.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 11 Aug 2002 02:45:02 -0500
+
+cupsys (1.1.15-2) unstable; urgency=high
+
+  * Removed SSL support again due to license infection problems.
+    Closes: #154792.
+  * Removed the preformatted French man pages.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 29 Jul 2002 19:02:21 -0500
+
+cupsys (1.1.15-1) unstable; urgency=low
+
+  * New upstream version.
+  * Removed cupsys-pstoraster (since it's no longer provided in CUPS),
+    and rely on gs-esp instead for its functionality.
+  * Enabled SSL support and updated copyright file to reflect license
+    change.  Closes: #150600.
+  * Applied patch from upstream that causes the cupsd foreground
+    process to wait until the daemon is ready before exiting.
+    Also, changed init script to wait on the daemon before continuing.
+    Closes: #150426.
+  * Moved /etc/cups/certs to /var/spool/cups/certs.  Closes: #144887.
+  * Split out German and Portugese debconf templates into separate
+    files, and added French, Russian, and Spanish files.
+    Closes: #137630, #138068, #142904.
+  * Make cupsys Recommend smbclient, and handle symlinking smbspool
+    to /usr/lib/cups/backend/smb if it's available.  Closes: #82690.
+  * Make cupsys Suggest foomatic-bin for cupsomatic, so that
+    linuxprinting.org PPDs work.  Closes: #146655.
+  * Add examples/filters directory to cupsys and added the contributed
+    DVI filter to it.  Users can copy the filter and config files into
+    place themselves to get the functionality.  Closes: #55013, #136496.
+  * Fixed a bug where "-" filters are rejected in some cases.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 29 Jul 2002 00:33:00 -0500
+
+cupsys (1.1.14-3) unstable; urgency=low
+
+  * Changed libpng dependency to "libpng2 | libpng" to accomodate the
+    current libpng policy.
+  * Changed adduser dep so that the proper adduser (that does root) is
+    available for the postinst.  Closes: #133709.
+  * Removed spaces from init script output.  Closes: #133262.
+  * Set TZ in init script to REALLY fix timezone problem.  
+    Closes: #130676.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat,  9 Mar 2002 23:48:41 -0500
+
+cupsys (1.1.14-2) unstable; urgency=high
+
+  * Remove all the stuff about setting the lpd backend setuid; per
+    upstream, we don't need it anymore, and it's a security hole.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 17 Feb 2002 18:52:45 -0500
+
+cupsys (1.1.14-1) unstable; urgency=high
+
+  * New upstream version.
+  * Fixes more buffer overflows not covered in the previous patch;
+    thus the urgency.
+
+ -- Jeff Licquia <licquia@debian.org>  Wed, 13 Feb 2002 22:40:50 -0500
+
+cupsys (1.1.13-2) unstable; urgency=high
+
+  * Fix potentially exploitable buffer overflow in cups/ipp.c.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat,  9 Feb 2002 21:27:41 -0500
+
+cupsys (1.1.13-1) unstable; urgency=low
+
+  * New upstream version.
+  * Silly me.  fopen() returns NULL, not non-NULL, when it fails. :-)
+    Closes: #130532, #131433.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat,  2 Feb 2002 16:10:20 -0500
+
+cupsys (1.1.12-5) unstable; urgency=low
+
+  * Fix man page references so, e.g., references go from backend(1) to
+    cups-backend(1).  Closes: #126811.
+  * Oops!  Debian has time_t->tm_gmtoff, which is defined to have the
+    opposite sign of timezone.  Is it that way on BSD?  Anyway,
+    reverse the sense of the sign for time_t->tm_gmtoff if we use
+    that.  Closes: #126195.
+  * Add header for gs_malloc to pstoraster/gscrdp.c, to prevent
+    problems with implicit declaration on 64-bit systems.
+    Closes: #126002.
+  * cgi-bin/admin.c: Be a little bit more paranoid about one's ability
+    to write to tempfiles.  Closes: #122324.
+  * Enabled OpenSLP support.
+  * Cleaned up Priorities and Sections.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 20 Jan 2002 02:14:35 -0500
+
+cupsys (1.1.12-4) unstable; urgency=low
+
+  * Move cups-lpd man page to cupsys-bsd.  Closes: #122311.
+  * Oops!  Lost the patch to allow "cupsaccept", etc. commands.
+    Closes: #123280.
+  * Minor change to the init script output.  Closes: #121938.
+  * Changed choose-uri.tmpl to be a little more clear.
+    Closes: #117376.
+  * Moved CUPS document root from /usr/share/doc/cupsys to
+    /usr/share/cups/doc-root, and created a symlink from
+    /u/s/d/cupsys/online-docs to it.  It turns out that serving
+    files via CUPS from /usr/share/doc is a policy violation.
+    Closes: #120923.
+  * Fixed a small problem when upgrading from potato libcupsys1-dev
+    to current libcupsys2-dev.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 17 Dec 2001 00:58:41 -0500
+
+cupsys (1.1.12-3) unstable; urgency=low
+
+  * Fix libcupsys2 shlibs file to provide the proper dependency
+    information.  Closes: #121405.
+  * Oops!  Make sure SSL support isn't built yet.
+
+ -- Jeff Licquia <licquia@debian.org>  Wed, 28 Nov 2001 11:41:17 -0500
+
+cupsys (1.1.12-2) unstable; urgency=low
+
+  * It helps to run autoconf after making a change to the configure
+    script. :-)  CXX=$CC change wasn't propagated, making the build
+    fail on hppa.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 26 Nov 2001 12:01:58 -0500
+
+cupsys (1.1.12-1) unstable; urgency=low
+
+  * New upstream version.  Closes: #119162.
+  * Updated Standards-Version.
+  * Made cupsys depend on debconf.
+  * Removed -Wl,rpath from config-scripts/cups-sharedlibs.m4.
+  * Removed explicit libcupsys dep from cupsys.
+  * Removed "CXX=$CC" from config-scripts/cups-compiler.m4.
+  * Removed .SILENT from Makedefs so the build isn't silent anymore.
+  * On devfs, look in /dev/printers as well as /dev/parallel.
+    (Do we still need /dev/parallel?)  Closes: #114063.
+  * Changed internal file: device URI type to test:, since (per
+    upstream) it's not intended for anything other than to test
+    filters.  See bug #115252 or README.Debian for more info.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 25 Nov 2001 11:21:32 -0500
+
+cupsys (1.1.10-4) unstable; urgency=low
+
+  * Switched cupsenable and cupsdisable symlinks to always point to
+    /usr/sbin/accept to prevent them from breaking when files move
+    around (as they did recently).  Closes: #114006.
+  * It turns out that libcupsys needs to make temp files in
+    /var/spool/cups/tmp, so that dir needs to be in the package.
+    Closes: #115154.
+  * Related to the above, when creating temp files, don't loop when
+    the open fails unless the return value is EEXIST.  Thanks to Brian
+    Ristuccia for the suggestion.
+  * Honor the DEB_BUILD_OPTTIONS "debug" setting.
+  * Per policy, make sure we build with -D_REENTRANT.
+  * Don't remove /var/spool/cups in the cupsys postrm when purging.
+  * Added German description to template.  Closes: #113604.
+  * Added Portuguese description to cupsys-bsd template.  
+    Closes: #106131.
+
+ -- Jeff Licquia <licquia@debian.org>  Thu, 18 Oct 2001 23:07:34 -0500
+
+cupsys (1.1.10-3) unstable; urgency=low
+
+  * Scale back a bit on aggressiveness on purging cupsys, as it can
+    cause us to remove the cupsys-client conffile.
+  * It turns out that client.conf is parsed by libcupsys2, not
+    cupsys-client, so it needs to switch packages.
+  * Changed PAM code so it attempts to open the "cupsys" PAM config
+    file, instead of the "cups" one.  Not sure how this broke again.
+    Closes: #110651.
+  * Per request, implemented the "reload" option in the init script.
+
+ -- Jeff Licquia <licquia@debian.org>  Wed, 19 Sep 2001 21:53:48 -0500
+
+cupsys (1.1.10-2) unstable; urgency=low
+
+  * Added Conflicts: on cupsys-pstoraster with older cupsys packages
+    because of moved files.  Closes: #106107.
+  * Fixed bug concerning update-inetd handling; it was removing the
+    inetd entry for the lpd server in cupsys-bsd with every upgrade.
+    Closes: #109298.
+
+ -- Jeff Licquia <licquia@debian.org>  Thu, 30 Aug 2001 23:14:08 -0500
+
+cupsys (1.1.10-1) unstable; urgency=low
+
+  * New upstream version - with Makefile oops fixed (1.1.10-1
+    upstream).
+  * Fixed lpadmin group creation so NIS-style lpadmin group is
+    recognized.  Closes: #78895, #107744.
+  * Replaced kups with kdelibs3-cups in Suggests: lines, and
+    reorganized Suggests line.  Closes: #109695.
+  * Moved Suggests for all add-on clients to cupsys-client.
+  * Fixed purge so /etc/cups is completely cleaned out.
+    Closes: #108488.
+  * Moved filter and backend man pages to cups-filter and
+    cups-backend to avoid conflicts with other packages.
+    Closes: #107629.
+  * Made the lpd backend non-setuid, and created a low-priority
+    debconf question to handle the few who really need it setuid.
+    Closes: #77617.
+  * Altered cupsys-bsd postinst; always remove any inetd lines when
+    removing the package (we'll put it back later if we're just
+    upgrading).
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 28 Aug 2001 00:43:36 -0500
+
+cupsys (1.1.9-1.1) unstable; urgency=low
+
+  * NMU
+  * Fix gcc 3.0/hppa build problems.  Closes: #104620, #105308.
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 15 Aug 2001 19:28:23 -0600
+
+cupsys (1.1.9-1) unstable; urgency=low
+
+  * Return of the Maintainer. :-)
+  * New upstream version.
+  * Added dep on adduser (fixed bug #105382).
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 30 Jul 2001 00:28:47 -0500
+
+cupsys (1.1.8-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * i think anyone who wants cupsys in woody will be happy by this nmu
+  * New upstream release (Closes: #80895, #100156, #94364)
+  * With the new upstream release the problem with cgi-bin
+    has been fixed
+    (Closes: #96055, #98264, #96530, #96055, #99914, #100707, #103095)
+  * Added cupsys-pstoraster package.
+  * Added the LOGDIR option to install rule (Closes: #94502)
+  * Suggests cupsys-driver-gimpprint | cupsomatic-ppd (Closes: #99146)
+  * Moved to DH_COMPAT=2
+  * Added a pointer to http://localhost:631/admin to README.Debian
+    (Closes: #97964)
+  * Removed the extra </Location> from cupsd.conf (Closes: #96012)
+  * Not installing copyright for libcupsys2-dev, it will have a link
+    pointing to libcupsys2 anyways (Closes: #94504)
+  * Removed maintainer postinst and prerm scripts from cupsys-client
+    and libcupsys2-dev, by purging either of them you would have
+    removed your cups documentation.
+  * added German translation of debconf template to cupsys-bsd
+    by Sebastian Feltel (Closes: #101467, #100901)
+  * changed rm -f to rm -rf from cupsys-bsd prerm, and removed the link
+    handling for /usr/doc, let debhelper worry about that.
+    (Closes: #94539, #100501, #102669)
+
+ -- Sami Haahtinen <ressu@debian.org>  Thu,  5 Jul 2001 16:04:42 +0300
+
+cupsys (1.1.6-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * New upstream release, fixing multiple vulnerabilities (Closes: Bug#88932)
+  * cupsys removes only its own configuration files upon purge (Closes: Bug#84341)
+  * fixed postinst, so it does not fail when the lpadmin group
+  already exists (Closes: Bug#84443)
+  * added a helpful URL to README.Debian (Closes: Bug#63590)
+  * Suggests gtklp | kups | qtcups (Closes: Bug#82974)
+
+ -- Gergely Nagy <8@free.bsd.hu>  Sat, 14 Apr 2001 18:05:23 +0200
+
+cupsys (1.1.4-3) unstable; urgency=low
+
+  * Fixed PAM module name confusion (closes bugs #76457, #77114).
+  * Fixed broken deps w.r.t. cupsys-client Replacing older cupsys
+    versions (closes bug #75241).
+  * Fixed broken deps surrounding cupsys-dev (closes bug #75242).
+  * My shlibs file was badly broken; it referred to the cupsys package
+    instead of the libcupsys2 package (closes bug #78485).
+  * Fixed problem with upgrading; --oknodo wasn't passed to
+    start-stop-daemon, causing the prerm to fail if cupsd wasn't running
+    (closes bug #70698).
+
+ -- Jeff Licquia <licquia@debian.org>  Sun,  3 Dec 2000 22:45:29 -0500
+
+cupsys (1.1.4-2) unstable; urgency=high
+
+  * Fix misconfiguration in default config; cupsd now refuses connections
+    to printers and printer classes from all hosts except localhost by
+    default.  The previous default was to allow all hosts to connect to
+    all printers - not a terribly secure default. :-)
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 18 Nov 2000 00:55:48 -0500
+
+cupsys (1.0.4-8) stable; urgency=high
+
+  * Security fix: the default configuration now no longer allows people
+    to connect to printers except from localhost.  The previous default
+    configuration allowed anyone to connect to any printer from any
+    location; not a smart security move.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 18 Nov 2000 00:37:06 -0500
+
+cupsys (1.1.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed SystemGroup to point to lpadmin again (closes bug #72155).
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 15 Oct 2000 20:36:01 -0500
+
+cupsys (1.1.2-4) unstable; urgency=low
+
+  * The scheduler will now accept up to 128 characters for a password
+    (closes bug #70946).
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 15 Oct 2000 14:54:31 -0500
+
+cupsys (1.1.2-3) unstable; urgency=low
+
+  * Re-add ppd directory to build (when did it drop out?) (closes bug
+    #70448).
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 28 Aug 2000 20:14:51 -0500
+
+cupsys (1.1.2-2) unstable; urgency=low
+
+  * Added debhelper to build deps (closes bug #69677).
+  * Fixed PAM configuration file (closes bug #69787).
+
+ -- Jeff Licquia <licquia@debian.org>  Thu, 24 Aug 2000 11:40:56 -0500
+
+cupsys (1.1.2-1) unstable; urgency=low
+
+  * Another new upstream version.
+  * More build fixes.
+
+ -- Jeff Licquia <licquia@debian.org>  Sat, 19 Aug 2000 17:15:34 -0500
+
+cupsys (1.1.1-1) unstable; urgency=low
+
+  * New upstream version - non-beta this time.
+  * Fixed up build process to reflect upstream changes.
+  * Removed lots of Debian-specific stuff that isn't needed anymore.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon,  7 Aug 2000 20:27:29 -0500
+
+cupsys (1.1.0-0b3d1) unstable; urgency=low
+
+  * New upstream version.
+  * Daemon 'cups-lpd' (new to this version) added to cupsys-bsd, with
+    appropriate update-inetd calls, so cupsys-bsd is now a complete
+    replacement for lpr.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 14 May 2000 00:08:23 -0500
+
+cupsys (1.0.4-7) frozen unstable; urgency=high
+
+  * Additional DoS fixes, included in Easy Software Products' patch for
+    the bug below.  As these are DoS bugs, I HIGHLY recommend including
+    this in potato.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun, 18 Jun 2000 22:39:01 -0500
+
+cupsys (1.0.4-6) frozen unstable; urgency=high
+
+  * Fixed denial-of-service bug; POSTing non-IPP data would cause the
+    server to crash.  Closes bug #65576 (severity: critical).
+
+ -- Jeff Licquia <licquia@debian.org>  Tue, 13 Jun 2000 22:04:40 -0500
+
+cupsys (1.0.4-5) frozen unstable; urgency=low
+
+  * Backported 1.0.5 bugfix: adding a printer would fail if
+    /usr/share/cups were mounted on a different partition than /etc/cups.
+    Closes bug #62267 (severity: grave).
+
+ -- Jeff Licquia <licquia@debian.org>  Thu, 13 Apr 2000 23:09:40 -0500
+
+cupsys (1.0.4-4) frozen unstable; urgency=low
+
+  * Makefile in conf was attempting to remove /etc/printcap during build, and
+    fails to build if this fails (which it will under fakeroot); disabled
+    this.  Closes bug #60455 (severity: important).
+
+ -- Jeff Licquia <licquia@debian.org>  Wed, 15 Mar 2000 12:34:20 -0600
+
+cupsys (1.0.4-3) frozen unstable; urgency=low
+
+  * Oops - ppd directory move fails in preinst if /var/lib/cups/ppd is
+    empty.  Reported as bug #59993, fixed.
+  * Missed the library Build-Depends.  Closes bug #60090.
+  * Postrm during purge now removes /etc/cups properly.
+  * Documentation updates.
+
+ -- Jeff Licquia <licquia@debian.org>  Fri, 10 Mar 2000 22:59:07 -0600
+
+cupsys (1.0.4-2) frozen unstable; urgency=low
+
+  * Fixed documentation corruption in HTML docs (closes bug #59063).
+  * Moved /var/lib/cups/ppd/* config files (printer definitions) to
+    /etc/cups/ppd (closes bug #59263).
+  * Fixed shlibs for libcupsys1 (erroneous information) preventing
+    packages that link to it from depending properly.
+  * Changed default for browsing to Off to keep cupsd from probing the
+    local network continuously (closes bug #59277).
+
+ -- Jeff Licquia <licquia@debian.org>  Sat,  4 Mar 2000 18:23:01 -0600
+
+cupsys (1.0.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Changed policy version & tweaked for conformance.
+  * Fixed symlinks for cupsys-bsd, including /usr/doc symlinks.
+  * Reverted lp -h hack in favor of upstream fix.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun,  9 Jan 2000 23:25:06 -0600
+
+cupsys (1.0.2-2) unstable; urgency=low
+
+  * Added quick hack to allow for -h option to lp (closes bug #52050).
+  * Set the lpd backend suid after quick audit; it doesn't appear to have
+    any egregious errors (closes part of bug #52381).
+  * Move /var/lib/cups/conf files to /etc/cups, with a symlink in place of
+    the old location (closes bug #52318).
+  * Added "Authentication failed" message when authorizing after the first
+    auth failure (which is likely before the first password request)
+    (closes rest of bug #50264).
+  * Made cupsys-bsd doc dir a symlink to the cupsys doc files, per policy
+    section 6.6 (closes bug #51958).
+  * Symlinked /var/lib/cups/logs to /var/log/cups (closes bug #51957).
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 13 Dec 1999 02:12:40 -0600
+
+cupsys (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Conflict with lprng, since lprng includes some SysV printing commands
+    (closes bug #50539).
+  * Added "cupsenable", "cupsdisable", "cupsaccept", and "cupsreject"
+    commands as part of an ongoing effort to reduce namespace pollution.
+    (addresses part of bug #50661 and #50384)
+  * Set both the default user and group to "lp" (for permissions fixes).
+  * Created "lpadmin" group and set SystemGroup to this.  This will
+    fix problems with CUPS not being usable initially.  As soon as
+    bug #50620 gets fixed, I'll set up to add root to the group, which
+    will make root able to configure CUPS immediately after installation.
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 29 Nov 1999 00:16:44 -0600
+
+cupsys (1.0.1-3) unstable; urgency=low
+
+  * Fixed wrong symlinks. (closes bug #50279)
+  * Stopped compression of .pdf files; they didn't gain much, broke
+    the links in the HTML, and generally caused confusion. (closes
+    part of bug #50264)
+
+ -- Jeff Licquia <licquia@debian.org>  Mon, 15 Nov 1999 22:28:56 -0600
+
+cupsys (1.0.1-2) unstable; urgency=low
+
+  * cupsys-bsd should conflict with lpr, not "lpd" (whatever that is) 
+  (closes #50047)
+  
+  * Changed priority to "extra".
+
+ -- Jeff Licquia <licquia@debian.org>  Fri, 12 Nov 1999 22:24:15 -0600
+
+cupsys (1.0.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Jeff Licquia <licquia@debian.org>  Sun,  6 Nov 1999 20:58:02 -0500
+
+Local variables:
+mode: debian-changelog
+End:
--- cupsys-1.2.1.orig/debian/cupsys.logrotate
+++ cupsys-1.2.1/debian/cupsys.logrotate
@@ -0,0 +1,15 @@
+/var/log/cups/*log {
+	daily
+	missingok
+	rotate 7
+	sharedscripts
+	postrotate
+		if [ -e /var/run/cups/cupsd.pid ]; then
+			invoke-rc.d --quiet cupsys force-reload > /dev/null
+			sleep 10
+		fi
+	endscript
+	compress
+	notifempty
+	create 640 cupsys lpadmin
+}
--- cupsys-1.2.1.orig/debian/libcupsys2.dirs
+++ cupsys-1.2.1/debian/libcupsys2.dirs
@@ -0,0 +1 @@
+/var/spool/cups/tmp
--- cupsys-1.2.1.orig/debian/cupsys.postrm
+++ cupsys-1.2.1/debian/cupsys.postrm
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postrm script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+case "$1" in
+    purge)
+	rm -rf /var/lib/cups
+	rm -rf /var/log/cups
+	rm -rf /var/spool/cups
+	rm -rf /etc/cups/interfaces
+	rm -rf /etc/cups/ppd
+	rm -rf /etc/cups/passwd.md5
+	rm -f /etc/cups/cups.d/*
+	rm -f /etc/cups/printers.conf* /etc/cups/classes.conf.* \
+		/var/lib/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types
+	rmdir /etc/cups 2>/dev/null || true
+	deluser --system --quiet cupsys
+	;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
--- cupsys-1.2.1.orig/debian/libcupsys2.shlibs
+++ cupsys-1.2.1/debian/libcupsys2.shlibs
@@ -0,0 +1 @@
+libcups 2 libcupsys2 (>= 1.2.1)
--- cupsys-1.2.1.orig/debian/cupsys-bsd.postrm
+++ cupsys-1.2.1/debian/cupsys-bsd.postrm
@@ -0,0 +1,41 @@
+#! /bin/sh
+# postrm script for cupsys-bsd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+    purge)
+        # Remove inetd entry
+        update-inetd --pattern cups-lpd --remove printer 2>/dev/null || true
+
+        ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
--- cupsys-1.2.1.orig/debian/cupsys-bsd.templates
+++ cupsys-1.2.1/debian/cupsys-bsd.templates
@@ -0,0 +1,8 @@
+Template: cupsys-bsd/setuplpd
+Type: boolean
+Default: false
+_Description: Do you want to set up the BSD lpd compatibility server?
+ This package contains a server that can accept BSD-style print jobs and
+ submit them to CUPS. It should only be set up if you have other computers
+ that submit jobs over the network via "BSD" or "LPR" services, and these
+ computers cannot be converted to use the IPP protocol that CUPS uses.
--- cupsys-1.2.1.orig/debian/filters/pstopdf
+++ cupsys-1.2.1/debian/filters/pstopdf
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# $Id: pstopdf,v 1.3 2003/02/15 15:21:00 gurubert Exp $
+#
+# This is a Postscript to PDF filter for CUPS
+#
+# (C) 2003 Robert Sander <robert.sander@epigenomics.com>
+#
+# Released under GPL
+#
+# NO WARRANTY AT ALL
+#
+
+PSTOPDF=/usr/bin/ps2pdf13
+OPTIONS="-r150 -dAutoRotatePages=/None -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dNOPLATFONTS"
+
+echo "INFO: pstopdf argv[$#] = $@" >&2
+
+if [ $# -lt 5 -o $# -gt 6 ]; then
+
+  echo "ERROR: $0 job-id user title copies options [file]" >&2
+  exit 1
+
+fi
+
+jobid=$1
+
+#infile=`mktemp /tmp/$jobid.pstopdf.in.XXXXXX`
+#if [ $? -ne 0 ]; then
+#  echo "ERROR: Error creating tmpfile $infile" >&2
+#  exit 1
+#fi
+#outfile=`mktemp /tmp/$jobid.pstopdf.out.XXXXXX`
+#if [ $? -ne 0 ]; then
+#  echo "ERROR: Error creating tmpfile $outfile" >&2
+#  exit 1
+#fi
+
+if [ $# -eq 6 ]; then
+
+  echo "INFO: file is $6" >&2
+  #cp $6 $infile
+  #rm -f $6
+
+  infile="$6"
+  outfile="$infile".pdf
+
+  $PSTOPDF $OPTIONS "$infile" "$outfile" 2>&1 >> /tmp/pstopdf.log
+
+else
+
+  outfile=`mktemp /tmp/$jobid.pstopdf.out.XXXXXX`
+  if [ $? -ne 0 ]; then
+    echo "ERROR: Error creating tmpfile $outfile" >&2
+    exit 1
+  fi
+
+  $PSTOPDF $OPTIONS - "$outfile" 2>&1 >> /tmp/pstopdf.log
+
+fi
+
+cat $outfile
+
+# cp "$infile" "$outfile" /tmp/cups/
+
+rm -f "$outfile"
+
+exit 0
--- cupsys-1.2.1.orig/debian/filters/dvipipetops.INSTALL
+++ cupsys-1.2.1/debian/filters/dvipipetops.INSTALL
@@ -0,0 +1,7 @@
+To use the dvipipetops filter:
+- create an /etc/cups/local.convs file and add the contents of
+  dvipipetops.convs to it
+- add the contents of dvipipetops.types to /etc/cups/mime.types
+- uncompress dvipipetops, give it exec permissions and put it in
+  /usr/lib/cups/filter
+- restart cups with /etc/init.d/cupsys restart
--- cupsys-1.2.1.orig/debian/filters/dvipipetops.convs
+++ cupsys-1.2.1/debian/filters/dvipipetops.convs
@@ -0,0 +1,4 @@
+# If you'd like to use dvi filter, install tetex-bin or dvipsk-ja package.
+# You can setup dvips options with /etc/default/cupsys.
+
+application/x-dvi	application/postscript 33 dvipipetops
--- cupsys-1.2.1.orig/debian/filters/samba-postscript.convs
+++ cupsys-1.2.1/debian/filters/samba-postscript.convs
@@ -0,0 +1 @@
+application/a-x-postscript-with-pjl-header application/postscript 10 samba-ps-to-ps
--- cupsys-1.2.1.orig/debian/filters/dvipipetops.types
+++ cupsys-1.2.1/debian/filters/dvipipetops.types
@@ -0,0 +1 @@
+application/x-dvi		dvi string(0,<F7><02>)
--- cupsys-1.2.1.orig/debian/filters/samba-postscript.types
+++ cupsys-1.2.1/debian/filters/samba-postscript.types
@@ -0,0 +1,14 @@
+# This evil type, which I have made up, catches files coming in via Samba, when
+# the Windows client is configured to print to the PostScript counterpart to
+# your non-PostScript printer (in my case, I have a Hewlett-Packard LaserJet 5P
+# and configure Windows to use the "HP LaserJet 5P/5MP PostScript" driver so
+# that it will send PostScript straight on rather than convert it to PCL before
+# sending it -- useful to print to files and so on.).  I do not know what
+# combinations produce the finest output.  See the conversion script
+# samba-ps-to-ps for more information.
+
+# The MIME type used here must sort alphbetically before application/postscript
+# (CUPS has a dozen manuals, and this information seemed available only in a
+# comment in mime.types!).  If this were a real MIME type, I think it would be
+# non-conformant.
+application/a-x-postscript-with-pjl-header	string(78,"%!PS-Adobe-")
--- cupsys-1.2.1.orig/debian/filters/dvipipetops
+++ cupsys-1.2.1/debian/filters/dvipipetops
@@ -0,0 +1,190 @@
+#!/bin/sh
+
+# CUPS (Common Unix Printing System) filter for DVI files
+
+## Copyright (C) 2004 Matthew Swift <swift@alum.mit.edu>
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+## Documentation
+#
+# This script has several advantages (some involving security and privacy) over
+# the script of the same name by Decklin Foster dated 2002 and (on the present
+# date) distributed with the Debian cupsys package in
+# /usr/share/doc/cupsys/examples/filters/dvipipetops.
+#
+# This script...
+#
+#   - works with Debian cupsys version 1.1.20final+cvs20040330-1.
+#   - uses the -R option to dvips for greater security.
+#   - creates a temporary file only when necessary.
+#   - is more aggressive about cleaning up its temporary file.
+#   - uses an absolute pathname for dvips, for greater security.
+#   - avoids a security problem when $TMPDIR contains a space.
+#   - is better documented.
+#   - gives better diagnostic output to CUPS.
+#
+# See http://localhost:631/spm.html#WRITING_FILTERS for information.
+# Note that the documentation as of this date is conflicting and misleading on
+# the subject of arguments passed to filters.
+
+## History
+# initial version: 1.0 [28 April 2004]
+
+# TODO
+#   add/remove trapped signals; are they portable?
+#   are there bashisms?  if so, should they be removed, or should bash be invoked explicitly?
+#   should we heed the "copies" argument?  my interpretation of the spec quoted
+#     below is that we should not.
+#   something interesting to do with page accounting?
+#   is including $prog in the diagnostic output redundant?
+
+## Variables you may want to tweak.
+
+# on error, exit with this status.
+CUPS_DVIPS_ERREXIT=2
+# absolute pathname to dvips executable
+CUPS_DVIPS=/usr/bin/dvips
+
+# If you want to give options to dvips that should not go into the normal
+# config.ps, include them here.  A good method would be to include, e.g.,
+# "-Pcups" and put all your configuration into cups.ps in the right place for
+# your dvips (e.g., /etc/texmf/dvips for a standard Debian TeX installation).
+# Note that CUPS passes information in the environment and the command line
+# that can be used here to determine the options, if you wanted.
+##
+# additional options to give to dvips
+CUPS_DVIPS_OPTS=""
+
+# Load configuration from default file.
+. /etc/default/cupsys
+
+## I do not expect you to want to change anything below here,
+## except possibly to (dis)include the debugging statements.
+#############################################################
+
+prog=$(basename "$0")
+# This statement needs bash I think.
+echo "DEBUG: $prog: \"$0\" has been called with these arguments:" >&2
+count=1
+for x; do
+    echo "DEBUG: $prog: arg $((count++)): \"$x\"" >&2
+done
+echo "DEBUG: $prog: \$CUPS_DVIPS_OPTIONS=$CUPS_DVIPS_OPTIONS" >&2
+
+#### echo "         $prog: test debug without prefix" >&2
+#### echo "DEBUG:   $prog: test debug with prefix"    >&2
+#### echo "INFO:    $prog: test info"                 >&2
+#### echo "WARNING: $prog: test warning"              >&2
+#### echo "ERROR:   $prog: test error"                >&2
+#### echo "PAGE:    $prog: test page"                 >&2
+
+# Get rid of the irrelevant command line arguments.
+if ! shift 5; then
+    echo "ERROR: $prog: expected 5 or 6 arguments and received <5" >&2
+    exit $CUPS_DVIPS_ERREXIT
+elif [ $# -gt 1 ]; then
+    echo "ERROR: $prog: expected 5 or 6 arguments and received >6" >&2
+    exit $CUPS_DVIPS_ERREXIT
+elif [ $# -eq 1 ]; then
+    file=$1
+else
+    # Dvips needs seekable input, so if input is on stdin, we need to save it
+    # to a temporary file.
+
+    # tempfile(1) is in the debianutils Debian package (28 April 2004) and is
+    # recommended over mktemp(1).
+    if ! file=$(/bin/tempfile); then
+        echo "ERROR: $prog: invocation of /bin/tempfile failed" >&2
+        exit $CUPS_DVIPS_ERREXIT
+    fi
+    #  1) SIGHUP       2) SIGINT       3) SIGQUIT      4) SIGILL
+    #  5) SIGTRAP      6) SIGABRT      7) SIGBUS       8) SIGFPE
+    #  9) SIGKILL     10) SIGUSR1     11) SIGSEGV     12) SIGUSR2
+    # 13) SIGPIPE     14) SIGALRM     15) SIGTERM     17) SIGCHLD
+    # etc.
+    trap "rm -f \"$file\" 2>/dev/null" EXIT 1 2 3 9 15
+    # Be sure that no prior commands use up the script's stdin.  Duplicate stdin if necessary.
+    cat - >"$file"
+fi    
+# Dvips options:
+#   -q   be quiet        (not used: output is always sent to CUPS;
+#                         CUPS variables LogLevel etc. control what
+#                         is actually logged and where.)
+#   -R   run securely    (recommended)
+#   -f   run as a filter (necessary)
+##
+
+# If the INFO: level output is not actually going to be logged, we are wasting
+# a time generating it.  While in this script, the wasted time is negligible,
+# it does to me a very reasonable wish that CUPS provide the LogLevel to
+# filters via an environment variable.  For example, we could choose whether to
+# give debugging options to dvips or not.
+##
+# Make the shell's fd3 point to the shell's stdout.
+exec 3>&1
+# Make the error text of dvips go to the command's stdout and thus through the
+# pipe to the {}-subshell; make the normal text of dvips go to the shell's
+# stdout (fd3); make the {}-subshell's normal output go to the shell's
+# stderr (fd2 as usual).  I think it's good form to close fd3 for the dvips and
+# {}-subshell commands, but this may be unnecessary.
+"$CUPS_DVIPS" -R -f $CUPS_DVIPS_OPTS <"$file" 2>&1 1>&3- | \
+    { while read -r -a line; do echo "INFO: $prog: ${line[*]}" >&2; done 3>&-; }
+# Close fd3 for the shell.
+exec 3>&-
+
+exit
+
+#######
+#NOTES#
+#######
+
+# MSS as of this date, arguments passed to filters seem to be, starting with $1:
+#
+# job user title copies options [filename]
+#
+# Remainder from official documentation:
+#
+# job      The numeric job ID for the job being printed
+# user     The string from the originating-user-name attribute
+# title    The string from the job-name attribute
+# copies   The numeric value from the number-copies attribute
+# options  String representations of the job template attributes, separated by
+#          spaces. Boolean attributes are provided as "name" for true values and
+#          "noname" for false values. All other attributes are provided as
+#          "name=value" for single-valued attributes and
+#          "name=value1,value2,...,valueN" for set attributes
+# filename The request file
+
+# The filename argument is provided to only the first filter in the chain.
+
+# The copies argument specifies the number of copies to produce of the input
+# file. In general, you should only generate copies if the filename argument is
+# supplied. The only exception to this are filters that produce
+# device-independent PostScript output (without any printer commands from the
+# printer's PPD file), since the PostScript filter pstops is responsible for
+# copy generation.
+
+# The type of message is determined by an initial prefix sent on each line:
+# DEBUG: - a debug message
+# INFO: - an informational message
+# WARNING: - a warning message
+# ERROR: - an error message
+# PAGE: - a page accounting message
+
+# If the line of text does not begin with any of the above prefixes, it is
+# treated as a debug message. Text following the prefix is copied to the
+# printer-state-message attribute for the printer, and also added to the
+# error_log unless it is an informational or page accounting message.
--- cupsys-1.2.1.orig/debian/filters/mailto
+++ cupsys-1.2.1/debian/filters/mailto
@@ -0,0 +1,161 @@
+#!/usr/bin/python
+
+#
+# $Id: mailto,v 1.3 2003/01/02 17:59:19 gurubert Exp $
+#
+
+#
+# This is a mailto backend for CUPS (www.cups.org)
+#
+# (C) 2002 Robert Sander <robert.sander@epigenomics.com>
+#
+# Released under GPL
+#
+# NO WARRANTY AT ALL
+#
+
+import sys, os, tempfile, MimeWriter, mimetools, mimetypes
+
+log = "\nLog:\n"
+
+def guess_type(file):
+    global log
+    
+    type, enc = mimetypes.guess_type(file)
+    if (not type) or (type == 'application/octet-stream'):
+        enc = None
+        try:
+            type = os.popen("/usr/bin/file -bi %s 2> /dev/null" % file).read().rstrip()
+            if type == "" or type == "data":
+                type = "application/octet-stream"
+        except:
+            type = "application/octet-stream"
+    if log:
+        log = "%stype is %s\n" % (log, type)
+    return (type, enc)
+
+def guess_extension(mimetype):
+    return(mimetypes.guess_extension(mimetype))
+
+argc = len(sys.argv)
+
+if argc == 1:
+    print "network mailto \"Unknown\" \"SMTP\""
+    sys.exit(0)
+
+sys.stderr.write("INFO: mailto argv[%s] =" % argc)
+if log:
+    log = "%smailto argv[%s] =" % (log, argc)
+for arg in sys.argv[1:]:
+    sys.stderr.write(" '%s'" % arg)
+    if log:
+        log = "%s '%s'" % (log, arg)
+sys.stderr.write("\n")
+if log:
+    log = "%s\n" % log
+
+if argc < 6 or argc > 7:
+    sys.stderr.write("ERROR: %s job-id user title copies options [file]\n" % sys.argv[0])
+    sys.exit(1)
+
+jobid = sys.argv[1]
+user = sys.argv[2]
+title = sys.argv[3]
+opts = sys.argv[5].split(" ")
+
+if argc == 7:
+    sys.stderr.write("INFO: file is %s\n" % sys.argv[6])
+    if log:
+        log = "%sfile is %s\n" % (log, sys.argv[6])
+    infilename = sys.argv[6]
+else:
+    infilename = tempfile.mktemp(".mailto")
+    try:
+        infile = open(infilename, "w")
+    except:
+        sys.stderr.write("ERROR: unable to create tmp file %s\n" % infilename)
+        sys.exit(1)
+    sys.stderr.write("INFO: file is stdin\n")
+    try:
+        infile.write(sys.stdin.read())
+    except:
+        sys.stderr.write("ERROR: unable to copy into tmpfile\n")
+        sys.exit(1)
+    infile.close()
+    if log:
+        log = "%scopied stdin to %s\n" % (log, infilename)
+
+infile = open(infilename, "r")
+
+sys.stderr.write("INFO: creating tmp mail file\n")
+
+try:
+    mimemailfile = tempfile.TemporaryFile()
+    mimemail = MimeWriter.MimeWriter(mimemailfile)
+except:
+    sys.stderr.write("ERROR: unable to create tmp file for MIME_MAIL\n")
+    sys.exit(1)
+
+mailto = None
+mailfrom = None
+for opt in opts:
+    if log:
+        log = "%sopt = '%s'\n" % (log, opt)
+    if opt[:7] == "mailto=":
+        mailto = opt[7:]
+        if log:
+            log = "%smailto = '%s'\n" % (log, mailfrom)
+    if opt[:9] == "mailfrom=":
+        mailfrom = opt[9:]
+        if log:
+            log = "%smailfrom = '%s'\n" % (log, mailfrom)
+if not mailto:
+    if user:
+        mailto = user
+    else:
+        mailto = mailfrom
+else:
+    if not mailfrom:
+        if user:
+            mailfrom = user
+if not mailfrom:
+    mailfrom = "lp"
+
+# Essential lines to put into the header of a MIME mail.
+mimemail.addheader("From", mailfrom)
+mimemail.addheader("To", mailto)
+mimemail.addheader("Subject", title)
+mimemail.addheader("MIME-Version", "1.0")
+if mailto != user and mailfrom != user:
+    mimemail.addheader("X-CUPS-mailto-started-by", user)
+
+mimemail.startmultipartbody("mixed")
+
+body = mimemail.nextpart()
+
+body.addheader("Content-Transfer-Encoding", "8bit")
+
+body.startbody("text/plain").write("You printed %s with jobid %s\n%s" % (title, jobid, log))
+
+attachment = mimemail.nextpart()
+type, enc = guess_type(infilename)
+ext = guess_extension(type)
+if not ext:
+    ext = ""
+attachment.addheader("Content-Transfer-Encoding", "base64")
+att = attachment.startbody('%s; name="%s%s"' % (type, os.path.basename(title), ext))
+mimetools.encode(infile, att, "base64")
+mimemail.lastpart()
+
+mimemailfile.seek(0)
+
+os.popen("/usr/sbin/sendmail -t -f%s" % mailfrom, "w").write(mimemailfile.read())
+
+att.close()
+infile.close()
+mimemailfile.close()
+
+if argc == 6:
+    os.unlink(infilename)
+
+sys.exit(0)
--- cupsys-1.2.1.orig/debian/filters/pdf.ppd
+++ cupsys-1.2.1/debian/filters/pdf.ppd
@@ -0,0 +1,136 @@
+*PPD-Adobe: "4.3"
+*%
+*% "$Id: pdf.ppd,v 1.3 2003/01/02 23:32:42 gurubert Exp $"
+*%
+*%   Printer description for a printer that uses the pstopdf filter
+*%
+*%   This file is based on the laserjet.ppd that comes with CUPS.
+*%
+*FormatVersion:	"4.3"
+*FileVersion:	"1.1"
+*LanguageVersion: English 
+*LanguageEncoding: ISOLatin1
+*PCFileName:	"PDF.PPD"
+*Manufacturer:	"Robert Sander <robert.sander@epigenomics.com>"
+*Product:	"(CUPS v1.1)"
+*cupsVersion:	1.1
+*cupsManualCopies: False
+*cupsFilter:	"application/vnd.cups-postscript 33 pstopdf"
+*ModelName:     "PDF Converter"
+*ShortNickName: "PDF Converter"
+*NickName:      "PDF Converter CUPS v1.1"
+*PSVersion:	"(3010.000) 550"
+*LanguageLevel:	"3"
+*ColorDevice:	True
+*DefaultColorSpace: RGB
+*FileSystem:	False
+*Throughput:	"8"
+*LandscapeOrientation: Plus90
+*VariablePaperSize: False
+*TTRasterizer:  Type42
+
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize Letter/US Letter:	"<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal:	"<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageSize Executive/US Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Tabloid/US Tabloid:	"<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageSize A3/A3:		"<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageSize A4/A4:		"<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5:		"<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageSize B5/B5 (JIS):		"<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10:	"<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5:	"<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize EnvDL/Envelope DL:	"<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion Letter/US Letter:	"<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal:	"<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*PageRegion Executive/US Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Tabloid/US Tabloid:	"<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageRegion A3/A3:		"<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageRegion A4/A4:		"<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5:		"<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageRegion B5/B5 (JIS):	"<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10:	"<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5:	"<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvDL/Envelope DL:	"<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+
+*DefaultImageableArea: A4 
+*ImageableArea Letter/US Letter:	"18 36 594 756"
+*ImageableArea Legal/US Legal:		"18 36 594 972"
+*ImageableArea Executive/US Executive:	"18 36 504 684"
+*ImageableArea Tabloid/US Tabloid:	"18 36 774 1188"
+*ImageableArea A3/A3:			"18 36 824 1155"
+*ImageableArea A4/A4:			"18 36 577 806"
+*ImageableArea A5/A5:			"18 36 403 559"
+*ImageableArea B5/JIS B5:		"18 36 498 693"
+*ImageableArea EnvISOB5/B5 (ISO):	"18 36 463 673"
+*ImageableArea Env10/Com-10:		"18 36 279 648"
+*ImageableArea EnvC5/EnvC5:		"18 36 441 613"
+*ImageableArea EnvDL/EnvDL:		"18 36 294 588"
+*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504"
+
+*DefaultPaperDimension: A4
+*PaperDimension Letter/US Letter:	"612 792"
+*PaperDimension Legal/US Legal:		"612 1008"
+*PaperDimension Executive/US Executive:	"522 756"
+*PaperDimension Tabloid/US Tabloid:	"792 1224"
+*PaperDimension A3/A3:			"842 1191"
+*PaperDimension A4/A4:			"595 842"
+*PaperDimension A5/A5:			"421 595"
+*PaperDimension B5/B5 (JIS):		"516 729"
+*PaperDimension EnvISOB5/Envelope B5:	"499 709"
+*PaperDimension Env10/Envelope #10:	"297 684"
+*PaperDimension EnvC5/Envelope C5:	"459 649"
+*PaperDimension EnvDL/Envelope DL:	"312 624"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
+*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
+*Font Bookman-Light: Standard "(001.004S)" Standard ROM
+*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
+*Font Courier: Standard "(002.004S)" Standard ROM
+*Font Courier-Bold: Standard "(002.004S)" Standard ROM
+*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
+*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
+*Font Helvetica: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
+*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
+*Font Symbol: Special "(001.007S)" Special ROM
+*Font Times-Bold: Standard "(001.007S)" Standard ROM
+*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
+*Font Times-Italic: Standard "(001.007S)" Standard ROM
+*Font Times-Roman: Standard "(001.007S)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
+*Font ZapfDingbats: Special "(001.004S)" Standard ROM
+*%
+*% End of "$Id: pdf.ppd,v 1.3 2003/01/02 23:32:42 gurubert Exp $".
+*%
--- cupsys-1.2.1.orig/debian/filters/samba-to-ps
+++ cupsys-1.2.1/debian/filters/samba-to-ps
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# CUPS (Common Unix Printing System) filter to fix certain "broken" PostScript files
+
+# The files generated by Hewlett-Packard's Windows drivers for the "LaserJet
+# 5P/5MP PostScript" printer include a PJL header (that switches that printer
+# to PostScript) before the actual PostScript file, and some weird additional
+# comments within the PostScript.  If you are sending these files (via Samba)
+# to a plain LaserJet 5P (i.e., without PostScript), you need to remove the
+# header and the weird additional comments before sending the file to
+# ghostscript.  Though it is a reasonable guess that the same situation applies
+# to other pairs of HP printers with and without native PostScript
+# capabilities, I have tested this script only with the LaserJet 5P.
+
+# The garbage we are trimming at top and bottom of the file is fixed-length, so
+# we could use something simpler than awk to trim it, but we have to use awk
+# anyway to skip those weird comment lines (3d line of the program below), so
+# let's just use awk for the whole thing.
+
+# I wrote this awk script in the mid-1990s when I bought this printer, and it
+# still serves me well today, with the latest versions of Windows, Debian, and
+# Samba, and with CUPS instead of old BSD lpd and magicfilter.  I adapted it
+# for CUPS in April 2004.  I put this code into the public domain.  I am not
+# putting my name on it because I do not want to receive emails with questions
+# about things I do not know much about.
+
+# TODO
+#   does the code here involve gawk extensions?
+
+# on error, exit with this status.
+CUPS_SAMBAPS_ERREXIT=2
+
+prog=$(basename "$0")
+# This statement needs bash I think.
+echo "DEBUG: $prog: \"$0\" has been called with these arguments:" >&2
+count=1
+for x; do
+    echo "DEBUG: $prog: arg $((count++)): \"$x\"" >&2
+done
+
+if ! shift 5; then
+    echo "ERROR: $prog: expected 5 or 6 arguments and received <5" >&2
+    exit $CUPS_SAMBAPS_ERREXIT
+elif [ $# -gt 1 ]; then
+    echo "ERROR: $prog: expected 5 or 6 arguments and received >6" >&2
+    exit $CUPS_SAMBAPS_ERREXIT
+fi
+
+# variable `printme' starts as 0
+/usr/bin/awk \
+    '/^%\!PS-Adobe-/                           {printme = 1}
+     /^%%EOF/                                  {print; printme = 0}
+     /\(%%\[ ?(ProductName:|Page:|LastPage ?)/ {next}
+                                               { if (printme) print; else next }' \
+    ${1--}    
+exit
--- cupsys-1.2.1.orig/debian/libcupsimage2-dev.preinst
+++ cupsys-1.2.1/debian/libcupsimage2-dev.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh
+# preinst script for libcupsimage2-dev
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if [ ! -L /usr/share/doc/libcupsimage2-dev ]; then
+	    rm -rf /usr/share/doc/libcupsimage2-dev
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/compat
+++ cupsys-1.2.1/debian/compat
@@ -0,0 +1 @@
+4
--- cupsys-1.2.1.orig/debian/libcupsimage2-dev.files
+++ cupsys-1.2.1/debian/libcupsimage2-dev.files
@@ -0,0 +1,3 @@
+usr/lib/libcupsimage.so
+usr/include/cups/image.h
+usr/include/cups/raster.h
--- cupsys-1.2.1.orig/debian/cupsys-bsd.files
+++ cupsys-1.2.1/debian/cupsys-bsd.files
@@ -0,0 +1,10 @@
+usr/sbin/lpc
+usr/bin/lpq
+usr/bin/lpr
+usr/bin/lprm
+usr/lib/cups/daemon/cups-lpd
+usr/share/man/man1/lpr.1.gz
+usr/share/man/man1/lprm.1.gz
+usr/share/man/man1/lpq.1.gz
+usr/share/man/man8/cups-lpd.8.gz
+usr/share/man/man8/lpc.8.gz
--- cupsys-1.2.1.orig/debian/libcupsimage2.preinst
+++ cupsys-1.2.1/debian/libcupsimage2.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh
+# preinst script for libcupsimage2
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if [ ! -L /usr/share/doc/libcupsimage2 ]; then
+	    rm -rf /usr/share/doc/libcupsimage2
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/cupsys-bsd.prerm
+++ cupsys-1.2.1/debian/cupsys-bsd.prerm
@@ -0,0 +1,45 @@
+#! /bin/sh
+# prerm script for cupsys-bsd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+
+if [ -L /etc/printcap ]; then
+    rm -f /etc/printcap
+fi
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	# Remove documentation links
+	rm -rf /usr/share/doc/cupsys-bsd
+
+	# Disable inetd entry
+	update-inetd --pattern cups-lpd --disable printer
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/libcupsys2.files
+++ cupsys-1.2.1/debian/libcupsys2.files
@@ -0,0 +1,2 @@
+usr/lib/libcups.so.*
+usr/lib64/libcups.so.*
--- cupsys-1.2.1.orig/debian/libcupsys2.postinst
+++ cupsys-1.2.1/debian/libcupsys2.postinst
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/cupsys-client.files
+++ cupsys-1.2.1/debian/cupsys-client.files
@@ -0,0 +1,31 @@
+usr/bin/cancel
+usr/bin/cupstestppd
+usr/bin/cupstestdsc
+usr/bin/lp
+usr/bin/lpoptions
+usr/bin/lppasswd
+usr/bin/lpstat
+usr/sbin/cupsaddsmb
+usr/sbin/accept
+usr/sbin/lpadmin
+usr/sbin/lpinfo
+usr/sbin/lpmove
+usr/sbin/reject
+usr/sbin/cupsdisable
+usr/sbin/cupsenable
+usr/share/man/man1/cupstestppd.1.gz
+usr/share/man/man1/cupstestdsc.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/lpstat.1.gz
+usr/share/man/man1/cancel.1.gz
+usr/share/man/man5/client.conf.5.gz
+usr/share/man/man8/cupsaddsmb.8.gz
+usr/share/man/man8/cupsenable.8.gz
+usr/share/man/man8/lpadmin.8.gz
+usr/share/man/man8/lpinfo.8.gz
+usr/share/man/man8/lpmove.8.gz
+usr/share/man/man8/reject.8.gz
+usr/share/man/man8/cupsdisable.8.gz
+usr/share/man/man8/accept.8.gz
--- cupsys-1.2.1.orig/debian/cupsys-client.links
+++ cupsys-1.2.1/debian/cupsys-client.links
@@ -0,0 +1,7 @@
+usr/sbin/accept usr/sbin/cupsaccept
+usr/sbin/accept usr/sbin/cupsreject
+usr/sbin/accept usr/bin/cupsenable
+usr/sbin/accept usr/bin/cupsdisable
+usr/share/man/man8/accept.8.gz usr/share/man/man8/cupsaccept.8.gz
+usr/share/man/man8/accept.8.gz usr/share/man/man8/cupsreject.8.gz
+usr/share/man/man8/cupsenable.8.gz usr/share/man/man8/cupsdisable.8.gz
--- cupsys-1.2.1.orig/debian/README.Debian
+++ cupsys-1.2.1/debian/README.Debian
@@ -0,0 +1,262 @@
+cupsys for Debian
+----------------------
+
+If you found a problem, please read HOWTO_BUGREPORT.txt and report me
+via Debian Bug Tracking System.
+-- 
+Kenshi Muto
+kmuto@debian.org
+
+---------
+This package contains the Common UNIX Printing System(tm), or CUPS(tm) 
+for short.  CUPS is a new printing system for Unix that acts as a
+substitute for System V or BSD printing systems; it supports a more
+comprehensive driver model, more protocols, and Web administration,
+among other things.  Internally, CUPS uses the new Internet Printing
+Protocol (IPP) described in RFCs 2565 through 2569.
+
+The terms "CUPS" and "Common UNIX Printing System" are trademarks of
+Easy Software Products, the author of the system.  This package is a
+derivative of the CUPS system, modified for Debian and possibly
+containing modifications and fixes that are not present in the
+standard CUPS package.  For a comprehensive list of changes from the
+original source, see the diff file from the source package.  For more
+information about the legal stuff surrounding this package, see the
+Debian copyright file or the CUPS Web site (www.cups.org).
+
+After installation, CUPS is pretty close to being ready to go.  The
+last step is to add administrative access; the "lpadmin" group has
+been created and granted administrative rights to CUPS.  You may need
+to add users to this group in order to add printers, modify settings,
+etc.  By default, the root user has been granted this permission, but
+you should only use the root user on the local system.
+
+The printers can be added with either the lpadmin program or the web 
+interface, which is located at http://localhost:631/admin by default.
+
+Backend Configuration
+---------------------
+
+CUPS supports serial, parallel, USB, SCSI, IPP, HTTP, Socket and Samba
+for its backend. But unfortunately, some backends cause a trouble.
+For example, serial backend confuses and won't stop when non printer
+device connects serial port. Parallel backend is more terrible for PPC,
+it may cause kernel crash (kernel bug, sigh).
+So, CUPS setting puts serial and SCSI off from backend by default. And
+if you use PPC, parallel backend is off also.
+
+If you want to use these backends, you can configure by using
+'dpkg-reconfigure cupsys'.
+
+SSL Support
+-----------
+
+CUPS supports SSL via the OpenSSL toolkit, but licensing conflicts
+between OpenSSL's license and the GPL make this combination difficult
+to use, even though the CUPS license itself allows this.  A competing
+library, GNU TLS, has an OpenSSL compatibility layer that could work
+with these packages, but the compatibility library is licensed under
+the GNU GPL, which could conflict with the license of certain programs
+that support CUPS.  Therefore, the cupsys packages as shipped do not
+support SSL.
+
+It is possible to build the packages yourself with SSL support.  You
+can either use the OpenSSL libraries or GNU TLS's OpenSSL
+compatibility library.  Just set an environment variable:
+"CUPS_OPENSSL" for OpenSSL support, or "CUPS_GNUTLS" for GNU TLS
+support, and make sure you have the proper development packages
+installed (libssl-dev for OpenSSL or libgnutls7-dev for GNU TLS).
+
+PLEASE NOTE: If you build packages with SSL support and distribute
+them, you are responsible for making sure you do not violate the
+licenses of any of the software you distribute.
+
+Important Security Notes
+------------------------
+
+ - By default, cupsys is configured to only allow connections to
+   printers from localhost, effectively disabling network printing.
+   The previous default was to allow anyone to connect to printers
+   from any location.  You can change these defaults by editing
+   /etc/cups/cupsd.conf; the access controls are at the end of the
+   file.  Be sure you only allow access from the locations you trust,
+   or require authentication.
+
+ - CUPS used to support a file backend that was handled internally by
+   cupsd.  This was only intended to be used for testing filters, and
+   not in production use, as it can be a security risk and will drop
+   jobs under certain circumstances.  In keeping with that, the file
+   "backend" has been renamed to "test", and the lpadmin command no
+   longer rewrites bare path URIs (either to "file:" or "test:").  If
+   you need a backend that dumps a completed job to a file on the
+   filesystem, you should write a separate backend and put it in
+   /usr/lib/cups/backend.  See the CUPS documentation for information
+   on how to do this.
+
+ - To relieve the burden of local authentication somewhat, CUPS uses
+   special tokens called "certs" that are passed between client and
+   server.  In normal CUPS installations, these are stored in
+   /etc/cups/certs.  However, this location violates Debian policy, as
+   the certs are generated and not available to edit.  Thus, the real
+   certs are now stored in /var/spool/cups/certs, with a symlink at
+   /etc/cups/certs for compatibility.
+
+Drivers
+-------
+
+The CUPS software includes generic drivers for several brands of
+printers.  At the moment, this includes HP LaserJets and DeskJets,
+various Epson and Okidata printers, and Dymo label printers.
+
+There are also other packages containing CUPS printer drivers.  If any
+of those were written explicitly for your printer, chances are that it
+will support your printer better than the generic drivers that ship
+with CUPS.  I try to keep the package Suggestions current regarding
+popular CUPS driver packages; to see this list, run this command:
+
+  apt-cache show cupsys | grep Suggests
+
+PostScript printers often ship with PPD files supplied by the printer
+manufacturer.  Any valid PPD for a PostScript printer is a valid CUPS
+driver.  To enable them for use with CUPS, copy the PPDs into
+/usr/share/cups/model; they should then be available for use with
+lpadmin -m and the Web interface for adding printers.
+
+If you find a CUPS driver that isn't packaged for Debian and you'd
+like it to be, you can contact me and let me know where the driver is,
+and I'll get to it as soon as I can.
+
+Or, you can package them yourself.  See below for details.
+
+Packaging
+---------
+
+There are five packages provided by CUPS: the server, the primary
+command-line client programs, the BSD client and server compatibility
+programs, and the library and development packages.
+
+The CUPS BSD commands and cups-lpd daemon are separated into their own
+package (cupsys-bsd); the hope is to make it possible to run CUPS and
+some other BSD-style printing system (such as lpr) side-by-side for
+testing purposes.  If you encounter any trouble doing this, file a
+bug.  It's known that CUPS conflicts with LPRng, since LPRng provides
+some System V printing commands as well; this problem will (hopefully)
+be dealt with in time.
+
+Add-ons for CUPS (such as drivers, backends, clients, etc.) should
+depend on the proper packages.  If your package is CUPS-specific, you
+should name it so it can be easily identified as a CUPS package, with
+names such as:
+
+  cupsys-driver-foo	(for a driver for Foo printers)
+  cupsys-backend-bar	(for a backend to print to Bar printers)
+  cupsys-client-baz	(for a client module to hook Baz into CUPS)
+
+If you feel your driver/backend/client/whatever package is popular
+enough that most CUPS users would be interested in it, please file a
+wishlist bug against cupsys requesting that it be added to the
+Suggests line for cupsys.
+
+Other Add-Ons
+-------------
+
+I'm also collecting add-ons - filters, backends, etc. - and putting
+them in the "examples" directory with the rest of the cupsys package
+documentation files.  Check there for some interesting filters and
+backends.
+
+To install a filter from the filters directory, copy the filter itself
+into /usr/lib/cups/filter and the associated .types and .convs files
+into /etc/cups.  Then restart cupsd, and you should be ready to use
+it.
+
+If you have a filter or backend you'd like to contribute, but don't
+think it's big enough to warrant its own package, file a wishlist bug
+and attach your script.  If it's a filter, send along a .convs and
+.types file as well.
+
+Integration with Samba
+----------------------
+
+It is possible to configure Samba to share CUPS printers to Microsoft
+clients.  There are two ways to do this:
+
+1.  Recent versions of Samba have direct CUPS support, including
+Debian's.  With this present, you can configure Samba as follows:
+
+[global]
+  printing = cups
+  printcap name = cups
+
+2.  If, for some reason, you don't want to use Samba's native CUPS
+support, you can configure Samba to use System V printing.  This can
+be done by adding the following information to Samba's smb.conf
+(/etc/samba/smb.conf on Debian):
+
+[global]
+  printing = sysv
+  printcap name = lpstat
+
+[printers]
+  lpq command = /usr/bin/lpstat %p
+  lprm command = /usr/bin/cancel %p-%j
+  print command = /usr/bin/lp -d%p -oraw %s ; /bin/rm -f %s
+
+This method will require installation of the cupsys-client package.
+
+For more tips on integration with Samba, check out the man page for
+cupsaddsmb, which is part of the cupsys-client package.
+
+Miscellaneous Tips
+------------------
+
+ - CUPS has support for browsing, which uses broadcast traffic to
+   auto-discover other CUPS servers and printers and make them
+   available to clients.  In the default configuration, cupsd will
+   accept browse packets in the CUPS format from other CUPS servers,
+   but will not send any.  If sending browse packets is turned on, it
+   may trigger demand dialers and increase traffic on the network.  To
+   help prevent this, set the BrowseAddress parameter to only
+   advertise CUPS printers on specific interfaces.  As a potentially
+   more robust option, CUPS also supports SLP (Service Location
+   Protocol).
+
+ - You may encounter some problems using the "enable" command under
+   bash, as "enable" is a builtin there.  As a workaround, I've
+   created the "cupsenable" command, which acts exactly as "enable"
+   does.  There are also "cupsdisable", "cupsaccept", and "cupsreject"
+   commands for consistency.
+
+ - There is an online database with PPDs for lots of different
+   printers at http://www.linuxprinting.org/.  These will often
+   require the "cupsomatic" utility; this can be found in the
+   foomatic-bin package. Another case, some PPDs require the
+   "foomatic-rip" utility; this can be found in the
+   foomatic-filters package (this package will be installed when you
+   install foomatic-filters-ppds package).
+
+ - Default location of pid file is /var/run/cups/cupsd.pid.
+   If you'd like to change this, you can modify by using
+   "PidFile <filepath>" directive at your /etc/cups/cupsd.conf.
+
+ - Administration over the web interface is disabled by default since it
+   requires the CUPS daemon to be able to read /etc/shadow.  If you want to
+   enable web administration with shadow passwords (authentication type
+   'basic'), put the user cupsys into group shadow by
+
+       adduser cupsys shadow
+
+   as root.
+
+   Only users who are in group 'lpadmin' can administrate printers (using
+   gnome-cups-manager, lpadmin or any other frontend but the web
+   interface).  To allow printer administration to user joe, put him into
+   this group by executing
+
+       adduser joe lpadmin
+
+   (again as root).
+
+Enjoy!
+
+ -- Jeff Licquia <licquia@debian.org> and Kenshi Muto <kmuto@debian.org>
--- cupsys-1.2.1.orig/debian/cupsys.preinst
+++ cupsys-1.2.1/debian/cupsys.preinst
@@ -0,0 +1,86 @@
+#! /bin/sh
+# preinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if dpkg --compare-versions "$2" le 1.1.23-6; then
+	  [ -f /etc/cups/printers.conf ] && mv /etc/cups/printers.conf /etc/cups/printers.conf.save
+	  [ -f /etc/cups/classes.conf ] && mv /etc/cups/classes.conf /etc/cups/classes.conf.save
+	fi
+	if [ -e /var/lib/cups/conf -a ! -L /var/lib/cups/conf -a ! -e /etc/cups ]; then
+	    echo -n "Moving configuration files..."
+	    mkdir -p /etc/cups || true
+	    if [ `ls /var/lib/cups/conf | wc -l` -ne "     0" ]; then
+		cp -a /var/lib/cups/conf/* /etc/cups
+	    fi
+	    rm -rf /var/lib/cups/conf
+	    echo "done."
+	fi
+
+	if [ -e /var/lib/cups/ppd -a ! -L /var/lib/cups/ppd -a ! -e /etc/cups/ppd ]; then
+	    echo -n "Moving printer definition files..."
+	    mkdir -p /etc/cups/ppd || true
+	    if [ `ls /var/lib/cups/ppd | wc -l` -ne "     0" ]; then
+		cp -a /var/lib/cups/ppd/* /etc/cups/ppd
+	    fi
+	    rm -rf /var/lib/cups/ppd
+	    echo "done."
+	fi
+
+	if [ -e /var/lib/cups/logs -a ! -L /var/lib/cups/logs ]; then
+	    rmdir /var/lib/cups/logs || true
+	fi
+
+	# Remove dangling pdftops.conf symlink, which is obsolete anyway
+	if [ -L /etc/cups/pdftops.conf -a ! -e /etc/cups/pdftops.conf ]; then
+	    rm -f /etc/cups/pdftops.conf
+	fi
+
+	# Remove obsolete /etc/cups/certs
+	[ -L /etc/cups/certs ] && rm -f /etc/cups/certs || true
+
+	# Move cupsd-browsing.conf to new location and name
+	if dpkg --compare-versions "$2" le-nl '1.1.23-10ubuntu4'; then
+	    if [ -f /etc/cups/cupsd-browsing.conf ]; then
+		echo "Moving /etc/cups/cupsd-browsing.conf to new location /etc/cups/cups.d/browse.conf..."
+		mkdir -p /etc/cups/cups.d
+		mv /etc/cups/cupsd-browsing.conf /etc/cups/cups.d/browse.conf
+	    fi
+	fi
+
+	# Fix root-owned PPD files from upgrades
+	if dpkg --compare-versions "$2" le-nl '1.1.99.b1.r4929-0ubuntu2'; then
+	    find /etc/cups/ppd -type f -uid 0 -exec chown cupsys '{}' \; || true
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/libcupsys2-dev.preinst
+++ cupsys-1.2.1/debian/libcupsys2-dev.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh
+# preinst script for libcupsys2-dev
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if [ ! -L /usr/share/doc/libcupsys2-dev ]; then
+	    rm -rf /usr/share/doc/libcupsys2-dev
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/cupsys.examples
+++ cupsys-1.2.1/debian/cupsys.examples
@@ -0,0 +1 @@
+debian/filters
--- cupsys-1.2.1.orig/debian/cupsys.doc-base
+++ cupsys-1.2.1/debian/cupsys.doc-base
@@ -0,0 +1,10 @@
+Document: cupsys
+Title: CUPS Documentation
+Author: Easy Software Products
+Abstract: This documentation covers the use and administration of a CUPS 
+ printing system, and the programming interface for the libcups API.
+Section: Apps/System
+ 
+Format: HTML
+Index: /usr/share/doc/cupsys/online-docs/index.html
+Files: /usr/share/doc/cupsys/online-docs/*.html
--- cupsys-1.2.1.orig/debian/cupsys.default
+++ cupsys-1.2.1/debian/cupsys.default
@@ -0,0 +1 @@
+# Cups configure options
--- cupsys-1.2.1.orig/debian/libcupsys2-dev.files
+++ cupsys-1.2.1/debian/libcupsys2-dev.files
@@ -0,0 +1,15 @@
+usr/bin/cups-config
+usr/lib/libcups.so
+usr/include/cups/array.h
+usr/include/cups/cups.h
+usr/include/cups/dir.h
+usr/include/cups/file.h
+usr/include/cups/http.h
+usr/include/cups/ipp.h
+usr/include/cups/language.h
+usr/include/cups/md5.h
+usr/include/cups/ppd.h
+usr/include/cups/transcode.h
+usr/include/cups/adminutil.h
+usr/include/cups/i18n.h
+usr/share/man/man1/cups-config.1.gz
--- cupsys-1.2.1.orig/debian/cupsys.dirs
+++ cupsys-1.2.1/debian/cupsys.dirs
@@ -0,0 +1,10 @@
+var/run/cups
+usr/share/doc/cupsys
+etc/default
+etc/cups/cups.d
+etc/cups/ssl
+usr/lib/cups/backend-available
+var/cache/cups/ppd
+usr/share/ppd/cups-included
+usr/lib/cups/driver
+usr/share/ppd/custom
--- cupsys-1.2.1.orig/debian/cupsys.docs
+++ cupsys-1.2.1/debian/cupsys.docs
@@ -0,0 +1,4 @@
+CHANGES.txt
+CREDITS.txt
+README.txt
+debian/HOWTO_BUGREPORT.txt
--- cupsys-1.2.1.orig/debian/patches/54_cups-config_modeldir.dpatch
+++ cupsys-1.2.1/debian/patches/54_cups-config_modeldir.dpatch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 54_cups-config_modeldir.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4929~/cups-config.in cupsys-1.1.99.b1.r4929/cups-config.in
+--- cupsys-1.1.99.b1.r4929~/cups-config.in	2005-10-19 15:48:06.000000000 +0200
++++ cupsys-1.1.99.b1.r4929/cups-config.in	2006-04-07 16:04:46.000000000 +0200
+@@ -61,6 +61,7 @@
+     echo "       cups-config [--image] [--static] --libs"
+     echo "       cups-config --serverbin"
+     echo "       cups-config --serverroot"
++    echo "       cups-config --modeldir"
+     echo "       cups-config --version"
+ 
+     exit $1
+@@ -118,6 +119,8 @@
+ 	--static)
+ 	    static=yes
+ 	    ;;
++        --modeldir
++	    echo /usr/share/ppd
+ 	--version)
+ 	    echo $VERSION
+ 	    ;;
--- cupsys-1.2.1.orig/debian/patches/02_configure.dpatch
+++ cupsys-1.2.1/debian/patches/02_configure.dpatch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
+--- cupsys-1.2.1~/configure	2006-05-22 20:01:55.000000000 +0000
++++ cupsys-1.2.1/configure	2006-05-28 13:11:46.000000000 +0000
+@@ -7856,11 +7856,11 @@
+                 IRIX | Linux | GNU)
+                         # IRIX, Linux, and HURD...
+ 			if test $exec_prefix != /usr; then
+-				DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
+-				DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
+-				DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
+-				LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
+-				EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
++				DSOFLAGS="$DSOFLAGS"
++				DSO32FLAGS="$DSO32FLAGS"
++				DSO64FLAGS="$DSO64FLAGS"
++				LDFLAGS="$LDFLAGS"
++				EXPORT_LDFLAGS=""
+ 			fi
+ 			;;
+ 	esac
--- cupsys-1.2.1.orig/debian/patches/11_pam.dpatch
+++ cupsys-1.2.1/debian/patches/11_pam.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_pam.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/scheduler/auth.c cupsys-1.1.99.b1.r4748/scheduler/auth.c
+--- cupsys-1.1.99.b1.r4748~/scheduler/auth.c	2005-11-04 13:35:45.087637554 +0000
++++ cupsys-1.1.99.b1.r4748/scheduler/auth.c	2005-11-04 13:36:32.953633141 +0000
+@@ -478,7 +478,7 @@
+ 	    auth_data = &data;
+ #  endif /* __hpux */
+ 
+-	    pamerr = pam_start("cups", username, &pamdata, &pamh);
++	    pamerr = pam_start("cupsys", username, &pamdata, &pamh);
+ 	    if (pamerr != PAM_SUCCESS)
+ 	    {
+ 	      cupsdLogMessage(CUPSD_LOG_ERROR,
--- cupsys-1.2.1.orig/debian/patches/53_usr_share_ppd_support.dpatch
+++ cupsys-1.2.1/debian/patches/53_usr_share_ppd_support.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_usr_share_ppd_support.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4929~/scheduler/cups-driverd.c cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c
+--- cupsys-1.1.99.b1.r4929~/scheduler/cups-driverd.c	2005-10-25 20:23:10.000000000 +0200
++++ cupsys-1.1.99.b1.r4929/scheduler/cups-driverd.c	2006-04-07 15:43:44.000000000 +0200
+@@ -289,10 +289,7 @@
+     * Try opening the file...
+     */
+ 
+-    if ((datadir = getenv("CUPS_DATADIR")) == NULL)
+-      datadir = CUPS_DATADIR;
+-
+-    snprintf(line, sizeof(line), "%s/model/%s", datadir, name);
++    snprintf(line, sizeof(line), "/usr/share/ppd/%s", datadir, name);
+     if ((fp = cupsFileOpen(line, "r")) == NULL)
+     {
+       fprintf(stderr, "ERROR: [cups-driverd] Unable to open \"%s\" - %s\n",
+@@ -443,11 +440,7 @@
+ 
+   SortedPPDs = NumPPDs;
+ 
+-  if ((cups_datadir = getenv("CUPS_DATADIR")) == NULL)
+-    cups_datadir = CUPS_DATADIR;
+-
+-  snprintf(model, sizeof(model), "%s/model", cups_datadir);
+-  load_ppds(model, "");
++  load_ppds("/usr/share/ppd", "");
+ 
+  /*
+   * Cull PPD files that are no longer present...
--- cupsys-1.2.1.orig/debian/patches/08_cupsd.conf.conf.d.dpatch
+++ cupsys-1.2.1/debian/patches/08_cupsd.conf.conf.d.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_cupsd.conf.conf.d.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cups-1.2-ubuntu~/conf/cupsd.conf.in cups-1.2-ubuntu/conf/cupsd.conf.in
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-04-24 19:25:39.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-04-25 10:50:24.000000000 +0200
+@@ -14,13 +14,18 @@
+ SystemGroup @CUPS_SYSTEM_GROUPS@
+ 
+ # Only listen for connections from the local machine.
+-Listen localhost:@DEFAULT_IPP_PORT@
+-@CUPS_LISTEN_DOMAINSOCKET@
++# These settings are configured in /etc/cups/cups.d/ports.conf so that
++# changing them does not require to change this file.
++# Listen localhost:@DEFAULT_IPP_PORT@
++# @CUPS_LISTEN_DOMAINSOCKET@
+ 
+ # Show shared printers on the local network.
+-Browsing On
++# The 'Browsing' setting is configured in /etc/cups/cups.d/browse.conf
++# so that changing it does not require to change this file.
++# Browsing Off
+ BrowseOrder allow,deny
+ BrowseAllow @LOCAL
++BrowseAddress @LOCAL
+ 
+ # Default authentication type, when authentication is required...
+ DefaultAuthType Basic
+@@ -71,6 +76,10 @@
+   </Limit>
+ </Policy>
+ 
++# Include files in /etc/cups/conf.d
++Include /etc/cups/cups.d/ports.conf
++Include /etc/cups/cups.d/browse.conf
++
+ #
+ # End of "$Id: cupsd.conf.in 5114 2006-02-16 12:28:29Z mike $".
+ #
--- cupsys-1.2.1.orig/debian/patches/56_dirsvc.dpatch
+++ cupsys-1.2.1/debian/patches/56_dirsvc.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56_dirsvc.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.2.1~/scheduler/dirsvc.c cupsys-1.2.1/scheduler/dirsvc.c
+--- cupsys-1.2.1~/scheduler/dirsvc.c	2006-06-11 11:41:06.000000000 +0000
++++ cupsys-1.2.1/scheduler/dirsvc.c	2006-06-11 11:50:51.000000000 +0000
+@@ -2521,7 +2521,7 @@
+ 
+ 	  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+ 	                   iface->hostname, iface->port,
+-			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s%s" :
++			   (p->type & CUPS_PRINTER_CLASS) ? "/classes/%s" :
+ 			                                    "/printers/%s",
+ 			   p->name);
+ 	  snprintf(packet, sizeof(packet), "%x %x %s \"%s\" \"%s\" \"%s\" %s\n",
--- cupsys-1.2.1.orig/debian/patches/ubuntu-nowebadmin.dpatch
+++ cupsys-1.2.1/debian/patches/ubuntu-nowebadmin.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu-nowebadmin.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4892~/doc/index.html.in cupsys-1.1.99.b1.r4892/doc/index.html.in
+--- cupsys-1.1.99.b1.r4892~/doc/index.html.in	2005-12-10 22:20:14.000000000 +0100
++++ cupsys-1.1.99.b1.r4892/doc/index.html.in	2006-01-13 15:23:18.000000000 +0100
+@@ -73,8 +73,10 @@
+ <A HREF="/admin"><IMG SRC="/images/manage-server.gif" CLASS="button" ALT="Manage Server"></A>
+ </P>
+ 
+-<P><I>If you are asked for a username and password, enter your login
+-username and password or the "root" username and password.</I></P>
++<P><I>Administrative commands are disabled in the web interface for security
++reasons. Please use the GNOME CUPS manager (System &gt; Administration &gt;
++Printing). <code>/usr/share/doc/cupsys/README.Debian.gz</code>
++describes the details and how to reenable it again.</I></P>
+ 
+ <H2 CLASS="title">About CUPS</H2>
+ 
--- cupsys-1.2.1.orig/debian/patches/00_r5643.dpatch
+++ cupsys-1.2.1/debian/patches/00_r5643.dpatch
@@ -0,0 +1,4295 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_r5643.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.2.1~/CHANGES.txt cupsys-1.2.1/CHANGES.txt
+--- cupsys-1.2.1~/CHANGES.txt	2006-05-22 18:47:09.000000000 +0000
++++ cupsys-1.2.1/CHANGES.txt	2006-07-06 16:47:45.000000000 +0000
+@@ -1,6 +1,61 @@
+-CHANGES.txt - 2006-05-22
++CHANGES.txt - 2006-06-07
+ ------------------------
+ 
++CHANGES IN CUPS V1.2.2
++
++	- Some configure --with options did not work (STR #1746)
++	- "Allow @IF(name)" didn't work if "name" wasn't the
++	  first network interface (STR #1758)
++	- The lpstat command did not use the correct character
++	  set when reporting the date and time (STR #1751)
++	- The cupsaddsmb command and web interface did not update
++	  the Windows PPD files properly, resulting in corrupt
++	  PPD files for the Windows client to use (STR #1750)
++	- The cupsd.conf man page didn't describe the Listen
++	  domain socket syntax (STR #1753)
++	- The scheduler no longer tries to support more than
++	  FD_SETSIZE file descriptors.
++	- CDSA (encryption) support fixes for MacOS X.
++	- The lppasswd program needs to be setuid to root to
++	  create and update the /etc/cups/passwd.md5 file (STR
++	  #1735)
++	- 32/64-bit library installation was broken (STR #1741)
++	- The USB backend now reports a "no such device" error
++	  when using the old filename-based USB URIs instead of
++	  the "success" error.
++	- Increased the HTTP and IPP read timeouts to 10 seconds,
++	  as 1 second was too short on congested networks (STR
++	  #1719)
++	- The SNMP backend now uses the device description over
++	  the printer-make-and-model attribute when the attribute
++	  contains a generic name (STR #1728)
++	- Fixed another file descriptor leak when printing raw
++	  files (STR #1736)
++	- Raw queues were not shared via LDAP (STR #1739)
++	- The pstops filter didn't always embed PageSetup
++	  commands from the PPD file (STR #1740)
++	- "make install" didn't work if you disabled all of the
++	  localizations.
++	- The scheduler didn't always choose the least costly
++	  filter.
++	- Fixed parsing of IPv6 addresses in Allow, Deny,
++	  BrowseAllow, BrowseDeny, and BrowseRelay directives
++	  (STR #1713)
++	- Printers that were shared via LDAP did not get added to
++	  the LDAP server properly (STR #1733)
++	- LDAP browsing would crash the scheduler if a required
++	  value was missing (STR #1731)
++	- Special cases for the "localhost" hostname did not
++	  work, causing printing to not work when the /etc/hosts
++	  file did not contain a localhost entry (STR #1723)
++	- Updated the Spanish translation (STR #1720)
++	- Reverse-order page output was broken when N-up or
++	  landscape orientations were used (STR #1725)
++	- The parallel, serial, socket, and USB backends needed
++	  print data before they would report back-channel data,
++	  causing problems with several new drivers (STR #1724)
++
++
+ CHANGES IN CUPS V1.2.1
+ 
+ 	- The web interface did not handle reloads properly for
+diff -urNad cupsys-1.2.1~/Makedefs.in cupsys-1.2.1/Makedefs.in
+--- cupsys-1.2.1~/Makedefs.in	2006-05-22 00:59:11.000000000 +0000
++++ cupsys-1.2.1/Makedefs.in	2006-07-06 16:47:45.000000000 +0000
+@@ -77,7 +77,9 @@
+ # Languages to install...
+ #
+ 
+-LANGUAGES	=	@LANGUAGES@
++LANGUAGES	=	es ja pl sv
++INSTALL_LANGUAGES =	install-languages
++UNINSTALL_LANGUAGES =	uninstall-languages
+ 
+ #
+ # Libraries...
+@@ -127,9 +129,9 @@
+ CXXLIBS		=	@CXXLIBS@
+ DSOFLAGS	=	@DSOFLAGS@
+ DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
+-IMGLIBS		=	@IMGLIBS@ -lm
++IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+-LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
++LDFLAGS		=	-L../cups -L../filter $(ARCHFLAGS) \
+ 			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
+ LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+diff -urNad cupsys-1.2.1~/backend/Dependencies cupsys-1.2.1/backend/Dependencies
+--- cupsys-1.2.1~/backend/Dependencies	2006-04-18 20:45:30.000000000 +0000
++++ cupsys-1.2.1/backend/Dependencies	2006-07-06 16:47:45.000000000 +0000
+@@ -9,26 +9,31 @@
+ lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+ lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+ lpd.o: ../cups/string.h
+-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
+-parallel.o: ../cups/debug.h
++pap.o: ../cups/http.h ../cups/md5.h
++parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
++parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
++parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
++parallel.o: ../cups/string.h ../config.h
+ scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+ scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ scsi.o: ../cups/language.h ../cups/string.h ../config.h
+-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+-serial.o: ../cups/language.h ../cups/string.h ../config.h
+-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
+-snmp.o: ../cups/debug.h
+-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
+-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
+-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+-socket.o: ../cups/string.h
+-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
++serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
++serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
++serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
++serial.o: ../config.h
++snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
++snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
++snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
++snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
++snmp.o: ../cups/array.h ../cups/file.h
++socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
++socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
++socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
++socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
++test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
++test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
++test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
++test1284.o: ../cups/language.h ../cups/debug.h
+ usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+ usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ usb.o: ../cups/language.h ../cups/string.h ../config.h
+diff -urNad cupsys-1.2.1~/backend/Makefile cupsys-1.2.1/backend/Makefile
+--- cupsys-1.2.1~/backend/Makefile	2006-04-27 13:58:43.000000000 +0000
++++ cupsys-1.2.1/backend/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -28,7 +28,8 @@
+ 
+ RBACKENDS =	ipp lpd
+ UBACKENDS =	$(PAP) parallel scsi serial snmp socket usb
+-TARGETS	=	betest test1284 $(RBACKENDS) $(UBACKENDS)
++TARGETS	=	betest test1284 libbackend.a $(RBACKENDS) $(UBACKENDS)
++LIBOBJS	=	ieee1284.o runloop.o
+ OBJS	=	betest.o ipp.o lpd.o pap.o parallel.o scsi.o \
+ 		serial.o snmp.o socket.o test1284.o usb.o
+ 
+@@ -105,6 +106,17 @@
+ 
+ 
+ #
++# libbackend.a
++#
++
++libbackend.a:	$(LIBOBJS)
++	echo Archiving $@...
++	$(RM) $@
++	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
++	$(RANLIB) $@
++
++
++#
+ # ieee1394
+ #
+ 
+@@ -149,9 +161,9 @@
+ # parallel
+ #
+ 
+-parallel:	parallel.o ../cups/$(LIBCUPS)
++parallel:	parallel.o ../cups/$(LIBCUPS) libbackend.a
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)
++	$(CC) $(LDFLAGS) -o parallel parallel.o libbackend.a $(LIBS)
+ 
+ 
+ #
+@@ -169,37 +181,37 @@
+ # serial
+ #
+ 
+-serial:	serial.o ../cups/$(LIBCUPS)
++serial:	serial.o ../cups/$(LIBCUPS) libbackend.a
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o serial serial.o $(BACKLIBS) $(LIBS)
++	$(CC) $(LDFLAGS) -o serial serial.o libbackend.a $(BACKLIBS) $(LIBS)
+ 
+ 
+ #
+ # snmp
+ #
+ 
+-snmp:	snmp.o ../cups/$(LIBCUPS)
++snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o snmp snmp.o $(LIBS)
++	$(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+ 
+ 
+ #
+ # socket
+ #
+ 
+-socket:	socket.o ../cups/$(LIBCUPS)
++socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o socket socket.o $(LIBS)
++	$(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+ 
+ 
+ #
+ # usb
+ #
+ 
+-usb:	usb.o ../cups/$(LIBCUPS)
++usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o usb usb.o $(BACKLIBS) $(LIBS)
+-usb.o:	usb.c usb-darwin.c usb-unix.c ieee1284.c
++	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(BACKLIBS) $(LIBS)
++usb.o:	usb.c usb-darwin.c usb-unix.c
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/backend/backend-private.h cupsys-1.2.1/backend/backend-private.h
+--- cupsys-1.2.1~/backend/backend-private.h	1970-01-01 00:00:00.000000000 +0000
++++ cupsys-1.2.1/backend/backend-private.h	2006-07-06 16:47:45.000000000 +0000
+@@ -0,0 +1,73 @@
++/*
++ * "$Id$"
++ *
++ *   Backend support definitions for the Common UNIX Printing System (CUPS).
++ *
++ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
++ *
++ *   These coded instructions, statements, and computer programs are the
++ *   property of Easy Software Products and are protected by Federal
++ *   copyright law.  Distribution and use rights are outlined in the file
++ *   "LICENSE" which should have been included with this file.  If this
++ *   file is missing or damaged please contact Easy Software Products
++ *   at:
++ *
++ *       Attn: CUPS Licensing Information
++ *       Easy Software Products
++ *       44141 Airport View Drive, Suite 204
++ *       Hollywood, Maryland 20636 USA
++ *
++ *       Voice: (301) 373-9600
++ *       EMail: cups-info@cups.org
++ *         WWW: http://www.cups.org
++ *
++ *   This file is subject to the Apple OS-Developed Software exception.
++ */
++
++#ifndef _CUPS_BACKEND_PRIVATE_H_
++#  define _CUPS_BACKEND_PRIVATE_H_
++
++
++/*
++ * Include necessary headers.
++ */
++
++#  include <cups/backend.h>
++#  include <cups/cups.h>
++#  include <cups/debug.h>
++#  include <stdlib.h>
++#  include <errno.h>
++#  include <cups/string.h>
++#  include <signal.h>
++
++
++/*
++ * C++ magic...
++ */
++
++#  ifdef _cplusplus
++extern "C" {
++#  endif /* _cplusplus */
++
++
++/*
++ * Prototypes...
++ */
++
++extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
++		                   char *make_model, int make_model_size,
++				   const char *scheme, char *uri, int uri_size);
++extern int	backendGetMakeModel(const char *device_id, char *make_model,
++			            int make_model_size);
++extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
++
++
++#  ifdef _cplusplus
++}
++#  endif /* _cplusplus */
++#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
++
++
++/*
++ * End of "$Id$".
++ */
+diff -urNad cupsys-1.2.1~/backend/ieee1284.c cupsys-1.2.1/backend/ieee1284.c
+--- cupsys-1.2.1~/backend/ieee1284.c	2006-04-19 21:36:43.000000000 +0000
++++ cupsys-1.2.1/backend/ieee1284.c	2006-07-06 16:47:45.000000000 +0000
+@@ -25,51 +25,41 @@
+  *
+  * Contents:
+  *
+- *   get_device_id()  - Get the IEEE-1284 device ID string and corresponding
+- *                      URI.
+- *   get_make_model() - Get the make and model string from the device ID.
++ *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
++ *                           corresponding URI.
++ *   backendGetMakeModel() - Get the make and model string from the device ID.
+  */
+ 
+ /*
+  * Include necessary headers.
+  */
+ 
+-#include <cups/debug.h>
+-
++#include "backend-private.h"
+ 
+-/*
+- * Prototypes...
+- */
++#ifdef __linux
++#  include <sys/ioctl.h>
++#  include <linux/lp.h>
++#  define IOCNR_GET_DEVICE_ID		1
++#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
++#endif /* __linux */
+ 
+-static int	get_make_model(const char *device_id, char *make_model,
+-		               int make_model_size);
++#ifdef __sun
++#  ifdef __sparc
++#    include <sys/ecppio.h>
++#  else
++#    include <sys/ioccom.h>
++#    include <sys/ecppsys.h>
++#  endif /* __sparc */
++#endif /* __sun */
+ 
+ 
+ /*
+- * 'get_device_id()' - Get the IEEE-1284 device ID string and
+- *                     corresponding URI.
++ * 'backendGetDeviceID()' - Get the IEEE-1284 device ID string and
++ *                          corresponding URI.
+  */
+ 
+-#ifndef SNMP_BACKEND
+-#  ifdef __linux
+-#    include <sys/ioctl.h>
+-#    include <linux/lp.h>
+-#    define IOCNR_GET_DEVICE_ID		1
+-#    define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
+-#  endif /* __linux */
+-
+-#  ifdef __sun
+-#    ifdef __sparc
+-#      include <sys/ecppio.h>
+-#    else
+-#      include <sys/ioccom.h>
+-#      include <sys/ecppsys.h>
+-#    endif /* __sparc */
+-#  endif /* __sun */
+-
+-
+ int					/* O - 0 on success, -1 on failure */
+-get_device_id(
++backendGetDeviceID(
+     int        fd,			/* I - File descriptor */
+     char       *device_id,		/* O - 1284 device ID */
+     int        device_id_size,		/* I - Size of buffer */
+@@ -93,7 +83,7 @@
+ #endif /* __sun && ECPPIOC_GETDEVID */
+ 
+ 
+-  DEBUG_printf(("get_device_id(fd=%d, device_id=%p, device_id_size=%d, "
++  DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, "
+                 "make_model=%p, make_model_size=%d, scheme=\"%s\", "
+ 		"uri=%p, uri_size=%d)\n", fd, device_id, device_id_size,
+ 		make_model, make_model_size, scheme ? scheme : "(null)",
+@@ -107,7 +97,7 @@
+       !device_id || device_id_size < 32 ||
+       !make_model || make_model_size < 32)
+   {
+-    DEBUG_puts("get_device_id: Bad args!");
++    DEBUG_puts("backendGetDeviceID: Bad args!");
+     return (-1);
+   }
+ 
+@@ -155,7 +145,7 @@
+   }
+ #  ifdef DEBUG
+   else
+-    printf("get_device_id: ioctl failed - %s\n", strerror(errno));
++    printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
+ #  endif /* DEBUG */
+ #endif /* __linux */
+ 
+@@ -178,11 +168,11 @@
+   }
+ #  ifdef DEBUG
+   else
+-    printf("get_device_id: ioctl failed - %s\n", strerror(errno));
++    printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
+ #  endif /* DEBUG */
+ #endif /* __sun && ECPPIOC_GETDEVID */
+ 
+-  DEBUG_printf(("get_device_id: device_id=\"%s\"\n", device_id));
++  DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));
+ 
+   if (!*device_id)
+     return (-1);
+@@ -191,7 +181,7 @@
+   * Get the make and model...
+   */
+ 
+-  get_make_model(device_id, make_model, make_model_size);
++  backendGetMakeModel(device_id, make_model, make_model_size);
+ 
+  /*
+   * Then generate a device URI...
+@@ -303,15 +293,14 @@
+ 
+   return (0);
+ }
+-#endif /* !SNMP_BACKEND */
+ 
+ 
+ /*
+- * 'get_make_model()' - Get the make and model string from the device ID.
++ * 'backendGetMakeModel()' - Get the make and model string from the device ID.
+  */
+ 
+ int					/* O - 0 on success, -1 on failure */
+-get_make_model(
++backendGetMakeModel(
+     const char *device_id,		/* O - 1284 device ID */
+     char       *make_model,		/* O - Make/model */
+     int        make_model_size)		/* I - Size of buffer */
+@@ -322,7 +311,7 @@
+ 	*mdl;				/* Model string */
+ 
+ 
+-  DEBUG_printf(("get_make_model(device_id=\"%s\", "
++  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
+                 "make_model=%p, make_model_size=%d)\n", device_id,
+ 		make_model, make_model_size));
+ 
+@@ -332,7 +321,7 @@
+ 
+   if (!device_id || !*device_id || !make_model || make_model_size < 32)
+   {
+-    DEBUG_puts("get_make_model: Bad args!");
++    DEBUG_puts("backendGetMakeModel: Bad args!");
+     return (-1);
+   }
+ 
+diff -urNad cupsys-1.2.1~/backend/parallel.c cupsys-1.2.1/backend/parallel.c
+--- cupsys-1.2.1~/backend/parallel.c	2006-04-10 02:51:12.000000000 +0000
++++ cupsys-1.2.1/backend/parallel.c	2006-07-06 16:47:45.000000000 +0000
+@@ -33,14 +33,7 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/backend.h>
+-#include <cups/cups.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <errno.h>
+-#include <cups/string.h>
+-#include <signal.h>
+-#include "ieee1284.c"
++#include "backend-private.h"
+ 
+ #ifdef __hpux
+ #  include <sys/time.h>
+@@ -94,25 +87,18 @@
+ 		resource[1024],		/* Resource info (device and options) */
+ 		*options;		/* Pointer to options */
+   int		port;			/* Port number (not used) */
+-  int		fp;			/* Print file */
++  int		print_fd,		/* Print file */
++		device_fd;		/* Parallel device */
+   int		copies;			/* Number of copies to print */
+-  int		fd;			/* Parallel device */
+-  int		rbytes;			/* Number of bytes read */
+-  int		wbytes;			/* Number of bytes written */
+-  size_t	nbytes,			/* Number of bytes read */
+-		tbytes;			/* Total number of bytes written */
+-  char		buffer[8192],		/* Output buffer */
+-		*bufptr;		/* Pointer into buffer */
++  size_t	tbytes;			/* Total number of bytes written */
+   struct termios opts;			/* Parallel port options */
+-  fd_set	input,			/* Input set for select() */
+-		output;			/* Output set for select() */
++#if defined(__linux) && defined(LP_POUTPA)
++  unsigned int	status;			/* Port status (off-line, out-of-paper, etc.) */
+   int		paperout;		/* Paper out? */
++#endif /* __linux && LP_POUTPA */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;		/* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+-#ifdef __linux
+-  unsigned int	status;			/* Port status (off-line, out-of-paper, etc.) */
+-#endif /* __linux */
+ 
+ 
+  /*
+@@ -157,8 +143,8 @@
+ 
+   if (argc == 6)
+   {
+-    fp     = 0;
+-    copies = 1;
++    print_fd = 0;
++    copies   = 1;
+   }
+   else
+   {
+@@ -166,7 +152,7 @@
+     * Try to open the print file...
+     */
+ 
+-    if ((fp = open(argv[6], O_RDONLY)) < 0)
++    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
+     {
+       perror("ERROR: unable to open print file");
+       return (CUPS_BACKEND_FAILED);
+@@ -206,7 +192,7 @@
+ 
+   do
+   {
+-    if ((fd = open(resource, O_WRONLY | O_EXCL)) == -1)
++    if ((device_fd = open(resource, O_WRONLY | O_EXCL)) == -1)
+     {
+       if (getenv("CLASS") != NULL)
+       {
+@@ -217,8 +203,8 @@
+ 	* available printer in the class.
+ 	*/
+ 
+-        fputs("INFO: Unable to open parallel port, queuing on next printer in class...\n",
+-	      stderr);
++        fputs("INFO: Unable to open parallel port, queuing on next printer "
++	      "in class...\n", stderr);
+ 
+        /*
+         * Sleep 5 seconds to keep the job from requeuing too rapidly...
+@@ -231,23 +217,26 @@
+ 
+       if (errno == EBUSY)
+       {
+-        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr);
++        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n",
++	      stderr);
+ 	sleep(30);
+       }
+       else if (errno == ENXIO || errno == EIO || errno == ENOENT)
+       {
+-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
++        fputs("INFO: Printer not connected; will retry in 30 seconds...\n",
++	      stderr);
+ 	sleep(30);
+       }
+       else
+       {
+-	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
++	fprintf(stderr,
++	        "ERROR: Unable to open parallel port device file \"%s\": %s\n",
+ 	        resource, strerror(errno));
+ 	return (CUPS_BACKEND_FAILED);
+       }
+     }
+   }
+-  while (fd < 0);
++  while (device_fd < 0);
+ 
+   fputs("STATE: -connecting-to-device\n", stderr);
+ 
+@@ -255,25 +244,21 @@
+   * Set any options provided...
+   */
+ 
+-  tcgetattr(fd, &opts);
++  tcgetattr(device_fd, &opts);
+ 
+   opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+ 
+   /**** No options supported yet ****/
+ 
+-  tcsetattr(fd, TCSANOW, &opts);
+-
+- /*
+-  * Check printer status...
+-  */
+-
+-  paperout = 0;
++  tcsetattr(device_fd, TCSANOW, &opts);
+ 
+ #if defined(__linux) && defined(LP_POUTPA)
+  /*
+   * Show the printer status before we send the file...
+   */
+ 
++  paperout = 0;
++
+   while (!ioctl(fd, LPGETSTATUS, &status))
+   {
+     fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
+@@ -298,146 +283,38 @@
+ #endif /* __linux && LP_POUTPA */
+ 
+  /*
+-  * Now that we are "connected" to the port, ignore SIGTERM so that we
+-  * can finish out any page data the driver sends (e.g. to eject the
+-  * current page...  Only ignore SIGTERM if we are printing data from
+-  * stdin (otherwise you can't cancel raw jobs...)
+-  */
+-
+-  if (argc < 7)
+-  {
+-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+-    sigset(SIGTERM, SIG_IGN);
+-#elif defined(HAVE_SIGACTION)
+-    memset(&action, 0, sizeof(action));
+-
+-    sigemptyset(&action.sa_mask);
+-    action.sa_handler = SIG_IGN;
+-    sigaction(SIGTERM, &action, NULL);
+-#else
+-    signal(SIGTERM, SIG_IGN);
+-#endif /* HAVE_SIGSET */
+-  }
+-
+- /*
+   * Finally, send the print file...
+   */
+ 
+-  wbytes = 0;
++  tbytes = 0;
+ 
+-  while (copies > 0)
++  while (copies > 0 && tbytes >= 0)
+   {
+     copies --;
+ 
+-    if (fp != 0)
++    if (print_fd != 0)
+     {
+       fputs("PAGE: 1 1\n", stderr);
+-      lseek(fp, 0, SEEK_SET);
++      lseek(print_fd, 0, SEEK_SET);
+     }
+ 
+-    tbytes = 0;
+-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+-    {
+-     /*
+-      * Write the print data to the printer...
+-      */
+-
+-      tbytes += nbytes;
+-      bufptr = buffer;
+-
+-      while (nbytes > 0)
+-      {
+-       /*
+-        * See if we are ready to read or write...
+-	*/
+-
+-        do
+-	{
+-          FD_ZERO(&input);
+-	  FD_SET(fd, &input);
+-	  FD_ZERO(&output);
+-	  FD_SET(fd, &output);
+-        }
+-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
+-
+-        if (FD_ISSET(fd, &input))
+-	{
+-	 /*
+-	  * Read backchannel data...
+-	  */
+-
+-	  if ((rbytes = read(fd, resource, sizeof(resource))) > 0)
+-	  {
+-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+-	            rbytes);
+-            cupsBackChannelWrite(resource, rbytes, 1.0);
+-          }
+-	}
+-
+-        if (FD_ISSET(fd, &output))
+-	{
+-	 /*
+-	  * Write print data...
+-	  */
+-
+-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+-	    if (errno == ENOTTY)
+-	      wbytes = write(fd, bufptr, nbytes);
+-
+-	  if (wbytes < 0)
+-	  {
+-	   /*
+-	    * Check for retryable errors...
+-	    */
+-
+-            if (errno == ENOSPC)
+-	    {
+-	      paperout = 1;
+-	      fputs("ERROR: Out of paper!\n", stderr);
+-	      fputs("STATUS: +media-tray-empty-error\n", stderr);
+-	    }
+-	    else if (errno != EAGAIN && errno != EINTR)
+-	    {
+-	      perror("ERROR: Unable to send print file to printer");
+-	      break;
+-	    }
+-	  }
+-	  else
+-	  {
+-	   /*
+-	    * Update count and pointer...
+-	    */
+-
+-            if (paperout)
+-	    {
+-	      fputs("STATUS: -media-tray-empty-error\n", stderr);
+-	      paperout = 0;
+-	    }
+-
+-	    nbytes -= wbytes;
+-	    bufptr += wbytes;
+-	  }
+-	}
+-      }
+-
+-      if (wbytes < 0)
+-        break;
++    tbytes = backendRunLoop(print_fd, device_fd, 1);
+ 
+-      if (argc > 6)
+-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
+-	        (unsigned long)tbytes);
+-    }
++    if (print_fd != 0 && tbytes >= 0)
++      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
++	      CUPS_LLCAST tbytes);
+   }
+ 
+  /*
+   * Close the socket connection and input file and return...
+   */
+ 
+-  close(fd);
+-  if (fp != 0)
+-    close(fp);
++  close(device_fd);
+ 
+-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
++  if (print_fd != 0)
++    close(print_fd);
++
++  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ }
+ 
+ 
+@@ -485,9 +362,9 @@
+       * Now grab the IEEE 1284 device ID string...
+       */
+ 
+-      if (!get_device_id(fd, device_id, sizeof(device_id),
+-                         make_model, sizeof(make_model),
+-			 NULL, NULL, 0))
++      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
++                              make_model, sizeof(make_model),
++			      NULL, NULL, 0))
+ 	printf("direct parallel:%s \"%s\" \"%s LPT #%d\" \"%s\"\n", device,
+ 	       make_model, make_model, i + 1, device_id);
+       else
+diff -urNad cupsys-1.2.1~/backend/runloop.c cupsys-1.2.1/backend/runloop.c
+--- cupsys-1.2.1~/backend/runloop.c	1970-01-01 00:00:00.000000000 +0000
++++ cupsys-1.2.1/backend/runloop.c	2006-07-06 16:47:45.000000000 +0000
+@@ -0,0 +1,218 @@
++/*
++ * "$Id$"
++ *
++ *   Common run loop API for the Common UNIX Printing System (CUPS).
++ *
++ *   Copyright 2006 by Easy Software Products, all rights reserved.
++ *
++ *   These coded instructions, statements, and computer programs are the
++ *   property of Easy Software Products and are protected by Federal
++ *   copyright law.  Distribution and use rights are outlined in the file
++ *   "LICENSE" which should have been included with this file.  If this
++ *   file is missing or damaged please contact Easy Software Products
++ *   at:
++ *
++ *       Attn: CUPS Licensing Information
++ *       Easy Software Products
++ *       44141 Airport View Drive, Suite 204
++ *       Hollywood, Maryland 20636 USA
++ *
++ *       Voice: (301) 373-9600
++ *       EMail: cups-info@cups.org
++ *         WWW: http://www.cups.org
++ *
++ *   This file is subject to the Apple OS-Developed Software exception.
++ *
++ * Contents:
++ *
++ *   backendRunLoop() - Read and write print and back-channel data.
++ */
++
++/*
++ * Include necessary headers.
++ */
++
++#include "backend-private.h"
++#include <sys/select.h>
++
++
++/*
++ * 'backendRunLoop()' - Read and write print and back-channel data.
++ */
++
++ssize_t					/* O - Total bytes on success, -1 on error */
++backendRunLoop(int print_fd,		/* I - Print file descriptor */
++               int device_fd,		/* I - Device file descriptor */
++	       int use_bc)		/* I - Use back-channel? */
++{
++  int		nfds;			/* Maximum file descriptor value + 1 */
++  fd_set	input,			/* Input set for reading */
++		output;			/* Output set for writing */
++  ssize_t	print_bytes,		/* Print bytes read */
++		bc_bytes,		/* Backchannel bytes read */
++		total_bytes,		/* Total bytes written */
++		bytes;			/* Bytes written */
++  int		paperout;		/* "Paper out" status */
++  char		print_buffer[8192],	/* Print data buffer */
++		*print_ptr,		/* Pointer into print data buffer */
++		bc_buffer[1024];	/* Back-channel data buffer */
++#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
++  struct sigaction action;		/* Actions for POSIX signals */
++#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
++
++
++ /*
++  * If we are printing data from a print driver on stdin, ignore SIGTERM
++  * so that the driver can finish out any page data, e.g. to eject the
++  * current page.  We only do this for stdin printing as otherwise there
++  * is no way to cancel a raw print job...
++  */
++
++  if (!print_fd)
++  {
++#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
++    sigset(SIGTERM, SIG_IGN);
++#elif defined(HAVE_SIGACTION)
++    memset(&action, 0, sizeof(action));
++
++    sigemptyset(&action.sa_mask);
++    action.sa_handler = SIG_IGN;
++    sigaction(SIGTERM, &action, NULL);
++#else
++    signal(SIGTERM, SIG_IGN);
++#endif /* HAVE_SIGSET */
++  }
++
++ /*
++  * Figure out the maximum file descriptor value to use with select()...
++  */
++
++  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
++
++ /*
++  * Now loop until we are out of data from print_fd...
++  */
++
++  for (print_bytes = 0, print_ptr = print_buffer, paperout = 0, total_bytes = 0;;)
++  {
++   /*
++    * Use select() to determine whether we have data to copy around...
++    */
++
++    FD_ZERO(&input);
++    if (!print_bytes)
++      FD_SET(print_fd, &input);
++    if (use_bc)
++      FD_SET(device_fd, &input);
++
++    FD_ZERO(&output);
++    if (print_bytes)
++      FD_SET(device_fd, &output);
++
++    if (select(nfds, &input, &output, NULL, NULL) < 0)
++      continue;				/* Ignore errors here */
++
++   /*
++    * Check if we have back-channel data ready...
++    */
++
++    if (FD_ISSET(device_fd, &input))
++    {
++      if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0)
++      {
++	fprintf(stderr,
++	        "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n",
++	        CUPS_LLCAST bc_bytes);
++        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
++      }
++    }
++
++   /*
++    * Check if we have print data ready...
++    */
++
++    if (FD_ISSET(print_fd, &input))
++    {
++      if ((print_bytes = read(print_fd, print_buffer,
++                              sizeof(print_buffer))) < 0)
++      {
++       /*
++        * Read error - bail if we don't see EAGAIN or EINTR...
++	*/
++
++	if (errno != EAGAIN || errno != EINTR)
++	{
++	  perror("ERROR: Unable to read print data");
++	  return (-1);
++	}
++
++        print_bytes = 0;
++      }
++      else if (print_bytes == 0)
++      {
++       /*
++        * End of file, break out of the loop...
++	*/
++
++        break;
++      }
++
++      print_ptr = print_buffer;
++    }
++
++   /*
++    * Check if the device is ready to receive data and we have data to
++    * send...
++    */
++
++    if (print_bytes && FD_ISSET(device_fd, &output))
++    {
++      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
++      {
++       /*
++        * Write error - bail if we don't see an error we can retry...
++	*/
++
++        if (errno == ENOSPC)
++	{
++	  if (!paperout)
++	  {
++	    fputs("ERROR: Out of paper!\n", stderr);
++	    fputs("STATUS: +media-tray-empty-error\n", stderr);
++	    paperout = 1;
++	  }
++        }
++	else if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
++	{
++	  perror("ERROR: Unable to write print data");
++	  return (-1);
++	}
++      }
++      else
++      {
++        if (paperout)
++	{
++	  fputs("STATUS: -media-tray-empty-error\n", stderr);
++	  paperout = 0;
++	}
++
++        fprintf(stderr, "DEBUG: Wrote %d bytes...\n", (int)bytes);
++
++        print_bytes -= bytes;
++	print_ptr   += bytes;
++	total_bytes += bytes;
++      }
++    }
++  }
++
++ /*
++  * Return with success...
++  */
++
++  return (total_bytes);
++}
++
++
++/*
++ * End of "$Id$".
++ */
+diff -urNad cupsys-1.2.1~/backend/serial.c cupsys-1.2.1/backend/serial.c
+--- cupsys-1.2.1~/backend/serial.c	2006-05-20 12:23:40.000000000 +0000
++++ cupsys-1.2.1/backend/serial.c	2006-07-06 16:47:45.000000000 +0000
+@@ -33,13 +33,7 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/backend.h>
+-#include <cups/cups.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <errno.h>
+-#include <cups/string.h>
+-#include <signal.h>
++#include "backend-private.h"
+ 
+ #ifdef __hpux
+ #  include <sys/modem.h>
+@@ -121,21 +115,23 @@
+ 		value[255],		/* Value of option */
+ 		*ptr;			/* Pointer into name or value */
+   int		port;			/* Port number (not used) */
+-  int		fp;			/* Print file */
+   int		copies;			/* Number of copies to print */
+-  int		fd;			/* Parallel device */
+-  int		rbytes;			/* Number of bytes read */
+-  int		wbytes;			/* Number of bytes written */
+-  size_t	nbytes,			/* Number of bytes read */
+-		tbytes;			/* Total number of bytes written */
++  int		print_fd,		/* Print file */
++		device_fd;		/* Serial device */
++  int		nfds;			/* Maximum file descriptor value + 1 */
++  fd_set	input,			/* Input set for reading */
++		output;			/* Output set for writing */
++  ssize_t	print_bytes,		/* Print bytes read */
++		bc_bytes,		/* Backchannel bytes read */
++		total_bytes,		/* Total bytes written */
++		bytes;			/* Bytes written */
+   int		dtrdsr;			/* Do dtr/dsr flow control? */
+-  int		bufsize;		/* Size of output buffer for writes */
+-  char		buffer[8192],		/* Output buffer */
+-		*bufptr;		/* Pointer into buffer */
++  int		print_size;		/* Size of output buffer for writes */
++  char		print_buffer[8192],	/* Print data buffer */
++		*print_ptr,		/* Pointer into print data buffer */
++		bc_buffer[1024];	/* Back-channel data buffer */
+   struct termios opts;			/* Serial port options */
+   struct termios origopts;		/* Original port options */
+-  fd_set	input,			/* Input set for select() */
+-		output;			/* Output set for select() */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;		/* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+@@ -183,8 +179,8 @@
+ 
+   if (argc == 6)
+   {
+-    fp     = 0;
+-    copies = 1;
++    print_fd = 0;
++    copies   = 1;
+   }
+   else
+   {
+@@ -192,7 +188,7 @@
+     * Try to open the print file...
+     */
+ 
+-    if ((fp = open(argv[6], O_RDONLY)) < 0)
++    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
+     {
+       perror("ERROR: unable to open print file");
+       return (CUPS_BACKEND_FAILED);
+@@ -232,7 +228,8 @@
+ 
+   do
+   {
+-    if ((fd = open(resource, O_WRONLY | O_NOCTTY | O_EXCL | O_NDELAY)) == -1)
++    if ((device_fd = open(resource, O_RDWR | O_NOCTTY | O_EXCL |
++                                    O_NDELAY)) == -1)
+     {
+       if (getenv("CLASS") != NULL)
+       {
+@@ -268,7 +265,7 @@
+       }
+     }
+   }
+-  while (fd < 0);
++  while (device_fd < 0);
+ 
+   fputs("STATE: -connecting-to-device\n", stderr);
+ 
+@@ -276,16 +273,18 @@
+   * Set any options provided...
+   */
+ 
+-  tcgetattr(fd, &origopts);
+-  tcgetattr(fd, &opts);
++  tcgetattr(device_fd, &origopts);
++  tcgetattr(device_fd, &opts);
+ 
+-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+-  opts.c_oflag &= ~OPOST;			/* Don't post-process */
++  opts.c_lflag &= ~(ICANON | ECHO | ISIG);
++					/* Raw mode */
++  opts.c_oflag &= ~OPOST;		/* Don't post-process */
+ 
+-  bufsize = 96;		/* 9600 baud / 10 bits/char / 10Hz */
+-  dtrdsr  = 0;		/* No dtr/dsr flow control */
++  print_size = 96;			/* 9600 baud / 10 bits/char / 10Hz */
++  dtrdsr     = 0;			/* No dtr/dsr flow control */
+ 
+-  if (options != NULL)
++  if (options)
++  {
+     while (*options)
+     {
+      /*
+@@ -326,7 +325,7 @@
+         * Set the baud rate...
+ 	*/
+ 
+-        bufsize = atoi(value) / 100;
++        print_size = atoi(value) / 100;
+ 
+ #if B19200 == 19200
+         cfsetispeed(&opts, atoi(value));
+@@ -488,9 +487,10 @@
+ 	}
+       }
+     }
++  }
+ 
+-  tcsetattr(fd, TCSANOW, &opts);
+-  fcntl(fd, F_SETFL, 0);
++  tcsetattr(device_fd, TCSANOW, &opts);
++  fcntl(device_fd, F_SETFL, 0);
+ 
+  /*
+   * Now that we are "connected" to the port, ignore SIGTERM so that we
+@@ -499,7 +499,7 @@
+   * stdin (otherwise you can't cancel raw jobs...)
+   */
+ 
+-  if (argc < 7)
++  if (print_fd != 0)
+   {
+ #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+     sigset(SIGTERM, SIG_IGN);
+@@ -515,133 +515,181 @@
+   }
+ 
+  /*
+-  * Finally, send the print file...
++  * Figure out the maximum file descriptor value to use with select()...
+   */
+ 
+-  if (bufsize > sizeof(buffer))
+-    bufsize = sizeof(buffer);
++  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
+ 
+-  wbytes = 0;
++ /*
++  * Finally, send the print file.  Ordinarily we would just use the
++  * backendRunLoop() function, however since we need to use smaller
++  * writes and may need to do DSR/DTR flow control, we duplicate much
++  * of the code here instead...
++  */
++
++  if (print_size > sizeof(print_buffer))
++    print_size = sizeof(print_buffer);
++
++  total_bytes = 0;
+ 
+   while (copies > 0)
+   {
+     copies --;
+ 
+-    if (fp != 0)
++    if (print_fd != 0)
+     {
+       fputs("PAGE: 1 1\n", stderr);
+-      lseek(fp, 0, SEEK_SET);
++      lseek(print_fd, 0, SEEK_SET);
+     }
+ 
+-    if (dtrdsr)
++   /*
++    * Now loop until we are out of data from print_fd...
++    */
++
++    for (print_bytes = 0, print_ptr = print_buffer;;)
+     {
+      /*
+-      * Check the port and sleep until DSR is set...
++      * Use select() to determine whether we have data to copy around...
+       */
+ 
+-      int status;
++      FD_ZERO(&input);
++      if (!print_bytes)
++	FD_SET(print_fd, &input);
++      FD_SET(device_fd, &input);
+ 
++      FD_ZERO(&output);
++      if (print_bytes)
++	FD_SET(device_fd, &output);
+ 
+-      if (!ioctl(fd, TIOCMGET, &status))
+-        if (!(status & TIOCM_DSR))
++      if (select(nfds, &input, &output, NULL, NULL) < 0)
++	continue;			/* Ignore errors here */
++
++     /*
++      * Check if we have back-channel data ready...
++      */
++
++      if (FD_ISSET(device_fd, &input))
++      {
++	if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0)
++	{
++	  fprintf(stderr,
++	          "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n",
++	          CUPS_LLCAST bc_bytes);
++          cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
++	}
++      }
++
++     /*
++      * Check if we have print data ready...
++      */
++
++      if (FD_ISSET(print_fd, &input))
++      {
++	if ((print_bytes = read(print_fd, print_buffer, print_size)) < 0)
+ 	{
+ 	 /*
+-	  * Wait for DSR to go high...
++          * Read error - bail if we don't see EAGAIN or EINTR...
+ 	  */
+ 
+-	  fputs("DEBUG: DSR is low; waiting for device...\n", stderr);
+-
+-          do
++	  if (errno != EAGAIN || errno != EINTR)
+ 	  {
+-	    sleep(1);
+-	    if (ioctl(fd, TIOCMGET, &status))
+-	      break;
+-	  }
+-	  while (!(status & TIOCM_DSR));
+-
+-	  fputs("DEBUG: DSR is high; writing to device...\n", stderr);
+-        }
+-    }
++	    perror("ERROR: Unable to read print data");
+ 
+-    tbytes = 0;
+-    while ((nbytes = read(fp, buffer, bufsize)) > 0)
+-    {
+-     /*
+-      * Write the print data to the printer...
+-      */
++            tcsetattr(device_fd, TCSADRAIN, &origopts);
+ 
+-      tbytes += nbytes;
+-      bufptr = buffer;
++	    close(device_fd);
+ 
+-      while (nbytes > 0)
+-      {
+-       /*
+-        * See if we are ready to read or write...
+-	*/
++	    if (print_fd != 0)
++	      close(print_fd);
+ 
+-        do
+-	{
+-          FD_ZERO(&input);
+-	  FD_SET(fd, &input);
+-	  FD_ZERO(&output);
+-	  FD_SET(fd, &output);
+-        }
+-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
++	    return (CUPS_BACKEND_FAILED);
++	  }
+ 
+-        if (FD_ISSET(fd, &input))
++          print_bytes = 0;
++	}
++	else if (print_bytes == 0)
+ 	{
+ 	 /*
+-	  * Read backchannel data...
++          * End of file, break out of the loop...
+ 	  */
+ 
+-	  if ((rbytes = read(fd, resource, sizeof(resource))) > 0)
+-	  {
+-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+-	            rbytes);
+-            cupsBackChannelWrite(resource, rbytes, 1.0);
+-          }
++          break;
+ 	}
+ 
+-        if (FD_ISSET(fd, &output))
++	print_ptr = print_buffer;
++      }
++
++     /*
++      * Check if the device is ready to receive data and we have data to
++      * send...
++      */
++
++      if (print_bytes && FD_ISSET(device_fd, &output))
++      {
++	if (dtrdsr)
+ 	{
+ 	 /*
+-	  * Write print data...
++	  * Check the port and sleep until DSR is set...
+ 	  */
+ 
+-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+-	    if (errno == ENOTTY)
+-	      wbytes = write(fd, bufptr, nbytes);
++	  int status;
+ 
+-	  if (wbytes < 0)
+-	  {
+-	   /*
+-	    * Check for retryable errors...
+-	    */
+ 
+-	    if (errno != EAGAIN && errno != EINTR)
++	  if (!ioctl(device_fd, TIOCMGET, &status))
++            if (!(status & TIOCM_DSR))
+ 	    {
+-	      perror("ERROR: Unable to send print file to printer");
+-	      break;
+-	    }
+-	  }
+-	  else
++	     /*
++	      * Wait for DSR to go high...
++	      */
++
++	      fputs("DEBUG: DSR is low; waiting for device...\n", stderr);
++
++              do
++	      {
++	       /*
++	        * Poll every 100ms...
++		*/
++
++		usleep(100000);
++
++		if (ioctl(device_fd, TIOCMGET, &status))
++		  break;
++	      }
++	      while (!(status & TIOCM_DSR));
++
++	      fputs("DEBUG: DSR is high; writing to device...\n", stderr);
++            }
++	}
++
++	if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
++	{
++	 /*
++          * Write error - bail if we don't see an error we can retry...
++	  */
++
++	  if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
+ 	  {
+-	   /*
+-	    * Update count and pointer...
+-	    */
++	    perror("ERROR: Unable to write print data");
+ 
+-	    nbytes -= wbytes;
+-	    bufptr += wbytes;
++            tcsetattr(device_fd, TCSADRAIN, &origopts);
++
++	    close(device_fd);
++
++	    if (print_fd != 0)
++	      close(print_fd);
++
++	    return (CUPS_BACKEND_FAILED);
+ 	  }
+ 	}
+-      }
+-
+-      if (wbytes < 0)
+-        break;
++	else
++	{
++          fprintf(stderr, "DEBUG: Wrote %d bytes...\n", (int)bytes);
+ 
+-      if (argc > 6)
+-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
+-	        (unsigned long)tbytes);
++          print_bytes -= bytes;
++	  print_ptr   += bytes;
++	  total_bytes += bytes;
++	}
++      }
+     }
+   }
+ 
+@@ -649,13 +697,14 @@
+   * Close the serial port and input file and return...
+   */
+ 
+-  tcsetattr(fd, TCSADRAIN, &origopts);
++  tcsetattr(device_fd, TCSADRAIN, &origopts);
+ 
+-  close(fd);
+-  if (fp != 0)
+-    close(fp);
++  close(device_fd);
+ 
+-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
++  if (print_fd != 0)
++    close(print_fd);
++
++  return (total_bytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ }
+ 
+ 
+diff -urNad cupsys-1.2.1~/backend/snmp.c cupsys-1.2.1/backend/snmp.c
+--- cupsys-1.2.1~/backend/snmp.c	2006-05-02 15:03:17.000000000 +0000
++++ cupsys-1.2.1/backend/snmp.c	2006-07-06 16:47:45.000000000 +0000
+@@ -77,17 +77,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/backend.h>
+ #include <cups/http-private.h>
+-#include <cups/cups.h>
+-#include <cups/string.h>
++#include "backend-private.h"
+ #include <cups/array.h>
+ #include <cups/file.h>
+-#include <errno.h>
+-#include <signal.h>
+-
+-#define SNMP_BACKEND
+-#include "ieee1284.c"
+ 
+ 
+ /*
+@@ -1551,6 +1544,7 @@
+ 			  "/ipp/port2",
+ 			  "/ipp/port3",
+ 			  "/EPSON_IPP_Printer",
++			  "/printer",
+ 			  "/LPT1",
+ 			  "/LPT2",
+ 			  "/COM1",
+@@ -1648,6 +1642,14 @@
+  	  info = NULL;
+ 
+        /*
++        * Don't use the printer-make-and-model if it contains a generic
++	* string like "Ricoh IPP Printer"...
++	*/
++
++	if (model && strstr(model->values[0].string.text, "IPP Printer"))
++	  model = NULL;
++
++       /*
+         * If we don't have a printer-make-and-model string from the printer
+ 	* but do have the 1284 device ID string, generate a make-and-model
+ 	* string from the device ID info...
+@@ -1656,7 +1658,9 @@
+ 	if (model)
+           strlcpy(temp, model->values[0].string.text, sizeof(temp));
+ 	else if (info)
+-	  get_make_model(info->values[0].string.text, temp, sizeof(temp));
++	  backendGetMakeModel(info->values[0].string.text, temp, sizeof(temp));
++        else
++	  temp[0] = '\0';
+ 
+         fix_make_model(make_model, temp, sizeof(make_model));
+ 
+@@ -1928,8 +1932,8 @@
+       * Description is the IEEE-1284 device ID...
+       */
+ 
+-      get_make_model(packet.object_value.string, make_model,
+-                     sizeof(make_model));
++      backendGetMakeModel(packet.object_value.string, make_model,
++                	  sizeof(make_model));
+     }
+     else
+     {
+diff -urNad cupsys-1.2.1~/backend/socket.c cupsys-1.2.1/backend/socket.c
+--- cupsys-1.2.1~/backend/socket.c	2006-03-07 22:07:44.000000000 +0000
++++ cupsys-1.2.1/backend/socket.c	2006-07-06 16:47:45.000000000 +0000
+@@ -32,17 +32,11 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/backend.h>
+ #include <cups/http-private.h>
+-#include <cups/cups.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include "backend-private.h"
+ #include <stdarg.h>
+-#include <cups/string.h>
+-#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <signal.h>
+ 
+ #ifdef WIN32
+ #  include <winsock.h>
+@@ -76,24 +70,19 @@
+ 		name[255],		/* Name of option */
+ 		value[255],		/* Value of option */
+ 		*ptr;			/* Pointer into name or value */
+-  int		fp;			/* Print file */
++  int		print_fd;		/* Print file */
+   int		copies;			/* Number of copies to print */
+   int		waiteof;		/* Wait for end-of-file? */
+   int		port;			/* Port number */
+   char		portname[255];		/* Port name */
+   int		delay;			/* Delay for retries... */
+-  int		fd;			/* AppSocket */
++  int		device_fd;		/* AppSocket */
+   int		error;			/* Error code (if any) */
+   http_addrlist_t *addrlist;		/* Address list */
+-  int		rbytes;			/* Number of bytes read */
+-  int		wbytes;			/* Number of bytes written */
+-  int		nbytes;			/* Number of bytes read */
+-  size_t	tbytes;			/* Total number of bytes written */
+-  char		buffer[8192],		/* Output buffer */
+-		*bufptr;		/* Pointer into buffer */
++  ssize_t	tbytes;			/* Total number of bytes written */
+   struct timeval timeout;		/* Timeout for select() */
+-  fd_set	input,			/* Input set for select() */
+-		output;			/* Output set for select() */
++  fd_set	input;			/* Input set for select() */
++  ssize_t	bc_bytes;		/* Number of back-channel bytes read */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;		/* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+@@ -142,8 +131,8 @@
+ 
+   if (argc == 6)
+   {
+-    fp     = 0;
+-    copies = 1;
++    print_fd = 0;
++    copies   = 1;
+   }
+   else
+   {
+@@ -151,7 +140,7 @@
+     * Try to open the print file...
+     */
+ 
+-    if ((fp = open(argv[6], O_RDONLY)) < 0)
++    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
+     {
+       perror("ERROR: unable to open print file");
+       return (CUPS_BACKEND_FAILED);
+@@ -252,228 +241,134 @@
+   fprintf(stderr, "INFO: Attempting to connect to host %s on port %d\n",
+           hostname, port);
+ 
+-  wbytes = 0;
++  fputs("STATE: +connecting-to-device\n", stderr);
+ 
+-  while (copies > 0)
++  for (delay = 5;;)
+   {
+-    fputs("STATE: +connecting-to-device\n", stderr);
+-
+-    for (delay = 5;;)
++    if (!httpAddrConnect(addrlist, &device_fd))
+     {
+-      if (!httpAddrConnect(addrlist, &fd))
+-      {
+-	error = errno;
+-	fd    = -1;
++      error     = errno;
++      device_fd = -1;
+ 
+-	if (getenv("CLASS") != NULL)
+-	{
+-	 /*
+-          * If the CLASS environment variable is set, the job was submitted
+-	  * to a class and not to a specific queue.  In this case, we want
+-	  * to abort immediately so that the job can be requeued on the next
+-	  * available printer in the class.
+-	  */
++      if (getenv("CLASS") != NULL)
++      {
++       /*
++        * If the CLASS environment variable is set, the job was submitted
++	* to a class and not to a specific queue.  In this case, we want
++	* to abort immediately so that the job can be requeued on the next
++	* available printer in the class.
++	*/
+ 
+-          fprintf(stderr, "INFO: Unable to connect to \"%s\", queuing on next printer in class...\n",
+-		  hostname);
++        fprintf(stderr, "INFO: Unable to connect to \"%s\", queuing on next printer in class...\n",
++		hostname);
+ 
+-	 /*
+-          * Sleep 5 seconds to keep the job from requeuing too rapidly...
+-	  */
++       /*
++        * Sleep 5 seconds to keep the job from requeuing too rapidly...
++	*/
+ 
+-	  sleep(5);
++	sleep(5);
+ 
+-          return (CUPS_BACKEND_FAILED);
+-	}
++        return (CUPS_BACKEND_FAILED);
++      }
+ 
+-	if (error == ECONNREFUSED || error == EHOSTDOWN ||
+-            error == EHOSTUNREACH)
+-	{
+-	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
+-                  hostname, delay);
+-	  sleep(delay);
++      if (error == ECONNREFUSED || error == EHOSTDOWN ||
++          error == EHOSTUNREACH)
++      {
++	fprintf(stderr,
++	        "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
++                hostname, delay);
++	sleep(delay);
+ 
+-	  if (delay < 30)
+-	    delay += 5;
+-	}
+-	else
+-	{
+-	  perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
+-	  sleep(30);
+-	}
++	if (delay < 30)
++	  delay += 5;
+       }
+       else
+-	break;
++      {
++	perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
++	sleep(30);
++      }
+     }
++    else
++      break;
++  }
+ 
+-    fputs("STATE: -connecting-to-device\n", stderr);
+-
+-   /*
+-    * Now that we are "connected" to the port, ignore SIGTERM so that we
+-    * can finish out any page data the driver sends (e.g. to eject the
+-    * current page...  Only ignore SIGTERM if we are printing data from
+-    * stdin (otherwise you can't cancel raw jobs...)
+-    */
+-
+-    if (argc < 7)
+-    {
+-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+-      sigset(SIGTERM, SIG_IGN);
+-#elif defined(HAVE_SIGACTION)
+-      memset(&action, 0, sizeof(action));
++  fputs("STATE: -connecting-to-device\n", stderr);
+ 
+-      sigemptyset(&action.sa_mask);
+-      action.sa_handler = SIG_IGN;
+-      sigaction(SIGTERM, &action, NULL);
+-#else
+-      signal(SIGTERM, SIG_IGN);
+-#endif /* HAVE_SIGSET */
+-    }
++ /*
++  * Print everything...
++  */
+ 
+-   /*
+-    * Finally, send the print file...
+-    */
++  tbytes = 0;
+ 
++  while (copies > 0 && tbytes >= 0)
++  {
+     copies --;
+ 
+-    if (fp != 0)
++    if (print_fd != 0)
+     {
+       fputs("PAGE: 1 1\n", stderr);
+-      lseek(fp, 0, SEEK_SET);
++      lseek(print_fd, 0, SEEK_SET);
+     }
+ 
+-    fputs("INFO: Connected to host, sending print job...\n", stderr);
+-
+-    tbytes = 0;
+-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+-    {
+-     /*
+-      * Write the print data to the printer...
+-      */
+-
+-      tbytes += nbytes;
+-      bufptr = buffer;
+-
+-      while (nbytes > 0)
+-      {
+-       /*
+-        * See if we are ready to read or write...
+-	*/
+-
+-        do
+-	{
+-          FD_ZERO(&input);
+-	  FD_SET(fd, &input);
+-	  FD_ZERO(&output);
+-	  FD_SET(fd, &output);
+-        }
+-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
+-
+-        if (FD_ISSET(fd, &input))
+-	{
+-	 /*
+-	  * Read backchannel data...
+-	  */
+-
+-	  if ((rbytes = recv(fd, resource, sizeof(resource), 0)) > 0)
+-	  {
+-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+-	            rbytes);
+-            cupsBackChannelWrite(resource, rbytes, 1.0);
+-          }
+-	}
+-
+-        if (FD_ISSET(fd, &output))
+-	{
+-	 /*
+-	  * Write print data...
+-	  */
+-
+-	  if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
+-	  {
+-	   /*
+-	    * Check for retryable errors...
+-	    */
++    tbytes = backendRunLoop(print_fd, device_fd, 1);
+ 
+-	    if (errno != EAGAIN && errno != EINTR)
+-	    {
+-	      perror("ERROR: Unable to send print file to printer");
+-	      break;
+-	    }
+-	  }
+-	  else
+-	  {
+-	   /*
+-	    * Update count and pointer...
+-	    */
++    if (print_fd != 0 && tbytes >= 0)
++      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
++	      CUPS_LLCAST tbytes);
++  }
+ 
+-	    nbytes -= wbytes;
+-	    bufptr += wbytes;
+-	  }
+-        }
+-      }
++  if (waiteof)
++  {
++   /*
++    * Shutdown the socket and wait for the other end to finish...
++    */
+ 
+-      if (wbytes < 0)
+-        break;
++    fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
+ 
+-      if (argc > 6)
+-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
+-	        (unsigned long)tbytes);
+-    }
++    shutdown(device_fd, 1);
+ 
+-    if (waiteof)
++    for (;;)
+     {
+      /*
+-      * Shutdown the socket and wait for the other end to finish...
++      * Wait a maximum of 90 seconds for backchannel data or a closed
++      * connection...
+       */
+ 
+-      fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
++      timeout.tv_sec  = 90;
++      timeout.tv_usec = 0;
+ 
+-      shutdown(fd, 1);
++      FD_ZERO(&input);
++      FD_SET(device_fd, &input);
+ 
+-      for (;;)
++#ifdef __hpux
++      if (select(device_fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
++#else
++      if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
++#endif /* __hpux */
+       {
+        /*
+-	* Wait a maximum of 90 seconds for backchannel data or a closed
+-	* connection...
++	* Grab the data coming back and spit it out to stderr...
+ 	*/
+ 
+-	timeout.tv_sec  = 90;
+-	timeout.tv_usec = 0;
+-
+-	FD_ZERO(&input);
+-	FD_SET(fd, &input);
+-
+-  #ifdef __hpux
+-	if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+-  #else
+-	if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+-  #endif /* __hpux */
++	if ((bc_bytes = read(device_fd, resource, sizeof(resource))) > 0)
+ 	{
+-	 /*
+-	  * Grab the data coming back and spit it out to stderr...
+-	  */
+-
+-	  if ((rbytes = recv(fd, resource, sizeof(resource), 0)) > 0)
+-	  {
+-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+-		    rbytes);
+-	    cupsBackChannelWrite(resource, rbytes, 1.0);
+-	  }
+-	  else
+-	    break;
++	  fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
++		  (int)bc_bytes);
++	  cupsBackChannelWrite(resource, bc_bytes, 1.0);
+ 	}
+ 	else
+ 	  break;
+       }
++      else
++	break;
+     }
++  }
+ 
+-   /*
+-    * Close the socket connection...
+-    */
++ /*
++  * Close the socket connection...
++  */
+ 
+-    close(fd);
+-  }
++  close(device_fd);
+ 
+   httpAddrFreeList(addrlist);
+ 
+@@ -481,13 +376,13 @@
+   * Close the input file and return...
+   */
+ 
+-  if (fp != 0)
+-    close(fp);
++  if (print_fd != 0)
++    close(print_fd);
+ 
+-  if (wbytes >= 0)
++  if (tbytes >= 0)
+     fputs("INFO: Ready to print.\n", stderr);
+ 
+-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
++  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ }
+ 
+ 
+diff -urNad cupsys-1.2.1~/backend/test1284.c cupsys-1.2.1/backend/test1284.c
+--- cupsys-1.2.1~/backend/test1284.c	2006-01-10 20:02:46.000000000 +0000
++++ cupsys-1.2.1/backend/test1284.c	2006-07-06 16:47:45.000000000 +0000
+@@ -41,6 +41,7 @@
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #endif /* WIN32 */
++
+ #define DEBUG
+ #include "ieee1284.c"
+ 
+@@ -76,8 +77,8 @@
+ 
+     printf("%s:\n", argv[i]);
+ 
+-    get_device_id(fd, device_id, sizeof(device_id), make_model,
+-                  sizeof(make_model), "test", uri, sizeof(uri));
++    backendGetDeviceID(fd, device_id, sizeof(device_id), make_model,
++                       sizeof(make_model), "test", uri, sizeof(uri));
+ 
+     printf("    device_id=\"%s\"\n", device_id);
+     printf("    make_model=\"%s\"\n", make_model);
+diff -urNad cupsys-1.2.1~/backend/usb-darwin.c cupsys-1.2.1/backend/usb-darwin.c
+--- cupsys-1.2.1~/backend/usb-darwin.c	2006-05-03 19:39:30.000000000 +0000
++++ cupsys-1.2.1/backend/usb-darwin.c	2006-07-06 16:47:45.000000000 +0000
+@@ -1310,7 +1310,7 @@
+      */
+     start = mach_absolute_time();
+ 
+-    rbytes = sizeof(readbuffer) - 1;
++    rbytes = sizeof(readbuffer);
+     readstatus = (*classdriver)->ReadPipe( classdriver, readbuffer, &rbytes );
+     if ( kIOReturnSuccess == readstatus && rbytes > 0 ) {
+ 
+diff -urNad cupsys-1.2.1~/backend/usb-unix.c cupsys-1.2.1/backend/usb-unix.c
+--- cupsys-1.2.1~/backend/usb-unix.c	2006-05-20 12:23:40.000000000 +0000
++++ cupsys-1.2.1/backend/usb-unix.c	2006-07-06 16:47:45.000000000 +0000
+@@ -27,8 +27,9 @@
+  *
+  * Contents:
+  *
+- *   main()         - Send a file to the specified USB port.
++ *   print_device() - Print a file to a USB device.
+  *   list_devices() - List all USB devices.
++ *   open_device()  - Open a USB device...
+  */
+ 
+ /*
+@@ -55,30 +56,20 @@
+              const char *hostname,	/* I - Hostname/manufacturer */
+              const char *resource,	/* I - Resource/modelname */
+ 	     const char *options,	/* I - Device options/serial number */
+-	     int        fp,		/* I - File descriptor to print */
++	     int        print_fd,	/* I - File descriptor to print */
+ 	     int        copies,		/* I - Copies to print */
+ 	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
+ 	     char	*argv[])	/* I - Command-line arguments */
+ {
+-  int		usebc;			/* Use backchannel path? */
+-  int		fd;			/* USB device */
+-  int		rbytes;			/* Number of bytes read */
+-  int		wbytes;			/* Number of bytes written */
+-  size_t	nbytes,			/* Number of bytes read */
+-		tbytes;			/* Total number of bytes written */
+-  char		buffer[8192],		/* Output buffer */
+-		*bufptr,		/* Pointer into buffer */
+-		backbuf[1024];		/* Backchannel buffer */
++  int		use_bc;			/* Use backchannel path? */
++  int		device_fd;		/* USB device */
++  size_t	tbytes;			/* Total number of bytes written */
+   struct termios opts;			/* Parallel port options */
+-  fd_set	input,			/* Input set for select() */
+-		output;			/* Output set for select() */
+-  int		paperout;		/* Paper out? */
+-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+-  struct sigaction action;		/* Actions for POSIX signals */
+-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+-#ifdef __linux
++#if defined(__linux) && defined(LP_POUTPA)
+   unsigned int	status;			/* Port status (off-line, out-of-paper, etc.) */
+-#endif /* __linux */
++  int		paperout;		/* Paper out? */
++#endif /* __linux && LP_POUTPA */
++
+ 
+   (void)argc;
+   (void)argv;
+@@ -89,7 +80,7 @@
+   * when they get a read request...
+   */
+ 
+-  usebc = strcasecmp(hostname, "Canon") != 0;
++  use_bc = strcasecmp(hostname, "Canon") != 0;
+ 
+  /*
+   * Open the USB port device...
+@@ -99,7 +90,7 @@
+ 
+   do
+   {
+-    if ((fd = open_device(uri)) == -1)
++    if ((device_fd = open_device(uri)) == -1)
+     {
+       if (getenv("CLASS") != NULL)
+       {
+@@ -127,7 +118,8 @@
+         fputs("INFO: USB port busy; will retry in 30 seconds...\n", stderr);
+ 	sleep(30);
+       }
+-      else if (errno == ENXIO || errno == EIO || errno == ENOENT || errno == ENODEV)
++      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
++               errno == ENODEV)
+       {
+         fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
+ 	sleep(30);
+@@ -140,7 +132,7 @@
+       }
+     }
+   }
+-  while (fd < 0);
++  while (device_fd < 0);
+ 
+   fputs("STATE: -connecting-to-device\n", stderr);
+ 
+@@ -148,28 +140,25 @@
+   * Set any options provided...
+   */
+ 
+-  tcgetattr(fd, &opts);
++  tcgetattr(device_fd, &opts);
+ 
+   opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+ 
+   /**** No options supported yet ****/
+ 
+-  tcsetattr(fd, TCSANOW, &opts);
+-
+- /*
+-  * Check printer status...
+-  */
+-
+-  paperout = 0;
++  tcsetattr(device_fd, TCSANOW, &opts);
+ 
+ #if defined(__linux) && defined(LP_POUTPA)
+  /*
+   * Show the printer status before we send the file...
+   */
+ 
+-  while (!ioctl(fd, LPGETSTATUS, &status))
++  paperout = 0;
++
++  while (!ioctl(device_fd, LPGETSTATUS, &status))
+   {
+-    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
++    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n",
++            status);
+ 
+     if (status & LP_POUTPA)
+     {
+@@ -191,146 +180,35 @@
+ #endif /* __linux && LP_POUTPA */
+ 
+  /*
+-  * Now that we are "connected" to the port, ignore SIGTERM so that we
+-  * can finish out any page data the driver sends (e.g. to eject the
+-  * current page...  Only ignore SIGTERM if we are printing data from
+-  * stdin (otherwise you can't cancel raw jobs...)
+-  */
+-
+-  if (!fp)
+-  {
+-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+-    sigset(SIGTERM, SIG_IGN);
+-#elif defined(HAVE_SIGACTION)
+-    memset(&action, 0, sizeof(action));
+-
+-    sigemptyset(&action.sa_mask);
+-    action.sa_handler = SIG_IGN;
+-    sigaction(SIGTERM, &action, NULL);
+-#else
+-    signal(SIGTERM, SIG_IGN);
+-#endif /* HAVE_SIGSET */
+-  }
+-
+- /*
+   * Finally, send the print file...
+   */
+ 
+-  wbytes = 0;
++  tbytes = 0;
+ 
+-  while (copies > 0)
++  while (copies > 0 && tbytes >= 0)
+   {
+     copies --;
+ 
+-    if (fp != 0)
++    if (print_fd != 0)
+     {
+       fputs("PAGE: 1 1\n", stderr);
+-      lseek(fp, 0, SEEK_SET);
++      lseek(print_fd, 0, SEEK_SET);
+     }
+ 
+-    tbytes = 0;
+-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+-    {
+-     /*
+-      * Write the print data to the printer...
+-      */
+-
+-      tbytes += nbytes;
+-      bufptr = buffer;
+-
+-      while (nbytes > 0)
+-      {
+-       /*
+-        * See if we are ready to read or write...
+-	*/
+-
+-        do
+-	{
+-          FD_ZERO(&input);
+-	  if (usebc)
+-	    FD_SET(fd, &input);
+-
+-	  FD_ZERO(&output);
+-	  FD_SET(fd, &output);
+-        }
+-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
+-
+-        if (FD_ISSET(fd, &input))
+-	{
+-	 /*
+-	  * Read backchannel data...
+-	  */
+-
+-	  if ((rbytes = read(fd, backbuf, sizeof(backbuf))) > 0)
+-	  {
+-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+-	            rbytes);
+-            cupsBackChannelWrite(backbuf, rbytes, 1.0);
+-          }
+-	}
+-
+-        if (FD_ISSET(fd, &output))
+-	{
+-	 /*
+-	  * Write print data...
+-	  */
+-
+-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+-	    if (errno == ENOTTY)
+-	      wbytes = write(fd, bufptr, nbytes);
+-
+-	  if (wbytes < 0)
+-	  {
+-	   /*
+-	    * Check for retryable errors...
+-	    */
+-
+-	    if (errno == ENOSPC)
+-	    {
+-	      paperout = 1;
+-	      fputs("ERROR: Out of paper!\n", stderr);
+-	      fputs("STATUS: +media-tray-empty-error\n", stderr);
+-	    }
+-	    else if (errno != EAGAIN && errno != EINTR)
+-	    {
+-	      perror("ERROR: Unable to send print file to printer");
+-	      break;
+-	    }
+-	  }
+-	  else
+-	  {
+-	   /*
+-	    * Update count and pointer...
+-	    */
+-
+-            if (paperout)
+-	    {
+-	      fputs("STATUS: -media-tray-empty-error\n", stderr);
+-	      paperout = 0;
+-	    }
+-
+-	    nbytes -= wbytes;
+-	    bufptr += wbytes;
+-	  }
+-	}
+-      }
+-
+-      if (wbytes < 0)
+-        break;
++    tbytes = backendRunLoop(print_fd, device_fd, 1);
+ 
+-      if (fp)
+-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
+-	        (unsigned long)tbytes);
+-    }
++    if (print_fd != 0 && tbytes >= 0)
++      fprintf(stderr, "INFO: Sent print file, " CUPS_LLFMT " bytes...\n",
++	      CUPS_LLCAST tbytes);
+   }
+ 
+  /*
+   * Close the USB port and return...
+   */
+ 
+-  close(fd);
++  close(device_fd);
+ 
+-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
++  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ }
+ 
+ 
+@@ -372,9 +250,9 @@
+ 
+     if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+     {
+-      if (!get_device_id(fd, device_id, sizeof(device_id),
+-                         make_model, sizeof(make_model),
+-			 "usb", device_uri, sizeof(device_uri)))
++      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
++                              make_model, sizeof(make_model),
++			      "usb", device_uri, sizeof(device_uri)))
+ 	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
+ 	       make_model, make_model, i + 1, device_id);
+ 
+@@ -401,9 +279,9 @@
+ 
+     if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+     {
+-      if (!get_device_id(fd, device_id, sizeof(device_id),
+-                         make_model, sizeof(make_model),
+-			 "usb", device_uri, sizeof(device_uri)))
++      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
++                              make_model, sizeof(make_model),
++			      "usb", device_uri, sizeof(device_uri)))
+ 	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
+ 	       make_model, make_model, i + 1, device_id);
+ 
+@@ -446,7 +324,14 @@
+ 
+   if (!strncmp(uri, "usb:/dev/", 9))
+ #ifdef __linux
+-    return (-1); /* Do not allow direct devices anymore */
++  {
++   /*
++    * Do not allow direct devices anymore...
++    */
++
++    errno = ENODEV;
++    return (-1);
++  }
+   else if (!strncmp(uri, "usb://", 6))
+   {
+    /*
+@@ -486,9 +371,9 @@
+ 
+ 	if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+ 	{
+-	  get_device_id(fd, device_id, sizeof(device_id),
+-                        make_model, sizeof(make_model),
+-			"usb", device_uri, sizeof(device_uri));
++	  backendGetDeviceID(fd, device_id, sizeof(device_id),
++                             make_model, sizeof(make_model),
++			     "usb", device_uri, sizeof(device_uri));
+ 	}
+ 	else
+ 	{
+@@ -545,7 +430,14 @@
+     return (-1);
+   }
+ #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
+-    return (-1); /* Do not allow direct devices anymore */
++  {
++   /*
++    * Do not allow direct devices anymore...
++    */
++
++    errno = ENODEV;
++    return (-1);
++  }
+   else if (!strncmp(uri, "usb://", 6))
+   {
+    /*
+@@ -572,9 +464,9 @@
+ 	sprintf(device, "/dev/usb/printer%d", i);
+ 
+ 	if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+-	  get_device_id(fd, device_id, sizeof(device_id),
+-                        make_model, sizeof(make_model),
+-			"usb", device_uri, sizeof(device_uri));
++	  backendGetDeviceID(fd, device_id, sizeof(device_id),
++                             make_model, sizeof(make_model),
++			     "usb", device_uri, sizeof(device_uri));
+ 	else
+ 	{
+ 	 /*
+diff -urNad cupsys-1.2.1~/backend/usb.c cupsys-1.2.1/backend/usb.c
+--- cupsys-1.2.1~/backend/usb.c	2006-04-06 20:03:32.000000000 +0000
++++ cupsys-1.2.1/backend/usb.c	2006-07-06 16:47:45.000000000 +0000
+@@ -63,7 +63,7 @@
+ void	list_devices(void);
+ int	print_device(const char *uri, const char *hostname,
+ 	             const char *resource, const char *options,
+-		     int fp, int copies, int argc, char *argv[]);
++		     int print_fd, int copies, int argc, char *argv[]);
+ 
+ 
+ /*
+@@ -108,7 +108,7 @@
+              const char *hostname,	/* I - Hostname/manufacturer */
+              const char *resource,	/* I - Resource/modelname */
+ 	     const char *options,	/* I - Device options/serial number */
+-	     int        fp,		/* I - File descriptor to print */
++	     int        print_fd,	/* I - File descriptor to print */
+ 	     int        copies,		/* I - Copies to print */
+ 	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
+ 	     char	*argv[])	/* I - Command-line arguments */
+@@ -124,7 +124,7 @@
+   (void)hostname;
+   (void)resource;
+   (void)options;
+-  (void)fp;
++  (void)print_fd;
+   (void)copies;
+   (void)argc;
+   (void)argv;
+@@ -146,7 +146,7 @@
+ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
+      char *argv[])			/* I - Command-line arguments */
+ {
+-  int		fp;			/* Print file */
++  int		print_fd;		/* Print file */
+   int		copies;			/* Number of copies to print */
+   int		status;			/* Exit status */
+   int		port;			/* Port number (not used) */
+@@ -232,8 +232,8 @@
+ 
+   if (argc == 6)
+   {
+-    fp     = 0;
+-    copies = 1;
++    print_fd = 0;
++    copies   = 1;
+   }
+   else
+   {
+@@ -241,7 +241,7 @@
+     * Try to open the print file...
+     */
+ 
+-    if ((fp = open(argv[6], O_RDONLY)) < 0)
++    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
+     {
+       fprintf(stderr, "ERROR: unable to open print file %s - %s\n",
+               argv[6], strerror(errno));
+@@ -255,14 +255,15 @@
+   * Finally, send the print file...
+   */
+ 
+-  status = print_device(uri, hostname, resource, options, fp, copies, argc, argv);
++  status = print_device(uri, hostname, resource, options, print_fd, copies,
++                        argc, argv);
+ 
+  /*
+   * Close the input file and return...
+   */
+ 
+-  if (fp != 0)
+-    close(fp);
++  if (print_fd != 0)
++    close(print_fd);
+ 
+   return (status);
+ }
+diff -urNad cupsys-1.2.1~/berkeley/lpq.c cupsys-1.2.1/berkeley/lpq.c
+--- cupsys-1.2.1~/berkeley/lpq.c	2006-03-28 16:00:17.000000000 +0000
++++ cupsys-1.2.1/berkeley/lpq.c	2006-07-06 16:47:45.000000000 +0000
+@@ -79,8 +79,6 @@
+   cups_lang_t	*language;		/* Language */
+ 
+ 
+-
+-
+  /*
+   * Check for command-line options...
+   */
+diff -urNad cupsys-1.2.1~/config-scripts/cups-compiler.m4 cupsys-1.2.1/config-scripts/cups-compiler.m4
+--- cupsys-1.2.1~/config-scripts/cups-compiler.m4	2006-05-22 01:10:11.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-compiler.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -24,22 +24,31 @@
+ 
+ dnl Clear the debugging and non-shared library options unless the user asks
+ dnl for them...
+-ARCHFLAGS=""
+ OPTIM=""
+-AC_SUBST(ARCHFLAGS)
+ AC_SUBST(OPTIM)
+ 
+ AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
+-AC_ARG_WITH(archflags, [  --with-arch="flags"     set default architecture flags ])
+-
+ AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
+ 	[if test x$enable_debug = xyes; then
+ 		OPTIM="-g"
+ 	fi])
+ 
++dnl Setup general architecture flags...
++AC_ARG_WITH(archflags, [  --with-archflags="flags"
++                          set default architecture flags ])
++
++if test -z "$with_archflags"; then
++	ARCHFLAGS=""
++else
++	ARCHFLAGS="$with_archflags"
++fi
++
++AC_SUBST(ARCHFLAGS)
++
+ dnl Setup support for separate 32/64-bit library generation...
+ AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
+-AC_ARG_WITH(arch32flags, [  --with-arch32="flags"   specifies 32-bit architecture flags])
++AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"
++                          specifies 32-bit architecture flags])
+ 
+ ARCH32FLAGS=""
+ INSTALL32=""
+@@ -56,7 +65,8 @@
+ AC_SUBST(UNINSTALL32)
+ 
+ AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
+-AC_ARG_WITH(arch64flags, [  --with-arch64="flags"   specifies 64-bit architecture flags])
++AC_ARG_WITH(arch64flags, [  --with-arch64flags="flags"
++                          specifies 64-bit architecture flags])
+ 
+ ARCH64FLAGS=""
+ INSTALL64=""
+@@ -118,17 +128,6 @@
+ 	fi
+ 
+ 	case "$uname" in
+-		Darwin*)
+-			if test -z "$with_archflags"; then
+-				if test "x`uname -m`" = xi386; then
+-					# Build universal binaries for OSX on Intel...
+-					ARCHFLAGS="-arch i386 -arch ppc"
+-				fi
+-			else
+-				ARCHFLAGS="$with_archflags"
+-			fi
+-			;;
+-
+ 		IRIX)
+ 			if test "x$enable_32bit" = xyes; then
+ 				# Build 32-bit libraries, 64-bit base...
+@@ -149,8 +148,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 
+@@ -173,8 +170,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 			;;
+@@ -202,8 +197,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 
+@@ -229,8 +222,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 			;;
+@@ -255,8 +246,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 
+@@ -279,8 +268,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 			;;
+@@ -313,8 +300,6 @@
+ 			if test -z "$with_archflags"; then
+ 				# Build portable binaries for all HP systems...
+ 				ARCHFLAGS="+DAportable"
+-			else
+-				ARCHFLAGS="$with_archflags"
+ 			fi
+ 
+ 			if test $PICFLAG = 1; then
+@@ -353,8 +338,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 
+@@ -377,8 +360,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 			;;
+@@ -386,7 +367,7 @@
+ 			# Solaris
+ 			if test -z "$OPTIM"; then
+ 				if test "x$with_optim" = x; then
+-					OPTIM="-xO4"
++					OPTIM="-xO2"
+ 				else
+ 					OPTIM="$with_optim $OPTIM"
+ 				fi
+@@ -419,8 +400,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch64flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			else
+ 				if test "x$enable_64bit" = xyes; then
+@@ -446,8 +425,6 @@
+ 					else
+ 						ARCHFLAGS="$with_arch32flags"
+ 					fi
+-				else
+-					ARCHFLAGS="$with_archflags"
+ 				fi
+ 			fi
+ 			;;
+diff -urNad cupsys-1.2.1~/config-scripts/cups-defaults.m4 cupsys-1.2.1/config-scripts/cups-defaults.m4
+--- cupsys-1.2.1~/config-scripts/cups-defaults.m4	2006-04-26 19:52:27.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-defaults.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -30,7 +30,7 @@
+ AC_SUBST(LANGUAGES)
+ 
+ dnl Default ConfigFilePerm
+-AC_ARG_WITH(config_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
++AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
+ 	CUPS_CONFIG_FILE_PERM="$withval",
+ 	if test "x$uname" = xDarwin; then
+ 		CUPS_CONFIG_FILE_PERM="644"
+@@ -41,7 +41,7 @@
+ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
+ 
+ dnl Default LogFilePerm
+-AC_ARG_WITH(log_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
++AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
+ 	CUPS_LOG_FILE_PERM="$withval",
+ 	CUPS_LOG_FILE_PERM="644")
+ AC_SUBST(CUPS_LOG_FILE_PERM)
+@@ -59,7 +59,7 @@
+ AC_SUBST(CUPS_BROWSING)
+ 
+ dnl Default BrowseLocalProtocols
+-AC_ARG_WITH(browse_local, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
++AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
+ 	CUPS_BROWSE_LOCAL_PROTOCOLS="$withval",
+ 	CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS")
+ AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
+@@ -67,7 +67,7 @@
+ 	"$CUPS_BROWSE_LOCAL_PROTOCOLS")
+ 
+ dnl Default BrowseRemoteProtocols
+-AC_ARG_WITH(browse_remote, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
++AC_ARG_WITH(remote_protocols, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
+ 	CUPS_BROWSE_REMOTE_PROTOCOLS="$withval",
+ 	CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS")
+ AC_SUBST(CUPS_BROWSE_REMOTE_PROTOCOLS)
+@@ -130,7 +130,7 @@
+ AC_SUBST(CUPS_USE_NETWORK_DEFAULT)
+ 
+ dnl Determine the correct username and group for this OS...
+-AC_ARG_WITH(cups-user, [  --with-cups-user        set default user for CUPS],
++AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
+ 	CUPS_USER="$withval",
+ 	AC_MSG_CHECKING(for default print user)
+ 	if test -f /etc/passwd; then
+@@ -152,7 +152,7 @@
+ 		AC_MSG_RESULT(no password file, using "$CUPS_USER")
+ 	fi)
+ 
+-AC_ARG_WITH(cups-group, [  --with-cups-group       set default group for CUPS],
++AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
+ 	CUPS_GROUP="$withval",
+ 	AC_MSG_CHECKING(for default print group)
+ 	if test -f /etc/group; then
+@@ -175,7 +175,7 @@
+ 		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
+ 	fi)
+ 
+-AC_ARG_WITH(system-groups, [  --with-system-groups    set default system groups for CUPS],
++AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
+ 	CUPS_SYSTEM_GROUPS="$withval",
+ 	if test x$uname = xDarwin; then
+ 		GROUP_LIST="admin"
+@@ -221,13 +221,25 @@
+ dnl Default printcap file...
+ AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
+ 	default_printcap="$withval",
+-	default_printcap="/etc/printcap")
++	default_printcap="default")
+ 
+ if test x$enable_printcap != xno -a x$default_printcap != xno; then
+-	if test "x$default_printcap" = "x/etc/printcap" -a "$uname" = "Darwin" -a $uversion -ge 90; then
+-		CUPS_DEFAULT_PRINTCAP=""
+-	else
+-		CUPS_DEFAULT_PRINTCAP="$default_printcap"
++	if test "x$default_printcap" = "xdefault"; then
++		case $uname in
++			Darwin*)
++				if test $uversion -ge 90; then
++					CUPS_DEFAULT_PRINTCAP=""
++				else
++					CUPS_DEFAULT_PRINTCAP="/etc/printcap"
++				fi
++				;;
++			SunOS*)
++				CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
++				;;
++			*)
++				CUPS_DEFAULT_PRINTCAP="/etc/printcap"
++				;;
++		esac
+ 	fi
+ else
+ 	CUPS_DEFAULT_PRINTCAP=""
+diff -urNad cupsys-1.2.1~/config-scripts/cups-image.m4 cupsys-1.2.1/config-scripts/cups-image.m4
+--- cupsys-1.2.1~/config-scripts/cups-image.m4	2006-04-26 19:52:27.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-image.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -38,10 +38,6 @@
+ 
+ AC_SUBST(IMGFILTERS)
+ 
+-dnl Save the current libraries since we don't want the image libraries
+-dnl included with every program...
+-SAVELIBS="$LIBS"
+-
+ dnl Check for image libraries...
+ AC_ARG_ENABLE(jpeg, [  --enable-jpeg           turn on JPEG support, default=yes])
+ AC_ARG_ENABLE(png, [  --enable-png            turn on PNG support, default=yes])
+@@ -57,6 +53,14 @@
+ AC_SUBST(LIBTIFF)
+ AC_SUBST(LIBZ)
+ 
++dnl Image libraries use math library functions...
++AC_SEARCH_LIBS(pow, m)
++
++dnl Save the current libraries since we don't want the image libraries
++dnl included with every program...
++SAVELIBS="$LIBS"
++
++dnl JPEG library...
+ if test x$enable_jpeg != xno; then
+     AC_CHECK_HEADER(jpeglib.h,
+ 	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+@@ -67,24 +71,24 @@
+     AC_MSG_NOTICE([JPEG support disabled with --disable-jpeg.])
+ fi
+ 
++dnl ZLIB library...
+ AC_CHECK_HEADER(zlib.h,
+     AC_CHECK_LIB(z, gzgets,
+ 	AC_DEFINE(HAVE_LIBZ)
+ 	LIBZ="-lz"
+ 	LIBS="$LIBS -lz"))
+ 
+-dnl PNG library uses math library functions...
+-AC_CHECK_LIB(m, pow)
+-
++dnl PNG library...
+ if test x$enable_png != xno; then
+     AC_CHECK_HEADER(png.h,
+ 	AC_CHECK_LIB(png, png_create_read_struct,
+ 	    AC_DEFINE(HAVE_LIBPNG)
+-	    LIBPNG="-lpng -lm"))
++	    LIBPNG="-lpng"))
+ else
+     AC_MSG_NOTICE([PNG support disabled with --disable-png.])
+ fi
+ 
++dnl TIFF library...
+ if test x$enable_tiff != xno; then
+     AC_CHECK_HEADER(tiff.h,
+ 	AC_CHECK_LIB(tiff, TIFFReadScanline,
+diff -urNad cupsys-1.2.1~/config-scripts/cups-network.m4 cupsys-1.2.1/config-scripts/cups-network.m4
+--- cupsys-1.2.1~/config-scripts/cups-network.m4	2006-04-26 19:52:27.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-network.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -46,7 +46,7 @@
+ 	maxfiles=4096
+ fi
+ 
+-AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
++AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler (deprecated) ],
+ 	maxfiles=$withval)
+ 
+ AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
+diff -urNad cupsys-1.2.1~/config-scripts/cups-sharedlibs.m4 cupsys-1.2.1/config-scripts/cups-sharedlibs.m4
+--- cupsys-1.2.1~/config-scripts/cups-sharedlibs.m4	2006-05-22 15:34:01.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-sharedlibs.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -117,7 +117,7 @@
+ 	# rather than to the executables.  This makes things smaller if you
+ 	# are using any static libraries, and it also allows us to distribute
+ 	# a single DSO rather than a bunch...
+-	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
++	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+ 	IMGLIBS=""
+ 
+ 	# Tell the run-time linkers where to find a DSO.  Some platforms
+@@ -126,46 +126,46 @@
+ 	case $uname in
+                 HP-UX*)
+ 			# HP-UX needs the path, even for /usr/lib...
+-                	DSOFLAGS="+s +b \$(libdir) $DSOFLAGS"
+-                	DSO32FLAGS="+s +b \$(LIB32DIR) $DSO32FLAGS"
+-                	DSO64FLAGS="+s +b \$(LIB64DIR) $DSO64FLAGS"
+-                	LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
+-                	EXPORT_LDFLAGS="-Wl,+s,+b,\$(libdir)"
++                	DSOFLAGS="+s +b $libdir $DSOFLAGS"
++                	DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
++                	DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
++                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
++                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
+ 			;;
+                 SunOS*)
+                 	# Solaris...
+ 			if test $exec_prefix != /usr; then
+-				DSOFLAGS="-R\$(libdir) $DSOFLAGS"
+-				DSO32FLAGS="-R\$(LIB32DIR) $DSO32FLAGS"
+-				DSO64FLAGS="-R\$(LIB64DIR) $DSO64FLAGS"
+-				LDFLAGS="$LDFLAGS -R\$(libdir)"
+-				EXPORT_LDFLAGS="-R\$(libdir)"
++				DSOFLAGS="-R$libdir $DSOFLAGS"
++				DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS"
++				DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS"
++				LDFLAGS="$LDFLAGS -R$libdir"
++				EXPORT_LDFLAGS="-R$libdir"
+ 			fi
+ 			;;
+                 *BSD*)
+                         # *BSD...
+ 			if test $exec_prefix != /usr; then
+-				DSOFLAGS="-Wl,-R\$(libdir) $DSOFLAGS"
+-				DSO32FLAGS="-Wl,-R\$(LIB32DIR) $DSO32FLAGS"
+-				DSO64FLAGS="-Wl,-R\$(LIB64DIR) $DSO64FLAGS"
+-				LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
+-				EXPORT_LDFLAGS="-Wl,-R\$(libdir)"
++				DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
++				DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS"
++				DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS"
++				LDFLAGS="$LDFLAGS -Wl,-R$libdir"
++				EXPORT_LDFLAGS="-Wl,-R$libdir"
+ 			fi
+ 			;;
+                 IRIX | Linux | GNU)
+                         # IRIX, Linux, and HURD...
+ 			if test $exec_prefix != /usr; then
+-				DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
+-				DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
+-				DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
+-				LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
+-				EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
++				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
++				DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
++				DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
++				LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
++				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+ 			fi
+ 			;;
+ 	esac
+ else
+ 	DSOLIBS=""
+-	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
++	IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+ fi
+ 
+ AC_SUBST(DSOLIBS)
+diff -urNad cupsys-1.2.1~/config-scripts/cups-ssl.m4 cupsys-1.2.1/config-scripts/cups-ssl.m4
+--- cupsys-1.2.1~/config-scripts/cups-ssl.m4	2006-05-15 13:52:16.000000000 +0000
++++ cupsys-1.2.1/config-scripts/cups-ssl.m4	2006-07-06 16:47:45.000000000 +0000
+@@ -48,6 +48,7 @@
+ 		 # certificates for CUPS, so don't enable encryption on
+ 		 # /admin just yet...
+ 		 #ENCRYPTION_REQUIRED="  Encryption Required"
++		 AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
+ 		 AC_DEFINE(HAVE_SSL)
+ 		 AC_DEFINE(HAVE_CDSASSL)])
+ 	fi
+diff -urNad cupsys-1.2.1~/config.h.in cupsys-1.2.1/config.h.in
+--- cupsys-1.2.1~/config.h.in	2006-05-02 14:20:26.000000000 +0000
++++ cupsys-1.2.1/config.h.in	2006-07-06 16:47:45.000000000 +0000
+@@ -261,6 +261,13 @@
+ 
+ 
+ /*
++ * Do we have <Security/SecBasePriv.h>?
++ */
++
++#undef HAVE_SECBASEPRIV_H
++
++
++/*
+  * Do we have the SLP library?
+  */
+ 
+diff -urNad cupsys-1.2.1~/configure.in cupsys-1.2.1/configure.in
+--- cupsys-1.2.1~/configure.in	2006-04-27 13:40:30.000000000 +0000
++++ cupsys-1.2.1/configure.in	2006-07-06 16:47:45.000000000 +0000
+@@ -47,8 +47,12 @@
+ sinclude(config-scripts/cups-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
+ 
++INSTALL_LANGUAGES=""
++UNINSTALL_LANGUAGES=""
+ LANGFILES=""
+ if test "x$LANGUAGES" != x; then
++	INSTALL_LANGUAGES="install-languages"
++	UNINSTALL_LANGUAGES="uninstall-languages"
+ 	for lang in $LANGUAGES; do
+ 		LANGFILES="$LANGFILES doc/$lang/index.html"
+ 		LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
+@@ -56,6 +60,9 @@
+ 	done
+ fi
+ 
++AC_SUBST(INSTALL_LANGUAGES)
++AC_SUBST(UNINSTALL_LANGUAGES)
++
+ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
+ 	  conf/cupsd.conf conf/pam.std doc/index.html
+ 	  doc/help/standard.html man/client.conf.man
+diff -urNad cupsys-1.2.1~/cups/Makefile cupsys-1.2.1/cups/Makefile
+--- cupsys-1.2.1~/cups/Makefile	2006-05-22 00:59:11.000000000 +0000
++++ cupsys-1.2.1/cups/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -138,7 +138,7 @@
+ clean:
+ 	$(RM) $(OBJS) $(TARGETS)
+ 	$(RM) libcups.so libcups.sl libcups.dylib
+-	$(RM) -r 32bit 64it
++	$(RM) -r 32bit 64bit
+ 
+ 
+ #
+@@ -186,12 +186,12 @@
+ install32bit:
+ 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+ 	$(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
+-	$(LN) libcups.so $(LIB32DIR)/libcups.so.2
++	$(LN) libcups.so.2 $(LIB32DIR)/libcups.so
+ 
+ install64bit:
+ 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+ 	$(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
+-	$(LN) libcups.so $(LIB64DIR)/libcups.so.2
++	$(LN) libcups.so.2 $(LIB64DIR)/libcups.so
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/cups/adminutil.c cupsys-1.2.1/cups/adminutil.c
+--- cupsys-1.2.1~/cups/adminutil.c	2006-03-14 02:38:07.000000000 +0000
++++ cupsys-1.2.1/cups/adminutil.c	2006-07-06 16:47:45.000000000 +0000
+@@ -222,18 +222,18 @@
+       */
+ 
+       cupsFilePrintf(dstfp, "*%% Commented out for CUPS Windows Driver...\n"
+-                            "*%%%s", line + 1);
++                            "*%%%s\n", line + 1);
+       continue;
+     }
+     else if (!strncmp(line, "*JCLOpenUI", 10))
+     {
+       jcloption = 1;
+-      cupsFilePuts(dstfp, line);
++      cupsFilePrintf(dstfp, "%s\n", line);
+     }
+     else if (!strncmp(line, "*JCLCloseUI", 11))
+     {
+       jcloption = 0;
+-      cupsFilePuts(dstfp, line);
++      cupsFilePrintf(dstfp, "%s\n", line);
+     }
+     else if (jcloption &&
+              strncmp(line, "*End", 4) &&
+@@ -312,12 +312,13 @@
+       }
+ 
+       snprintf(ptr + 1, sizeof(line) - (ptr - line + 1),
+-               "%%cupsJobTicket: %s=%s\n\"\n*End\n", option, choice);
++               "%%cupsJobTicket: %s=%s\n\"\n*End", option, choice);
+ 
+-      cupsFilePrintf(dstfp, "*%% Changed for CUPS Windows Driver...\n%s", line);
++      cupsFilePrintf(dstfp, "*%% Changed for CUPS Windows Driver...\n%s\n",
++                     line);
+     }
+     else
+-      cupsFilePuts(dstfp, line);
++      cupsFilePrintf(dstfp, "%s\n", line);
+   }
+ 
+   cupsFileClose(srcfp);
+diff -urNad cupsys-1.2.1~/cups/http-addrlist.c cupsys-1.2.1/cups/http-addrlist.c
+--- cupsys-1.2.1~/cups/http-addrlist.c	2006-03-29 15:36:15.000000000 +0000
++++ cupsys-1.2.1/cups/http-addrlist.c	2006-07-06 16:47:45.000000000 +0000
+@@ -506,6 +506,9 @@
+ 	temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1);
+ #  endif /* WIN32 */
+ 
++        if (!first)
++          first = temp;
++
+         addr = temp;
+       }
+ 
+@@ -527,6 +530,9 @@
+ 	temp->addr.ipv4.sin_port        = htons(portnum);
+ 	temp->addr.ipv4.sin_addr.s_addr = htonl(0x7f000001);
+ 
++        if (!first)
++          first = temp;
++
+         if (addr)
+ 	  addr->next = temp;
+ 	else
+@@ -556,6 +562,9 @@
+         temp->addr.ipv6.sin6_family = AF_INET6;
+ 	temp->addr.ipv6.sin6_port   = htons(portnum);
+ 
++        if (!first)
++          first = temp;
++
+         addr = temp;
+       }
+ 
+@@ -576,6 +585,9 @@
+         temp->addr.ipv4.sin_family = AF_INET;
+ 	temp->addr.ipv4.sin_port   = htons(portnum);
+ 
++        if (!first)
++          first = temp;
++
+         if (addr)
+ 	  addr->next = temp;
+ 	else
+diff -urNad cupsys-1.2.1~/cups/http.c cupsys-1.2.1/cups/http.c
+--- cupsys-1.2.1~/cups/http.c	2006-04-17 21:24:17.000000000 +0000
++++ cupsys-1.2.1/cups/http.c	2006-07-06 16:47:45.000000000 +0000
+@@ -866,7 +866,7 @@
+       * No newline; see if there is more data to be read...
+       */
+ 
+-      if (!http->blocking && !http_wait(http, 1000))
++      if (!http->blocking && !http_wait(http, 10000))
+       {
+         DEBUG_puts("httpGets: Timed out!");
+         http->error = ETIMEDOUT;
+@@ -1222,7 +1222,7 @@
+     * Buffer small reads for better performance...
+     */
+ 
+-    if (!http->blocking && !httpWait(http, 1000))
++    if (!http->blocking && !httpWait(http, 10000))
+       return (0);
+ 
+     if (http->data_remaining > sizeof(http->buffer))
+@@ -1285,7 +1285,7 @@
+ #ifdef HAVE_SSL
+   else if (http->tls)
+   {
+-    if (!http->blocking && !httpWait(http, 1000))
++    if (!http->blocking && !httpWait(http, 10000))
+       return (0);
+ 
+     bytes = http_read_ssl(http, buffer, length);
+@@ -1293,7 +1293,7 @@
+ #endif /* HAVE_SSL */
+   else
+   {
+-    if (!http->blocking && !httpWait(http, 1000))
++    if (!http->blocking && !httpWait(http, 10000))
+       return (0);
+ 
+     DEBUG_printf(("httpRead2: reading %d bytes from socket...\n", length));
+@@ -1415,13 +1415,11 @@
+     *dataLength = 0;
+ 
+     if (bytes == 0)
+-      result = errSSLClosedAbort;
++      result = errSSLClosedGraceful;
+     else if (errno == EAGAIN)
+       result = errSSLWouldBlock;
+-    else if (errno == EPIPE)
+-      result = errSSLClosedAbort;
+     else
+-      result = errSSLInternal;
++      result = errSSLClosedAbort;
+   }
+ 
+   return result;
+@@ -1994,10 +1992,8 @@
+   
+     if (errno == EAGAIN)
+       result = errSSLWouldBlock;
+-    else if (errno == EPIPE)
+-      result = errSSLClosedAbort;
+     else
+-      result = errSSLInternal;
++      result = errSSLClosedAbort;
+   }
+ 
+   return result;
+@@ -2338,6 +2334,9 @@
+     error = SSLSetAllowsAnyRoot(conn->session, true);
+ 
+   if (!error)
++    error = SSLSetProtocolVersionEnabled(conn->session, kSSLProtocol2, false);
++
++  if (!error)
+   {
+     while ((error = SSLHandshake(conn->session)) == errSSLWouldBlock)
+       usleep(1000);
+diff -urNad cupsys-1.2.1~/cups/http.h cupsys-1.2.1/cups/http.h
+--- cupsys-1.2.1~/cups/http.h	2006-03-15 21:16:05.000000000 +0000
++++ cupsys-1.2.1/cups/http.h	2006-07-06 16:47:45.000000000 +0000
+@@ -322,6 +322,14 @@
+ 
+ typedef struct _http_s			/**** HTTP connection structure. ****/
+ {
++ /*
++  * DO NOT ACCESS MEMBERS OF THIS STRUCTURE DIRECTLY; INSTEAD, USE THE
++  * PROVIDED APIS FOR ACCESSING THE VALUES INSTEAD.
++  *
++  * This structure definition will be removed from the public headers in
++  * CUPS 1.3.
++  */
++
+   int			fd;		/* File descriptor for this socket */
+   int			blocking;	/* To block or not to block */
+   int			error;		/* Last error on read */
+diff -urNad cupsys-1.2.1~/cups/ipp.c cupsys-1.2.1/cups/ipp.c
+--- cupsys-1.2.1~/cups/ipp.c	2006-04-17 20:39:05.000000000 +0000
++++ cupsys-1.2.1/cups/ipp.c	2006-07-06 16:47:45.000000000 +0000
+@@ -2742,10 +2742,10 @@
+       if (!http->blocking)
+       {
+        /*
+-        * Wait up to 1 second for more data on non-blocking sockets...
++        * Wait up to 10 seconds for more data on non-blocking sockets...
+ 	*/
+ 
+-	if (!httpWait(http, 1000))
++	if (!httpWait(http, 10000))
+ 	{
+ 	 /*
+           * Signal no data...
+diff -urNad cupsys-1.2.1~/doc/Makefile cupsys-1.2.1/doc/Makefile
+--- cupsys-1.2.1~/doc/Makefile	2006-05-08 20:32:27.000000000 +0000
++++ cupsys-1.2.1/doc/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -200,7 +200,7 @@
+ # Install all documentation files...
+ #
+ 
+-install:	all
++install:	all $(INSTALL_LANGUAGES)
+ 	$(INSTALL_DIR) -m 755 $(DOCDIR)
+ 	for file in $(WEBPAGES); do \
+ 		$(INSTALL_MAN) $$file $(DOCDIR); \
+@@ -213,6 +213,8 @@
+ 	for file in $(WEBIMAGES) $(WEBBUTTONS); do \
+ 		$(INSTALL_MAN) $$file $(DOCDIR)/images; \
+ 	done
++
++install-languages:
+ 	for lang in $(LANGUAGES); do \
+ 		$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
+ 		if test -f $$lang/index.html; then \
+@@ -230,7 +232,7 @@
+ # Unnstall all documentation files...
+ #
+ 
+-uninstall:
++uninstall: $(UNINSTALL_LANGUAGES)
+ 	for file in $(WEBPAGES); do \
+ 		$(RM) $(DOCDIR)/$$file; \
+ 	done
+@@ -240,6 +242,11 @@
+ 	for file in $(WEBIMAGES) $(WEBBUTTONS); do \
+ 		$(INSTALL_MAN) $(DOCDIR)/images/$$file; \
+ 	done
++	-$(RMDIR) $(DOCDIR)/images
++	-$(RMDIR) $(DOCDIR)/help
++	-$(RMDIR) $(DOCDIR)
++
++uninstall-languages:
+ 	-for lang in $(LANGUAGES); do \
+ 		$(RM) $(DOCDIR)/$$lang/index.html; \
+ 		for file in $(WEBBUTTONS); do \
+@@ -248,9 +255,6 @@
+ 		$(RMDIR) $(DOCDIR)/$$lang/images; \
+ 		$(RMDIR) $(DOCDIR)/$$lang; \
+ 	done
+-	-$(RMDIR) $(DOCDIR)/images
+-	-$(RMDIR) $(DOCDIR)/help
+-	-$(RMDIR) $(DOCDIR)
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/filter/Makefile cupsys-1.2.1/filter/Makefile
+--- cupsys-1.2.1~/filter/Makefile	2006-05-22 00:59:11.000000000 +0000
++++ cupsys-1.2.1/filter/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -118,12 +118,12 @@
+ install32bit:
+ 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+ 	$(INSTALL_LIB) 32bit/libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so.2
+-	$(LN) libcupsimage.so $(LIB32DIR)/libcupsimage.so.2
++	$(LN) libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so
+ 
+ install64bit:
+ 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+ 	$(INSTALL_LIB) 64bit/libcupsimage.so.2 $(LIB64DIR)/libcupsimage.so.2
+-	$(LN) libcupsimage.so $(LIB64DIR)/libcupsimage.so.2
++	$(LN) libcupsimage.so.2 $(LIB64DIR)/libcupsimage.so
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/filter/pstops.c cupsys-1.2.1/filter/pstops.c
+--- cupsys-1.2.1~/filter/pstops.c	2006-05-22 18:31:23.000000000 +0000
++++ cupsys-1.2.1/filter/pstops.c	2006-07-06 16:47:45.000000000 +0000
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id: pstops.c 5570 2006-05-22 18:31:23Z mike $"
++ * "$Id: pstops.c 5622 2006-06-01 23:43:21Z mike $"
+  *
+  *   PostScript filter for the Common UNIX Printing System (CUPS).
+  *
+@@ -49,6 +49,7 @@
+  *   set_pstops_options() - Set pstops options...
+  *   skip_page()          - Skip past a page that won't be printed...
+  *   start_nup()          - Start processing for N-up printing...
++ *   write_labels()       - Write the actual page labels.
+  */
+ 
+ /*
+@@ -204,6 +205,7 @@
+ 				  size_t linesize);
+ static void		start_nup(pstops_doc_t *doc, int number,
+ 				  int show_border, const int *bounding_box);
++static void		write_labels(pstops_doc_t *doc, int orient);
+ 
+ 
+ /*
+@@ -1305,6 +1307,9 @@
+ 
+   if (first_page)
+   {
++    char	*page_setup;		/* PageSetup commands to send */
++
++
+     doc_puts(doc, "%%BeginPageSetup\n");
+ 
+     if (pageinfo->num_options > 0)
+@@ -1344,20 +1349,28 @@
+       */
+ 
+       if (doc_setup)
++      {
+ 	doc_puts(doc, doc_setup);
++	free(doc_setup);
++      }
+ 
+       if (any_setup)
++      {
+ 	doc_puts(doc, any_setup);
++	free(any_setup);
++      }
++    }
+ 
+-     /*
+-      * Free the command strings...
+-      */
++   /*
++    * Output commands for the current page...
++    */
+ 
+-      if (doc_setup)
+-	free(doc_setup);
++    page_setup = ppdEmitString(ppd, PPD_ORDER_PAGE, 0);
+ 
+-      if (any_setup)
+-	free(any_setup);
++    if (page_setup)
++    {
++      doc_puts(doc, page_setup);
++      free(page_setup);
+     }
+   }
+ 
+@@ -1856,15 +1869,15 @@
+         int          number)		/* I - Page number */
+ {
+   if (doc->mirror || Orientation || doc->number_up > 1)
+-    puts("userdict/ESPsave get restore");
++    doc_puts(doc, "userdict/ESPsave get restore\n");
+ 
+   switch (doc->number_up)
+   {
+     case 1 :
+ 	if (doc->use_ESPshowpage)
+ 	{
+-	  WriteLabels(Orientation);
+-          puts("ESPshowpage");
++	  write_labels(doc, Orientation);
++          doc_puts(doc, "ESPshowpage\n");
+ 	}
+ 	break;
+ 
+@@ -1878,7 +1891,7 @@
+ 	    * Rotate the labels back to portrait...
+ 	    */
+ 
+-	    WriteLabels(Orientation - 1);
++	    write_labels(doc, Orientation - 1);
+ 	  }
+ 	  else if (Orientation == 0)
+ 	  {
+@@ -1886,7 +1899,7 @@
+ 	    * Rotate the labels to landscape...
+ 	    */
+ 
+-	    WriteLabels(doc->normal_landscape ? 1 : 3);
++	    write_labels(doc, doc->normal_landscape ? 1 : 3);
+ 	  }
+ 	  else
+ 	  {
+@@ -1894,18 +1907,18 @@
+ 	    * Rotate the labels to landscape...
+ 	    */
+ 
+-	    WriteLabels(doc->normal_landscape ? 3 : 1);
++	    write_labels(doc, doc->normal_landscape ? 3 : 1);
+ 	  }
+ 
+-          puts("ESPshowpage");
++          doc_puts(doc, "ESPshowpage\n");
+ 	}
+         break;
+ 
+     default :
+ 	if (is_last_page(number) && doc->use_ESPshowpage)
+ 	{
+-	  WriteLabels(Orientation);
+-          puts("ESPshowpage");
++	  write_labels(doc, Orientation);
++          doc_puts(doc, "ESPshowpage\n");
+ 	}
+         break;
+   }
+@@ -2935,5 +2948,51 @@
+ 
+ 
+ /*
+- * End of "$Id: pstops.c 5570 2006-05-22 18:31:23Z mike $".
++ * 'write_labels()' - Write the actual page labels.
++ *
++ * This function is a copy of the one in common.c since we need to
++ * use doc_puts/doc_printf instead of puts/printf...
++ */
++
++static void
++write_labels(pstops_doc_t *doc,		/* I - Document information */
++             int          orient)	/* I - Orientation of the page */
++{
++  float	width,				/* Width of page */
++	length;				/* Length of page */
++
++
++  doc_puts(doc, "gsave\n");
++
++  if ((orient ^ Orientation) & 1)
++  {
++    width  = PageLength;
++    length = PageWidth;
++  }
++  else
++  {
++    width  = PageWidth;
++    length = PageLength;
++  }
++
++  switch (orient & 3)
++  {
++    case 1 : /* Landscape */
++        doc_printf(doc, "%.1f 0.0 translate 90 rotate\n", length);
++        break;
++    case 2 : /* Reverse Portrait */
++        doc_printf(doc, "%.1f %.1f translate 180 rotate\n", width, length);
++        break;
++    case 3 : /* Reverse Landscape */
++        doc_printf(doc, "0.0 %.1f translate -90 rotate\n", width);
++        break;
++  }
++
++  doc_puts(doc, "ESPwl\n");
++  doc_puts(doc, "grestore\n");
++}
++
++
++/*
++ * End of "$Id: pstops.c 5622 2006-06-01 23:43:21Z mike $".
+  */
+diff -urNad cupsys-1.2.1~/locale/Makefile cupsys-1.2.1/locale/Makefile
+--- cupsys-1.2.1~/locale/Makefile	2006-04-22 04:05:45.000000000 +0000
++++ cupsys-1.2.1/locale/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -51,7 +51,9 @@
+ # Install files...
+ #
+ 
+-install:	all
++install:	all $(INSTALL_LANGUAGES)
++
++install-languages:
+ 	$(INSTALL_DIR) -m 755 $(LOCALEDIR)
+ 	for loc in $(LANGUAGES) ; do \
+ 		if test -f cups_$$loc.po; then \
+@@ -65,12 +67,12 @@
+ # Uninstall files...
+ #
+ 
+-uninstall:
++uninstall: $(UNINSTALL_LANGUAGES)
++
++uninstall-languages:
+ 	-for loc in $(LANGUAGES) ; do \
+ 		$(RM) $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
+-		$(RMDIR) $(LOCALEDIR)/$$loc ; \
+ 	done
+-	-$(RMDIR) $(LOCALEDIR)
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/man/cupsd.conf.man.in cupsys-1.2.1/man/cupsd.conf.man.in
+--- cupsys-1.2.1~/man/cupsd.conf.man.in	2006-03-23 19:53:24.000000000 +0000
++++ cupsys-1.2.1/man/cupsd.conf.man.in	2006-07-06 16:47:45.000000000 +0000
+@@ -21,7 +21,7 @@
+ .\"       EMail: cups-info@cups.org
+ .\"         WWW: http://www.cups.org
+ .\"
+-.TH cupsd.conf 5 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
++.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Easy Software Products"
+ .SH NAME
+ cupsd.conf \- server configuration file for cups
+ .SH DESCRIPTION
+@@ -367,8 +367,10 @@
+ Listen ip-address:port
+ .TP 5
+ Listen *:port
++.TP 5
++Listen /path/to/domain/socket
+ .br
+-Listens to the specified address and port.
++Listens to the specified address and port or domain socket path.
+ .TP 5
+ <Location /path> ... </Location>
+ .br
+diff -urNad cupsys-1.2.1~/packaging/cups.list.in cupsys-1.2.1/packaging/cups.list.in
+--- cupsys-1.2.1~/packaging/cups.list.in	2006-04-30 16:27:50.000000000 +0000
++++ cupsys-1.2.1/packaging/cups.list.in	2006-07-06 16:47:45.000000000 +0000
+@@ -270,7 +270,7 @@
+ f 0755 root sys $BINDIR/cupstestppd systemv/cupstestppd
+ f 0755 root sys $BINDIR/lp systemv/lp
+ f 0755 root sys $BINDIR/lpoptions systemv/lpoptions
+-f 4755 $CUPS_USER sys $BINDIR/lppasswd systemv/lppasswd
++f 4755 root sys $BINDIR/lppasswd systemv/lppasswd
+ f 0755 root sys $BINDIR/lpq berkeley/lpq
+ f 0755 root sys $BINDIR/lpr berkeley/lpr
+ f 0755 root sys $BINDIR/lprm berkeley/lprm
+@@ -342,7 +342,7 @@
+ %subpackage ja
+ f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+ %subpackage pl
+-#f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
++f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
+ %subpackage sv
+ f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
+ %subpackage
+diff -urNad cupsys-1.2.1~/packaging/cups.spec.in cupsys-1.2.1/packaging/cups.spec.in
+--- cupsys-1.2.1~/packaging/cups.spec.in	2006-04-22 04:05:45.000000000 +0000
++++ cupsys-1.2.1/packaging/cups.spec.in	2006-07-06 16:47:45.000000000 +0000
+@@ -399,7 +399,7 @@
+ /usr/share/doc/cups/pl/images/*
+ %dir /usr/share/cups/templates/pl
+ /usr/share/cups/templates/pl/*
+-#/usr/share/locale/pl/cups_pl.po
++/usr/share/locale/pl/cups_pl.po
+ 
+ %files sv
+ %defattr(-,root,root)
+diff -urNad cupsys-1.2.1~/scheduler/auth.c cupsys-1.2.1/scheduler/auth.c
+--- cupsys-1.2.1~/scheduler/auth.c	2006-05-22 15:34:01.000000000 +0000
++++ cupsys-1.2.1/scheduler/auth.c	2006-07-06 16:47:45.000000000 +0000
+@@ -869,9 +869,12 @@
+ 	    */
+ 
+ 	    for (iface = (cupsd_netif_t *)cupsArrayFirst(NetIFList);
+-	         iface && !strcmp(masks->mask.name.name, iface->name);
++	         iface;
+ 		 iface = (cupsd_netif_t *)cupsArrayNext(NetIFList))
+ 	    {
++              if (strcmp(masks->mask.name.name, iface->name))
++                continue;
++
+               if (iface->address.addr.sa_family == AF_INET)
+ 	      {
+ 	       /*
+diff -urNad cupsys-1.2.1~/scheduler/client.c cupsys-1.2.1/scheduler/client.c
+--- cupsys-1.2.1~/scheduler/client.c	2006-05-22 15:34:01.000000000 +0000
++++ cupsys-1.2.1/scheduler/client.c	2006-07-06 16:47:45.000000000 +0000
+@@ -54,6 +54,11 @@
+ 
+ #ifdef HAVE_CDSASSL
+ #  include <Security/Security.h>
++#  ifdef HAVE_SECBASEPRIV_H
++#    include <Security/SecBasePriv.h>
++#  else
++     extern const char *cssmErrorString(int error);
++#  endif /* HAVE_SECBASEPRIV_H */
+ #endif /* HAVE_CDSASSL */
+ #ifdef HAVE_GNUTLS
+ #  include <gnutls/x509.h>
+@@ -1882,24 +1887,27 @@
+ 
+ 
+   if (con->filename)
++  {
+     fd = open(con->filename, O_RDONLY);
+-  else
+-    fd = open("/dev/null", O_RDONLY);
+ 
+-  if (fd < 0)
+-  {
+-    cupsdLogMessage(CUPSD_LOG_ERROR,
+-                    "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
+-                    con->http.fd, con->filename ? con->filename : "/dev/null",
+-	            strerror(errno));
+-    return (0);
+-  }
++    if (fd < 0)
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++                      "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s",
++                      con->http.fd, con->filename ? con->filename : "/dev/null",
++	              strerror(errno));
++      return (0);
++    }
+ 
+-  fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
++    fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
++  }
++  else
++    fd = -1;
+ 
+   con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root);
+ 
+-  close(fd);
++  if (fd >= 0)
++    close(fd);
+ 
+   cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command,
+                   con->pipe_pid);
+@@ -2659,7 +2667,7 @@
+     error = SSLSetIOFuncs(conn->session, _httpReadCDSA, _httpWriteCDSA);
+ 
+   if (!error)
+-    error = SSLSetProtocolVersion(conn->session, kSSLProtocol3);
++    error = SSLSetProtocolVersionEnabled(conn->session, kSSLProtocol2, false);
+ 
+   if (!error)
+   {
+@@ -2697,8 +2705,8 @@
+                     "encrypt_client: Unable to encrypt connection from %s!",
+                     con->http.hostname);
+ 
+-    cupsdLogMessage(CUPSD_LOG_ERROR,
+-                    "encrypt_client: CDSA error code is %d", (int)error);
++    cupsdLogMessage(CUPSD_LOG_ERROR, "encrypt_client: %s (%d)",
++                    cssmErrorString(error), (int)error);
+ 
+     con->http.error  = error;
+     con->http.status = HTTP_ERROR;
+diff -urNad cupsys-1.2.1~/scheduler/conf.c cupsys-1.2.1/scheduler/conf.c
+--- cupsys-1.2.1~/scheduler/conf.c	2006-05-02 18:13:40.000000000 +0000
++++ cupsys-1.2.1/scheduler/conf.c	2006-07-06 16:47:45.000000000 +0000
+@@ -289,6 +289,11 @@
+   cupsdSetString(&ServerHeader, "CUPS/1.2");
+   cupsdSetString(&StateDir, CUPS_STATEDIR);
+ 
++  if (!strcmp(CUPS_DEFAULT_PRINTCAP, "/etc/printers.conf"))
++    PrintcapFormat = PRINTCAP_SOLARIS;
++  else
++    PrintcapFormat = PRINTCAP_BSD;
++
+   strlcpy(temp, ConfigurationFile, sizeof(temp));
+   if ((slash = strrchr(temp, '/')) != NULL)
+     *slash = '\0';
+@@ -1277,33 +1282,14 @@
+   const char	*maskval,		/* Pointer to start of mask value */
+ 		*ptr,			/* Pointer into value */
+ 		*ptr2;			/* ... */
+-  static unsigned netmasks[4][4] =	/* Standard IPv4 netmasks... */
+-  {
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xffff0000 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff }
+-  };
+-#ifdef AF_INET6
+-  static unsigned netmasks6[8][4] =	/* Standard IPv6 netmasks... */
+-  {
+-    { 0xffff0000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0xffffffff, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0xffffffff, 0xffff0000, 0x00000000, 0x00000000 },
+-    { 0xffffffff, 0xffffffff, 0x00000000, 0x00000000 },
+-    { 0xffffffff, 0xffffffff, 0xffff0000, 0x00000000 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xffff0000 },
+-    { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff }
+-  };
+-#endif /* AF_INET6 */
+ 
+ 
+  /*
+   * Get the address...
+   */
+ 
+-  memset(ip, 0, sizeof(unsigned) * 4);
++  ip[0]   = ip[1]   = ip[2]   = ip[2]   = 0x00000000;
++  mask[0] = mask[1] = mask[2] = mask[3] = 0xffffffff;
+ 
+   if ((maskval = strchr(value, '/')) != NULL)
+     maskval ++;
+@@ -1334,6 +1320,7 @@
+ 	     ptr2 = strchr(ptr2 + 1, ':'), j ++);
+ 
+         i = 7 - j;
++	ptr ++;
+       }
+       else if (isxdigit(*ptr & 255))
+       {
+@@ -1343,9 +1330,9 @@
+ 	  return (0);
+ 
+         if (i & 1)
+-          ip[i] |= ipval;
++          ip[i / 2] |= ipval;
+ 	else
+-          ip[i] |= ipval << 16;
++          ip[i / 2] |= ipval << 16;
+       }
+       else
+         return (0);
+@@ -1354,7 +1341,10 @@
+         ptr ++;
+     }
+ 
+-    ipcount = i;
++    if (*ptr != ']')
++      return (0);
++
++    ptr ++;
+ 
+     if (*ptr && *ptr != '/')
+       return (0);
+@@ -1371,6 +1361,9 @@
+ 
+     ip[3] |= ((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8;
+     ip[0] = ip[1] = ip[2] = 0;
++
++    if (ipcount < 4)
++      mask[3] = (0xffffffff << (32 - 8 * ipcount)) & 0xffffffff;
+   }
+ 
+   if (*maskval)
+@@ -1381,55 +1374,15 @@
+ 
+     memset(mask, 0, sizeof(unsigned) * 4);
+ 
+-#ifdef AF_INET6
+-    if (*maskval == '[')
+-    {
+-     /*
+-      * Get hexadecimal mask value...
+-      */
+-
+-      for (i = 0, ptr = maskval + 1; *ptr && i < 8; i ++)
+-      {
+-	if (*ptr == ']')
+-	  break;
+-	else if (!strncmp(ptr, "::", 2))
+-	{
+-          for (ptr2 = strchr(ptr + 2, ':'), j = 0;
+-	       ptr2;
+-	       ptr2 = strchr(ptr2 + 1, ':'), j ++);
+-
+-          i = 7 - j;
+-	}
+-	else if (isxdigit(*ptr & 255))
+-	{
+-          ipval = strtoul(ptr, (char **)&ptr, 16);
+-
+-	  if (ipval > 0xffff)
+-	    return (0);
+-
+-          if (i & 1)
+-            mask[i] |= ipval;
+-	  else
+-            mask[i] |= ipval << 16;
+-	}
+-	else
+-          return (0);
+-
+-        while (*ptr == ':')
+-          ptr ++;
+-      }
+-
+-      if (*ptr)
+-	return (0);
+-    }
+-    else
+-#endif /* AF_INET6 */
+     if (strchr(maskval, '.'))
+     {
+      /*
+       * Get dotted-decimal mask...
+       */
+ 
++      if (family != AF_INET)
++        return (0);
++
+       if (sscanf(maskval, "%u.%u.%u.%u", mask + 0, mask + 1, mask + 2, mask + 3) != 4)
+         return (0);
+ 
+@@ -1447,6 +1400,9 @@
+ #ifdef AF_INET6
+       if (family == AF_INET6)
+       {
++        if (i > 128)
++	  return (0);
++
+         i = 128 - i;
+ 
+ 	if (i <= 96)
+@@ -1478,25 +1434,20 @@
+       else
+ #endif /* AF_INET6 */
+       {
+-        i = 32 - i;
++        if (i > 32)
++	  return (0);
+ 
+         mask[0] = 0xffffffff;
+         mask[1] = 0xffffffff;
+         mask[2] = 0xffffffff;
+ 
+-	if (i > 0)
+-          mask[3] = (0xffffffff << i) & 0xffffffff;
++	if (i < 32)
++          mask[3] = (0xffffffff << (32 - i)) & 0xffffffff;
+ 	else
+ 	  mask[3] = 0xffffffff;
+       }
+     }
+   }
+-#ifdef AF_INET6
+-  else if (family == AF_INET6)
+-    memcpy(mask, netmasks6[ipcount - 1], sizeof(unsigned) * 4);
+-#endif /* AF_INET6 */
+-  else
+-    memcpy(mask, netmasks[ipcount - 1], sizeof(unsigned) * 4);
+ 
+   cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                   "get_addr_and_mask(value=\"%s\", "
+@@ -1634,7 +1585,12 @@
+       else
+ 	cupsdDenyIP(loc, ones, zeros);
+     }
++#ifdef AF_INET6
++    else if (value[0] == '*' || value[0] == '.' || 
++             (!isdigit(value[0] & 255) && value[0] != '['))
++#else
+     else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
++#endif /* AF_INET6 */
+     {
+      /*
+       * Host or domain name...
+@@ -2406,7 +2362,12 @@
+ 	  else
+ 	    cupsdDenyIP(location, ones, zeros);
+ 	}
+-	else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0]))
++#ifdef AF_INET6
++	else if (value[0] == '*' || value[0] == '.' || 
++        	 (!isdigit(value[0] & 255) && value[0] != '['))
++#else
++	else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
++#endif /* AF_INET6 */
+ 	{
+ 	 /*
+           * Host or domain name...
+@@ -2490,7 +2451,12 @@
+       *    nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
+       */
+ 
+-      if (value[0] == '*' || value[0] == '.' || !isdigit(value[0]))
++#ifdef AF_INET6
++      if (value[0] == '*' || value[0] == '.' || 
++          (!isdigit(value[0] & 255) && value[0] != '['))
++#else
++      if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
++#endif /* AF_INET6 */
+       {
+        /*
+         * Host or domain name...
+diff -urNad cupsys-1.2.1~/scheduler/dirsvc.c cupsys-1.2.1/scheduler/dirsvc.c
+--- cupsys-1.2.1~/scheduler/dirsvc.c	2006-05-19 19:39:28.000000000 +0000
++++ cupsys-1.2.1/scheduler/dirsvc.c	2006-07-06 16:47:45.000000000 +0000
+@@ -36,6 +36,7 @@
+  *   cupsdStopPolling()            - Stop polling servers as needed.
+  *   cupsdUpdateCUPSBrowse()       - Update the browse lists using the CUPS
+  *                                   protocol.
++ *   cupsdUpdateLDAPBrowse()       - Scan for new printers via LDAP...
+  *   cupsdUpdatePolling()          - Read status messages from the poll daemons.
+  *   cupsdUpdateSLPBrowse()        - Get browsing information via SLP.
+  *   dequote()                     - Remote quotes from a string.
+@@ -1526,39 +1527,57 @@
+   * Loop through the available printers...
+   */
+ 
+-  if ((e = ldap_first_entry(BrowseLDAPHandle, res)) == NULL)
++  for (e = ldap_first_entry(BrowseLDAPHandle, res);
++       e;
++       e = ldap_next_entry(BrowseLDAPHandle, e))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get LDAP printer entry!");
+-    return;
+-  }
++   /*
++    * Get the required values from this entry...
++    */
++
++    if ((value = ldap_get_values(BrowseLDAPHandle, e,
++                                 "printerDescription")) == NULL)
++      continue;
+ 
+-  while (e)
+-  {
+-    value = ldap_get_values(BrowseLDAPHandle, e, "printerDescription");
+     strlcpy(info, *value, sizeof(info));
+     ldap_value_free(value);
+ 
+-    value = ldap_get_values(BrowseLDAPHandle, e, "printerLocation");
++    if ((value = ldap_get_values(BrowseLDAPHandle, e,
++                                 "printerLocation")) == NULL)
++      continue;
++
+     strlcpy(location, *value, sizeof(location));
+     ldap_value_free(value);
+ 
+-    value = ldap_get_values(BrowseLDAPHandle, e, "printerMakeAndModel");
++    if ((value = ldap_get_values(BrowseLDAPHandle, e,
++                                 "printerMakeAndModel")) == NULL)
++      continue;
++
+     strlcpy(make_model, *value, sizeof(make_model));
+     ldap_value_free(value);
+ 
+-    value = ldap_get_values(BrowseLDAPHandle, e, "printerType");
++    if ((value = ldap_get_values(BrowseLDAPHandle, e,
++                                 "printerType")) == NULL)
++      continue;
++
+     type = atoi(*value);
+     ldap_value_free(value);
+ 
+-    value = ldap_get_values(BrowseLDAPHandle, e, "printerURI");
++    if ((value = ldap_get_values(BrowseLDAPHandle, e,
++                                 "printerURI")) == NULL)
++      continue;
++
+     strlcpy(uri, *value, sizeof(uri));
+     ldap_value_free(value);
+ 
++   /*
++    * Process the entry as browse data...
++    */
++
+     if (!is_local_queue(uri, host, sizeof(host), resource, sizeof(resource)))
+       process_browse_data(uri, host, resource, type, IPP_PRINTER_IDLE,
+                           location, info, make_model, 0, NULL);
+ 
+-    e = ldap_next_entry(BrowseLDAPHandle, e);
+   }
+ }
+ #endif /* HAVE_OPENLDAP */
+@@ -2660,13 +2679,13 @@
+ 
+   sprintf(typestring, "%u", p->type);
+ 
+-  cn_value[0]   = p->info;
++  cn_value[0]   = p->name;
+   cn_value[1]   = NULL;
+-  info[0]       = p->info;
++  info[0]       = p->info ? p->info : "Unknown";
+   info[1]       = NULL;
+-  location[0]   = p->location;
++  location[0]   = p->location ? p->location : "Unknown";
+   location[1]   = NULL;
+-  make_model[0] = p->make_model;
++  make_model[0] = p->make_model ? p->make_model : "Unknown";
+   make_model[1] = NULL;
+   type[0]       = typestring;
+   type[1]       = NULL;
+@@ -2674,7 +2693,7 @@
+   uri[1]        = NULL;
+ 
+   snprintf(filter, sizeof(filter),
+-           "(&(objectclass=cupsPrinter)(printerDescription~=%s))", p->info);
++           "(&(objectclass=cupsPrinter)(printerURI=%s))", p->uri);
+ 
+   ldap_search_s(BrowseLDAPHandle, BrowseLDAPDN, LDAP_SCOPE_SUBTREE,
+                 filter, (char **)ldap_attrs, 0, &res);
+@@ -2696,7 +2715,7 @@
+   mods[6].mod_type = "objectClass";
+   mods[6].mod_values = (char **)objectClass_values;
+ 
+-  snprintf(dn, sizeof(dn), "cn=%s,ou=printers,%s", p->info, BrowseLDAPDN);
++  snprintf(dn, sizeof(dn), "cn=%s,ou=printers,%s", p->name, BrowseLDAPDN);
+   cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: dn=\"%s\"", dn);
+ 
+   if (ldap_count_entries(BrowseLDAPHandle, res) > 0)
+@@ -2724,7 +2743,7 @@
+   else 
+   {
+    /*
+-    * Printer has already been registered, modify the current
++    * Printer has never been registered, add the current
+     * registration...
+     */
+ 
+@@ -2734,11 +2753,11 @@
+     for (i = 0; i < 7; i ++)
+     {
+       pmods[i]         = mods + i;
+-      pmods[i]->mod_op = LDAP_MOD_REPLACE;
++      pmods[i]->mod_op = LDAP_MOD_ADD;
+     }
+     pmods[i] = NULL;
+ 
+-    if ((rc = ldap_modify_s(BrowseLDAPHandle, dn, pmods)) != LDAP_SUCCESS)
++    if ((rc = ldap_add_s(BrowseLDAPHandle, dn, pmods)) != LDAP_SUCCESS)
+       cupsdLogMessage(CUPSD_LOG_ERROR,
+                       "LDAP add for %s failed with status %d: %s",
+                       p->name, rc, ldap_err2string(rc));
+diff -urNad cupsys-1.2.1~/scheduler/filter.c cupsys-1.2.1/scheduler/filter.c
+--- cupsys-1.2.1~/scheduler/filter.c	2006-05-05 16:33:57.000000000 +0000
++++ cupsys-1.2.1/scheduler/filter.c	2006-07-06 16:47:45.000000000 +0000
+@@ -346,6 +346,8 @@
+     * any...)
+     */
+ 
++    tempcost += current->cost;
++
+     if (tempcost < mincost)
+     {
+       cupsArrayDelete(mintemp);
+@@ -356,7 +358,7 @@
+       */
+ 
+       mintemp = temp;
+-      mincost = tempcost + current->cost;
++      mincost = tempcost;
+       cupsArrayInsert(mintemp, current);
+     }
+     else
+diff -urNad cupsys-1.2.1~/scheduler/job.c cupsys-1.2.1/scheduler/job.c
+--- cupsys-1.2.1~/scheduler/job.c	2006-05-18 21:00:56.000000000 +0000
++++ cupsys-1.2.1/scheduler/job.c	2006-07-06 16:47:45.000000000 +0000
+@@ -3090,28 +3090,6 @@
+   job->status = 0;
+   memset(job->filters, 0, sizeof(job->filters));
+ 
+-  filterfds[1][0] = open("/dev/null", O_RDONLY);
+-
+-  if (filterfds[1][0] < 0)
+-  {
+-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
+-                    strerror(errno));
+-    snprintf(printer->state_message, sizeof(printer->state_message),
+-             "Unable to open \"/dev/null\" - %s.", strerror(errno));
+-
+-    cupsdAddPrinterHistory(printer);
+-
+-    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+-                  "Job canceled because the server could not open /dev/null.");
+-
+-    goto abort_job;
+-  }
+-
+-  fcntl(filterfds[1][0], F_SETFD, fcntl(filterfds[1][0], F_GETFD) | FD_CLOEXEC);
+-
+-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: filterfds[%d] = [ %d %d ]",
+-                  1, filterfds[1][0], filterfds[1][1]);
+-
+   for (i = 0, slot = 0, filter = (mime_filter_t *)cupsArrayFirst(filters);
+        filter;
+        i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
+@@ -3165,36 +3143,43 @@
+ 	else
+ 	{
+ 	  job->print_pipes[0] = -1;
+-	  if (!strncmp(printer->device_uri, "file:/dev/", 10) &&
+-	      strcmp(printer->device_uri, "file:/dev/null"))
+-	    job->print_pipes[1] = open(printer->device_uri + 5,
+-	                               O_WRONLY | O_EXCL);
+-	  else if (!strncmp(printer->device_uri, "file:///dev/", 12) &&
+-	           strcmp(printer->device_uri, "file:///dev/null"))
+-	    job->print_pipes[1] = open(printer->device_uri + 7,
+-	                               O_WRONLY | O_EXCL);
++	  if (!strcmp(printer->device_uri, "file:/dev/null") ||
++	      !strcmp(printer->device_uri, "file:///dev/null"))
++	    job->print_pipes[1] = -1;
+ 	  else
+-	    job->print_pipes[1] = open(printer->device_uri + 5,
+-	                               O_WRONLY | O_CREAT | O_TRUNC, 0600);
+-
+-	  if (job->print_pipes[1] < 0)
+ 	  {
+-            cupsdLogMessage(CUPSD_LOG_ERROR,
+-	                    "Unable to open output file \"%s\" - %s.",
+-	                    printer->device_uri, strerror(errno));
+-            snprintf(printer->state_message, sizeof(printer->state_message),
+-		     "Unable to open output file \"%s\" - %s.",
+-	             printer->device_uri, strerror(errno));
++	    if (!strncmp(printer->device_uri, "file:/dev/", 10))
++	      job->print_pipes[1] = open(printer->device_uri + 5,
++	                        	 O_WRONLY | O_EXCL);
++	    else if (!strncmp(printer->device_uri, "file:///dev/", 12))
++	      job->print_pipes[1] = open(printer->device_uri + 7,
++	                        	 O_WRONLY | O_EXCL);
++	    else if (!strncmp(printer->device_uri, "file:///", 8))
++	      job->print_pipes[1] = open(printer->device_uri + 7,
++	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
++	    else
++	      job->print_pipes[1] = open(printer->device_uri + 5,
++	                        	 O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ 
+-	    cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+-                	  "Job canceled because the server could not open the "
+-			  "output file.");
++	    if (job->print_pipes[1] < 0)
++	    {
++              cupsdLogMessage(CUPSD_LOG_ERROR,
++	                      "Unable to open output file \"%s\" - %s.",
++	                      printer->device_uri, strerror(errno));
++              snprintf(printer->state_message, sizeof(printer->state_message),
++		       "Unable to open output file \"%s\" - %s.",
++	               printer->device_uri, strerror(errno));
+ 
+-            goto abort_job;
+-	  }
++	      cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
++                	    "Job canceled because the server could not open the "
++			    "output file.");
+ 
+-	  fcntl(job->print_pipes[1], F_SETFD,
+-        	fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
++              goto abort_job;
++	    }
++
++	    fcntl(job->print_pipes[1], F_SETFD,
++        	  fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC);
++          }
+ 	}
+ 
+ 	cupsdLogMessage(CUPSD_LOG_DEBUG2,
+@@ -3274,25 +3259,7 @@
+       argv[0] = sani_uri;
+ 
+       filterfds[slot][0] = -1;
+-      filterfds[slot][1] = open("/dev/null", O_WRONLY);
+-
+-      if (filterfds[slot][1] < 0)
+-      {
+-	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.",
+-	                strerror(errno));
+-	snprintf(printer->state_message, sizeof(printer->state_message),
+-        	 "Unable to open \"/dev/null\" - %s.", strerror(errno));
+-
+-	cupsdAddPrinterHistory(printer);
+-
+-	cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job,
+-                      "Job canceled because the server could not open a file.");
+-
+-        goto abort_job;
+-      }
+-
+-      fcntl(filterfds[slot][1], F_SETFD,
+-            fcntl(filterfds[slot][1], F_GETFD) | FD_CLOEXEC);
++      filterfds[slot][1] = -1;
+ 
+       cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: backend=\"%s\"",
+                       command);
+diff -urNad cupsys-1.2.1~/scheduler/main.c cupsys-1.2.1/scheduler/main.c
+--- cupsys-1.2.1~/scheduler/main.c	2006-05-04 20:53:35.000000000 +0000
++++ cupsys-1.2.1/scheduler/main.c	2006-07-06 16:47:45.000000000 +0000
+@@ -357,8 +357,8 @@
+ 
+   getrlimit(RLIMIT_NOFILE, &limit);
+ 
+-  if (limit.rlim_max > CUPS_MAX_FDS)
+-    MaxFDs = CUPS_MAX_FDS;
++  if (limit.rlim_max > FD_SETSIZE)
++    MaxFDs = FD_SETSIZE;
+   else
+     MaxFDs = limit.rlim_max;
+ 
+diff -urNad cupsys-1.2.1~/scheduler/mime.c cupsys-1.2.1/scheduler/mime.c
+--- cupsys-1.2.1~/scheduler/mime.c	2006-05-05 17:58:07.000000000 +0000
++++ cupsys-1.2.1/scheduler/mime.c	2006-07-06 16:47:45.000000000 +0000
+@@ -51,6 +51,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ 
++#include <cups/debug.h>
+ #include <cups/dir.h>
+ #include <cups/string.h>
+ #include "mime.h"
+@@ -486,6 +487,8 @@
+   if ((fp = cupsFileOpen(filename, "r")) == NULL)
+     return;
+ 
++  DEBUG_printf(("\"%s\":\n", filename));
++
+  /*
+   * Then read each line from the file, skipping any comments in the file...
+   */
+@@ -496,6 +499,8 @@
+     * Skip blank lines and lines starting with a #...
+     */
+ 
++    DEBUG_puts(line);
++
+     if (!line[0] || line[0] == '#')
+       continue;
+ 
+@@ -544,7 +549,10 @@
+       continue;
+ 
+     if ((dsttype = mimeType(mime, super, type)) == NULL)
++    {
++      DEBUG_printf(("    Destination type %s/%s not found!\n", super, type));
+       continue;
++    }
+ 
+    /*
+     * Then get the cost and filter program...
+@@ -575,7 +583,10 @@
+       */
+ 
+       if (!add_fcache(filtercache, filter, filterpath))
++      {
++        DEBUG_printf(("    Filter %s not found in %s!\n", filter, filterpath)); 
+         continue;
++      }
+     }
+ 
+    /*
+@@ -655,6 +666,8 @@
+   if ((fp = cupsFileOpen(filename, "r")) == NULL)
+     return;
+ 
++  DEBUG_printf(("\"%s\":\n", filename));
++
+  /*
+   * Then read each line from the file, skipping any comments in the file...
+   */
+@@ -665,6 +678,8 @@
+     * Skip blank lines and lines starting with a #...
+     */
+ 
++    DEBUG_puts(line);
++
+     if (!line[0] || line[0] == '#')
+       continue;
+ 
+diff -urNad cupsys-1.2.1~/scheduler/testmime.c cupsys-1.2.1/scheduler/testmime.c
+--- cupsys-1.2.1~/scheduler/testmime.c	2006-05-16 19:47:26.000000000 +0000
++++ cupsys-1.2.1/scheduler/testmime.c	2006-07-06 16:47:45.000000000 +0000
+@@ -71,7 +71,7 @@
+   mime        = NULL;
+   src         = NULL;
+   dst         = NULL;
+-  filter_path = "../filter:../pdftops";
++  filter_path = "../filter:../pdftops:" CUPS_SERVERBIN "/filter";
+ 
+   for (i = 1; i < argc; i ++)
+     if (!strcmp(argv[i], "-d"))
+diff -urNad cupsys-1.2.1~/systemv/Makefile cupsys-1.2.1/systemv/Makefile
+--- cupsys-1.2.1~/systemv/Makefile	2006-03-21 02:35:37.000000000 +0000
++++ cupsys-1.2.1/systemv/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -78,7 +78,7 @@
+ 	$(INSTALL_BIN) lp $(BINDIR)
+ 	$(INSTALL_BIN) lpoptions $(BINDIR)
+ 	$(INSTALL_BIN) lpstat $(BINDIR)
+-	$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
++	$(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/systemv/lpstat.c cupsys-1.2.1/systemv/lpstat.c
+--- cupsys-1.2.1~/systemv/lpstat.c	2006-05-15 20:06:46.000000000 +0000
++++ cupsys-1.2.1/systemv/lpstat.c	2006-07-06 16:47:45.000000000 +0000
+@@ -70,26 +70,59 @@
+  */
+ 
+ int
+-main(int  argc,			/* I - Number of command-line arguments */
+-     char *argv[])		/* I - Command-line arguments */
++main(int  argc,				/* I - Number of command-line arguments */
++     char *argv[])			/* I - Command-line arguments */
+ {
+-  int		i,		/* Looping var */
+-		status;		/* Exit status */
+-  http_t	*http;		/* Connection to server */
+-  int		num_dests;	/* Number of user destinations */
+-  cups_dest_t	*dests;		/* User destinations */
+-  int		long_status;	/* Long status report? */
+-  int		ranking;	/* Show job ranking? */
+-  const char	*which;		/* Which jobs to show? */
+-  char		op;		/* Last operation on command-line */
++  int		i,			/* Looping var */
++		status;			/* Exit status */
++  http_t	*http;			/* Connection to server */
++  int		num_dests;		/* Number of user destinations */
++  cups_dest_t	*dests;			/* User destinations */
++  int		long_status;		/* Long status report? */
++  int		ranking;		/* Show job ranking? */
++  const char	*which;			/* Which jobs to show? */
++  char		op;			/* Last operation on command-line */
+ 
+ 
+  /*
+   * Set the locale so that times, etc. are displayed properly.
++  *
++  * Unfortunately, while we need the localized time value, we *don't*
++  * want to use the localized charset for the time value, so we need
++  * to set LC_TIME to the locale name with .UTF-8 on the end (if
++  * the locale includes a character set specifier...)
+   */
+ 
+   setlocale(LC_ALL, "");
+ 
++#ifdef LC_TIME
++  {
++    const char	*lc_time;		/* Current LC_TIME value */
++    char	new_lc_time[255],	/* New LC_TIME value */
++		*charset;		/* Pointer to character set */
++
++    if ((lc_time = setlocale(LC_TIME, NULL)) == NULL)
++      lc_time = setlocale(LC_ALL, NULL);
++
++    if (lc_time)
++    {
++      strlcpy(new_lc_time, lc_time, sizeof(new_lc_time));
++      if ((charset = strchr(new_lc_time, '.')) == NULL)
++        charset = new_lc_time + strlen(new_lc_time);
++
++      strlcpy(charset, ".UTF-8", sizeof(new_lc_time) - (charset - new_lc_time));
++    }
++    else
++      strcpy(new_lc_time, "C");
++
++    setlocale(LC_TIME, new_lc_time);
++  }
++#endif /* LC_TIME */
++  
++ /*
++  * Parse command-line options...
++  */
++
+   http        = NULL;
+   num_dests   = 0;
+   dests       = NULL;
+diff -urNad cupsys-1.2.1~/templates/Makefile cupsys-1.2.1/templates/Makefile
+--- cupsys-1.2.1~/templates/Makefile	2006-03-18 13:18:18.000000000 +0000
++++ cupsys-1.2.1/templates/Makefile	2006-07-06 16:47:45.000000000 +0000
+@@ -118,11 +118,13 @@
+ # Install files...
+ #
+ 
+-install: all
++install: all $(INSTALL_LANGUAGES)
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/templates
+ 	for file in $(FILES); do \
+ 		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
+ 	done
++
++install-languages:
+ 	for lang in $(LANGUAGES); do \
+ 		$(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
+ 		for file in $(FILES); do \
+@@ -137,17 +139,19 @@
+ # Uninstall files...
+ #
+ 
+-uninstall:
++uninstall: $(UNINSTALL_LANGUAGES)
+ 	for file in $(FILES); do \
+ 		$(RM) $(DATADIR)/templates/$$file; \
+ 	done
++	-$(RMDIR) $(DATADIR)/templates
++
++uninstall-languages:
+ 	for lang in $(LANGUAGES); do \
+ 		for file in $(FILES); do \
+ 			$(RM) $(DATADIR)/templates/$$lang/$$file; \
+ 		done \
+ 		$(RMDIR) $(DATADIR)/templates/$$lang; \
+ 	done
+-	-$(RMDIR) $(DATADIR)/templates
+ 
+ 
+ #
--- cupsys-1.2.1.orig/debian/patches/05_avoidunknowngroup.dpatch
+++ cupsys-1.2.1/debian/patches/05_avoidunknowngroup.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05avoidunknowngroup.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.2.1~/systemv/Makefile cupsys-1.2.1/systemv/Makefile
+--- cupsys-1.2.1~/systemv/Makefile	2006-07-06 16:48:57.000000000 +0000
++++ cupsys-1.2.1/systemv/Makefile	2006-07-06 16:50:44.000000000 +0000
+@@ -78,7 +78,7 @@
+ 	$(INSTALL_BIN) lp $(BINDIR)
+ 	$(INSTALL_BIN) lpoptions $(BINDIR)
+ 	$(INSTALL_BIN) lpstat $(BINDIR)
+-	$(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
++	$(INSTALL_BIN) -m 4755 -o lp -g root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
+ 
+ 
+ #
+diff -urNad cupsys-1.2.1~/systemv/Makefile.rej cupsys-1.2.1/systemv/Makefile.rej
+--- cupsys-1.2.1~/systemv/Makefile.rej	1970-01-01 00:00:00.000000000 +0000
++++ cupsys-1.2.1/systemv/Makefile.rej	2006-07-06 16:48:58.000000000 +0000
+@@ -0,0 +1,17 @@
++***************
++*** 77,83 ****
++  	$(INSTALL_BIN) lp $(BINDIR)
++  	$(INSTALL_BIN) lpoptions $(BINDIR)
++  	$(INSTALL_BIN) lpstat $(BINDIR)
++- 	$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
++  
++  
++  #
++--- 77,83 ----
++  	$(INSTALL_BIN) lp $(BINDIR)
++  	$(INSTALL_BIN) lpoptions $(BINDIR)
++  	$(INSTALL_BIN) lpstat $(BINDIR)
+++ 	$(INSTALL_BIN) -m 4755 -o lp -g root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
++  
++  
++  #
--- cupsys-1.2.1.orig/debian/patches/04_freebsd.dpatch
+++ cupsys-1.2.1/debian/patches/04_freebsd.dpatch
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_freebsd.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: man extension is handled by dh_installman
+
+@DPATCH@
+diff -urNad cups-1.2~/backend/parallel.c cups-1.2/backend/parallel.c
+--- cups-1.2~/backend/parallel.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/parallel.c	2006-04-25 12:14:51.000000000 +0200
+@@ -693,7 +693,7 @@
+       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+     }
+   }
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+   int	i;			/* Looping var */
+   int	fd;			/* File descriptor */
+   char	device[255];		/* Device filename */
+diff -urNad cups-1.2~/backend/serial.c cups-1.2/backend/serial.c
+--- cups-1.2~/backend/serial.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/serial.c	2006-04-25 12:15:44.000000000 +0200
+@@ -666,11 +666,11 @@
+ void
+ list_devices(void)
+ {
+-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+ 					/* Funky hex numbering used for some *
+ 					 * devices                           */
+-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
++#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
+ 
+ #ifdef __linux
+   int			i, j;		/* Looping vars */
+@@ -958,7 +958,7 @@
+       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+              device, i + 1);
+   }
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+   int	i, j;		/* Looping vars */
+   int	fd;		/* File descriptor */
+   char	device[255];	/* Device filename */
+diff -urNad cups-1.2~/backend/usb-unix.c cups-1.2/backend/usb-unix.c
+--- cups-1.2~/backend/usb-unix.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/usb-unix.c	2006-04-25 12:14:51.000000000 +0200
+@@ -401,7 +401,7 @@
+   }
+ #elif defined(__hpux)
+ #elif defined(__osf)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+   int   i;                      /* Looping var */
+   char  device[255];            /* Device filename */
+ 
+diff -urNad cups-1.2~/backend/usb.c cups-1.2/backend/usb.c
+--- cups-1.2~/backend/usb.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/usb.c	2006-04-25 12:14:51.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ #ifdef __APPLE__
+ #  include "usb-darwin.c"
+-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ #  include "usb-unix.c"
+ #else
+ /*
+diff -urNad cups-1.2~/config-scripts/cups-directories.m4 cups-1.2/config-scripts/cups-directories.m4
+--- cups-1.2~/config-scripts/cups-directories.m4	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/config-scripts/cups-directories.m4	2006-04-25 12:14:51.000000000 +0200
+@@ -135,7 +135,7 @@
+ 				"/System/Library/StartupItems/PrintingServices")
+ 			;;
+ 
+-		Linux | GNU)
++		Linux | GNU | GNU/k*BSD*)
+ 			# Linux/HURD seems to choose an init.d directory at random...
+ 			if test -d /sbin/init.d; then
+ 				# SuSE
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure	2006-04-25 12:14:50.000000000 +0200
++++ cups-1.2/configure	2006-04-25 12:14:51.000000000 +0200
+@@ -7445,7 +7445,7 @@
+ 
+ 			;;
+ 
+-		Linux | GNU)
++		Linux | GNU | GNU/k*BSD*)
+ 			# Linux/HURD seems to choose an init.d directory at random...
+ 			if test -d /sbin/init.d; then
+ 				# SuSE
--- cupsys-1.2.1.orig/debian/patches/58_cupsd.conf-AllowLocal.dpatch
+++ cupsys-1.2.1/debian/patches/58_cupsd.conf-AllowLocal.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 58_cupsd.conf-AllowLocal.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cups-1.2-ubuntu~/conf/cupsd.conf.in cups-1.2-ubuntu/conf/cupsd.conf.in
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-05-09 17:52:23.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-05-09 17:52:33.000000000 +0200
+@@ -34,6 +34,7 @@
+ <Location />
+   Order allow,deny
+   Allow localhost
++  Allow @LOCAL
+ </Location>
+ 
+ # Restrict access to the admin pages...
--- cupsys-1.2.1.orig/debian/patches/06_disable_backend_setuid.dpatch
+++ cupsys-1.2.1/debian/patches/06_disable_backend_setuid.dpatch
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_disable_backend_setuid.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys~/scheduler/cups-deviced.c cupsys/scheduler/cups-deviced.c
+--- cupsys~/scheduler/cups-deviced.c	2006-03-08 13:12:12.000000000 +0100
++++ cupsys/scheduler/cups-deviced.c	2006-04-05 14:18:19.000000000 +0200
+@@ -210,23 +210,6 @@
+       continue;
+ 
+    /*
+-    * Change effective users depending on the backend permissions...
+-    */
+-
+-    if (!getuid())
+-    {
+-     /*
+-      * Backends without permissions for normal users run as root,
+-      * all others run as the unprivileged user...
+-      */
+-
+-      if (!(dent->fileinfo.st_mode & (S_IRWXG | S_IRWXO)))
+-        seteuid(0);
+-      else
+-        seteuid(normal_user);
+-    }
+-
+-   /*
+     * Run the backend with no arguments and collect the output...
+     */
+ 
--- cupsys-1.2.1.orig/debian/patches/07_removecvstag.dpatch
+++ cupsys-1.2.1/debian/patches/07_removecvstag.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_removecvstag.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cups-1.2~/conf/Makefile cups-1.2/conf/Makefile
+--- cups-1.2~/conf/Makefile	2006-04-25 12:16:07.000000000 +0200
++++ cups-1.2/conf/Makefile	2006-04-25 12:17:11.000000000 +0200
+@@ -65,6 +65,8 @@
+ 			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
+ 		else \
+ 			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+ 		fi ; \
+ 	done
+@@ -75,6 +77,8 @@
+ 			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
+ 		fi ; \
+ 		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
++		grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++		mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 	done
+ 	-if test x$(PAMDIR) != x; then \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
--- cupsys-1.2.1.orig/debian/patches/55_ppd_okidata_name.dpatch
+++ cupsys-1.2.1/debian/patches/55_ppd_okidata_name.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_ppd_okidata_name.dpatch by  <doko@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+--- ./ppd/okidata9.ppd~	2005-12-15 17:19:46.000000000 +0100
++++ ./ppd/okidata9.ppd	2006-04-12 20:13:44.240749856 +0200
+@@ -28,7 +28,7 @@
+ *LanguageVersion: English 
+ *LanguageEncoding: ISOLatin1
+ *PCFileName:	"OKIDATA9.PPD"
+-*Manufacturer:	"Oki"
++*Manufacturer:	"Okidata"
+ *Product:	"(GNU Ghostscript)"
+ *Product:	"(ESP Ghostscript)"
+ *cupsVersion:	1.2
+--- ./ppd/okidat24.ppd~	2005-12-15 17:19:46.000000000 +0100
++++ ./ppd/okidat24.ppd	2006-04-12 20:13:32.764494512 +0200
+@@ -28,7 +28,7 @@
+ *LanguageVersion: English 
+ *LanguageEncoding: ISOLatin1
+ *PCFileName:	"OKIDAT24.PPD"
+-*Manufacturer:	"Oki"
++*Manufacturer:	"Okidata"
+ *Product:	"(GNU Ghostscript)"
+ *Product:	"(ESP Ghostscript)"
+ *cupsVersion:	1.2
--- cupsys-1.2.1.orig/debian/patches/19_cupsaccept.dpatch
+++ cupsys-1.2.1/debian/patches/19_cupsaccept.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_cupsaccept.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/systemv/accept.c cupsys-1.1.99.b1.r4748/systemv/accept.c
+--- cupsys-1.1.99.b1.r4748~/systemv/accept.c	2005-02-18 02:18:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/systemv/accept.c	2005-10-05 12:14:39.401595086 +0000
+@@ -67,6 +67,9 @@
+   else
+     command = argv[0];
+ 
++  if (strncmp(command, "cups", 4) == 0)
++    command += 4;
++
+   cancel = 0;
+ 
+   if (strcmp(command, "accept") == 0)
--- cupsys-1.2.1.orig/debian/patches/14_dont_force_ssl.dpatch
+++ cupsys-1.2.1/debian/patches/14_dont_force_ssl.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_dont_force_ssl.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cups-1.2-ubuntu~/conf/cupsd.conf.in cups-1.2-ubuntu/conf/cupsd.conf.in
+--- cups-1.2-ubuntu~/conf/cupsd.conf.in	2006-04-25 20:05:27.000000000 +0200
++++ cups-1.2-ubuntu/conf/cupsd.conf.in	2006-04-25 20:09:04.000000000 +0200
+@@ -33,7 +33,6 @@
+ 
+ # Restrict access to the admin pages...
+ <Location /admin>
+-@ENCRYPTION_REQUIRED@
+   Order allow,deny
+   Allow localhost
+ </Location>
--- cupsys-1.2.1.orig/debian/patches/44_fixconfdirperms.dpatch
+++ cupsys-1.2.1/debian/patches/44_fixconfdirperms.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 44_fixconfdirperms.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.rc2~/scheduler/conf.c cupsys-1.1.99.rc2/scheduler/conf.c
+--- cupsys-1.1.99.rc2~/scheduler/conf.c	2006-04-06 20:03:32.000000000 +0000
++++ cupsys-1.1.99.rc2/scheduler/conf.c	2006-04-11 10:35:14.000000000 +0000
+@@ -531,22 +531,10 @@
+ 
+       cupsdLogMessage(CUPSD_LOG_NOTICE,
+                       "Group and SystemGroup cannot use the same groups!");
+-      cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
++      cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"root\"...");
+ 
+-      group = getgrnam("nobody");
+       endgrent();
+-
+-      if (group != NULL)
+-	Group = group->gr_gid;
+-      else
+-      {
+-       /*
+-	* Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+-	* complement number...)
+-	*/
+-
+-	Group = 65534;
+-      }
++      Group = 0;
+     }
+   }
+ 
+@@ -630,11 +618,13 @@
+   check_permissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
+                     SystemGroupIDs[0], 1, 1);
+ 
+-  check_permissions(ServerRoot, NULL, 0755, RunUser, Group, 1, 0);
++  check_permissions(ServerRoot, NULL, 03755, RunUser, Group, 1, 0);
+   check_permissions(ServerRoot, "ppd", 0755, RunUser, Group, 1, 1);
+   check_permissions(ServerRoot, "ssl", 0700, RunUser, Group, 1, 0);
++  /* Never alter permissions of central conffile
+   check_permissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser, Group,
+                     0, 0);
++  */
+   check_permissions(ServerRoot, "classes.conf", 0600, RunUser, Group, 0, 0);
+   check_permissions(ServerRoot, "printers.conf", 0600, RunUser, Group, 0, 0);
+   check_permissions(ServerRoot, "passwd.md5", 0600, User, Group, 0, 0);
--- cupsys-1.2.1.orig/debian/patches/00list
+++ cupsys-1.2.1/debian/patches/00list
@@ -0,0 +1,24 @@
+00_r5643.dpatch
+02_configure.dpatch
+#03_manext.dpatch
+03_clean.dpatch
+04_freebsd.dpatch
+05_avoidunknowngroup.dpatch
+06_disable_backend_setuid.dpatch
+07_removecvstag.dpatch
+08_cupsd.conf.conf.d.dpatch
+09_runasuser.dpatch
+09_runasuser_autoconf.dpatch
+11_pam.dpatch
+12_quiesce_ipp_logging.dpatch
+13_default_log_warn.dpatch
+14_dont_force_ssl.dpatch
+19_cupsaccept.dpatch
+26_modprobe.dpatch
+44_fixconfdirperms.dpatch
+47_pid.dpatch
+#48_stdlib.dpatch
+55_ppd_okidata_name.dpatch
+56_dirsvc.dpatch
+58_cupsd.conf-AllowLocal.dpatch
+ubuntu-nowebadmin.dpatch
--- cupsys-1.2.1.orig/debian/patches/47_pid.dpatch
+++ cupsys-1.2.1/debian/patches/47_pid.dpatch
@@ -0,0 +1,104 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 47_pid.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b2~/scheduler/conf.c cupsys-1.1.99.b2/scheduler/conf.c
+--- cupsys-1.1.99.b2~/scheduler/conf.c	2006-03-11 13:31:04.000000000 +0000
++++ cupsys-1.1.99.b2/scheduler/conf.c	2006-03-11 13:31:16.000000000 +0000
+@@ -170,7 +170,8 @@
+   { "StateDir",			&StateDir,		CUPSD_VARTYPE_STRING },
+   { "TempDir",			&TempDir,		CUPSD_VARTYPE_STRING },
+   { "Timeout",			&Timeout,		CUPSD_VARTYPE_INTEGER },
+-  { "UseNetworkDefault",	&UseNetworkDefault,	CUPSD_VARTYPE_BOOLEAN }
++  { "UseNetworkDefault",	&UseNetworkDefault,	CUPSD_VARTYPE_BOOLEAN },
++  { "PidFile",			&PidFile,		CUPSD_VARTYPE_STRING }
+ };
+ #define NUM_VARS	(sizeof(variables) / sizeof(variables[0]))
+ 
+@@ -287,6 +288,7 @@
+   cupsdSetString(&RemoteRoot, "remroot");
+   cupsdSetString(&ServerHeader, "CUPS/1.2");
+   cupsdSetString(&StateDir, CUPS_STATEDIR);
++  cupsdSetString(&PidFile, "/var/run/cups/cupsd.pid");
+ 
+   strlcpy(temp, ConfigurationFile, sizeof(temp));
+   if ((slash = strrchr(temp, '/')) != NULL)
+diff -urNad cupsys-1.1.99.b2~/scheduler/conf.h cupsys-1.1.99.b2/scheduler/conf.h
+--- cupsys-1.1.99.b2~/scheduler/conf.h	2006-03-11 13:31:04.000000000 +0000
++++ cupsys-1.1.99.b2/scheduler/conf.h	2006-03-11 13:31:16.000000000 +0000
+@@ -186,6 +186,7 @@
+ 					/* Server key file */
+ #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
++VAR char		*PidFile	VALUE(NULL); /* Debian CUPS pid file */
+ 
+ #ifdef HAVE_LAUNCHD
+ VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
+diff -urNad cupsys-1.1.99.b2~/scheduler/main.c cupsys-1.1.99.b2/scheduler/main.c
+--- cupsys-1.1.99.b2~/scheduler/main.c	2006-03-11 13:31:04.000000000 +0000
++++ cupsys-1.1.99.b2/scheduler/main.c	2006-03-11 13:32:41.000000000 +0000
+@@ -89,7 +89,8 @@
+ static void	sigterm_handler(int sig);
+ static long	select_timeout(int fds);
+ static void	usage(int status);
+-
++int write_pid(void);
++int remvoe_pid(void);
+ 
+ /*
+  * Local globals...
+@@ -501,6 +502,11 @@
+       kill(i, SIGUSR1);
+   }
+ 
++  if (write_pid() == 0) {
++    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to write pid file");
++    return (1);
++  }
++
+  /*
+   * Start power management framework...
+   */
+@@ -1095,9 +1101,39 @@
+   free(input);
+   free(output);
+ 
++  remove_pid();
++
+   return (!stop_scheduler);
+ }
+ 
++/* 'write_pid()' - Write PID file.
++   'remove_pid()' - Delete PID file.
++*/
++int
++write_pid()
++{
++  FILE *f;
++  int fd;
++  int pid;
++  if (((fd = open(PidFile, O_RDWR|O_CREAT, 0644)) == -1)
++      || ((f = fdopen(fd, "r+")) == NULL) ) {
++    return 0;
++  }
++  pid = getpid();
++  if (!fprintf(f, "%d\n", pid)) {
++    close(fd);
++    return 0;
++  }
++  fflush(f);
++  close(fd);
++
++  return pid;
++}
++
++int remove_pid() {
++  return unlink(PidFile);
++}
++
+ 
+ /*
+  * 'cupsdClosePipe()' - Close a pipe as necessary.
--- cupsys-1.2.1.orig/debian/patches/12_quiesce_ipp_logging.dpatch
+++ cupsys-1.2.1/debian/patches/12_quiesce_ipp_logging.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_quiesce_ipp_logging.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys~/scheduler/ipp.c cupsys/scheduler/ipp.c
+--- cupsys~/scheduler/ipp.c	2006-04-07 17:36:10.000000000 +0200
++++ cupsys/scheduler/ipp.c	2006-04-12 16:44:34.000000000 +0200
+@@ -8057,13 +8057,13 @@
+               _cupsLangString(con->language, message), ap);
+     va_end(ap);
+ 
+-    cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_ERROR : CUPSD_LOG_INFO,
++    cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_INFO : CUPSD_LOG_DEBUG,
+                     "%s %s: %s",
+ 		    ippOpString(con->request->request.op.operation_id),
+ 		    ippErrorString(status), formatted);
+   }
+   else
+-    cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_ERROR : CUPSD_LOG_INFO,
++    cupsdLogMessage(status >= IPP_BAD_REQUEST ? CUPSD_LOG_INFO : CUPSD_LOG_DEBUG,
+                     "%s %s",
+ 		    ippOpString(con->request->request.op.operation_id),
+ 		    ippErrorString(status));
+diff -urNad cupsys~/scheduler/log.c cupsys/scheduler/log.c
+--- cupsys~/scheduler/log.c	2006-02-27 21:57:07.000000000 +0100
++++ cupsys/scheduler/log.c	2006-04-12 16:43:26.000000000 +0200
+@@ -354,6 +354,12 @@
+ 		  "STATUS"
+ 		};
+ 
++  /* Do not flood the log with CUPS-Get-Printers requests */
++  if (con->request && code == HTTP_OK && (
++	con->request->request.op.operation_id == CUPS_GET_PRINTERS ||
++	con->request->request.op.operation_id == CUPS_GET_DEFAULT ||
++	con->request->request.op.operation_id == IPP_GET_PRINTER_ATTRIBUTES))
++      return (1);
+ 
+ #ifdef HAVE_VSYSLOG
+  /*
--- cupsys-1.2.1.orig/debian/patches/26_modprobe.dpatch
+++ cupsys-1.2.1/debian/patches/26_modprobe.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 26_modprobe.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/backend/parallel.c cupsys-1.1.99.b1.r4748/backend/parallel.c
+--- cupsys-1.1.99.b1.r4748~/backend/parallel.c	2005-09-26 19:33:58.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/backend/parallel.c	2005-10-05 12:33:48.589479144 +0000
+@@ -416,6 +416,10 @@
+ 	model[IPP_MAX_NAME];	/* Model from file */
+ 
+ 
++  /* Load module for unconfigured host */
++  fd = popen("/sbin/modprobe -q lp", "r");
++  pclose(fd);
++
+   for (i = 0; i < 4; i ++)
+   {
+    /*
--- cupsys-1.2.1.orig/debian/patches/09_runasuser.dpatch
+++ cupsys-1.2.1/debian/patches/09_runasuser.dpatch
@@ -0,0 +1,132 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_runasuser.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cups-1.2~/config-scripts/cups-defaults.m4 cups-1.2/config-scripts/cups-defaults.m4
+--- cups-1.2~/config-scripts/cups-defaults.m4	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/config-scripts/cups-defaults.m4	2006-04-25 12:18:56.000000000 +0200
+@@ -218,6 +218,17 @@
+ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
+ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_GROUPS, "$CUPS_SYSTEM_GROUPS")
+ 
++dnl Privilege dropping
++AC_ARG_ENABLE(privilege-dropping, [  --enable-privilege-dropping       drop root privileges to normal user, default=no])
++if test "x$enable_privilege_dropping" = xyes; then
++	CUPS_DROP_PRIVILEGES=1
++	AC_DEFINE_UNQUOTED(CUPS_DROP_PRIVILEGES, 1)
++else
++	CUPS_DROP_PRIVILEGES=0
++	AC_DEFINE_UNQUOTED(CUPS_DROP_PRIVILEGES, 0)
++fi
++AC_SUBST(CUPS_DROP_PRIVILEGES)
++
+ dnl Default printcap file...
+ AC_ARG_WITH(printcap, [  --with-printcap     set default printcap file],
+ 	default_printcap="$withval",
+diff -urNad cups-1.2~/config.h.in cups-1.2/config.h.in
+--- cups-1.2~/config.h.in	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/config.h.in	2006-04-25 12:18:56.000000000 +0200
+@@ -41,6 +41,11 @@
+ #define CUPS_DEFAULT_GROUP	"sys"
+ #define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
+ 
++/*
++ * Privilege dropping
++ */
++
++#define CUPS_DROP_PRIVILEGES	0
+ 
+ /*
+  * Default file permissions...
+diff -urNad cups-1.2~/scheduler/cert.c cups-1.2/scheduler/cert.c
+--- cups-1.2~/scheduler/cert.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/cert.c	2006-04-25 12:18:56.000000000 +0200
+@@ -116,7 +116,7 @@
+     * Root certificate...
+     */
+ 
+-    fchmod(fd, 0440);
++    fchmod(fd, 0240);
+     fchown(fd, RunUser, SystemGroupIDs[0]);
+ 
+     cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddCert: NumSystemGroups=%d",
+diff -urNad cups-1.2~/scheduler/conf.c cups-1.2/scheduler/conf.c
+--- cups-1.2~/scheduler/conf.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/conf.c	2006-04-25 12:18:56.000000000 +0200
+@@ -460,7 +460,11 @@
+   if (!status)
+     return (0);
+ 
++#if CUPS_DROP_PRIVILEGES == 1
++  RunUser = User;
++#else
+   RunUser = getuid();
++#endif
+ 
+  /*
+   * Use the default system group if none was supplied in cupsd.conf...
+diff -urNad cups-1.2~/scheduler/main.c cups-1.2/scheduler/main.c
+--- cups-1.2~/scheduler/main.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/main.c	2006-04-25 12:19:17.000000000 +0200
+@@ -56,6 +56,9 @@
+ #include <sys/resource.h>
+ #include <syslog.h>
+ #include <grp.h>
++#if CUPS_DROP_PRIVILEGES == 1
++#include <pwd.h>
++#endif
+ 
+ #ifdef HAVE_LAUNCH_H
+ #  include <launch.h>
+@@ -515,6 +518,20 @@
+   cupsdStartSystemMonitor();
+ #endif /* __APPLE__ */
+ 
++#if CUPS_DROP_PRIVILEGES == 1
++  /*
++   * Drop root privileges
++   */
++   struct passwd * pwd = getpwuid(User);
++   if (!pwd) {
++     cupsdLogMessage(CUPSD_LOG_ERROR, "could not get passwd data for user id %i", User);
++     exit(EXIT_FAILURE);
++   }
++   setgid(Group);
++   initgroups(pwd->pw_name, pwd->pw_gid);
++   setuid(User);
++#endif
++
+  /*
+   * Start any pending print jobs...
+   */
+@@ -998,7 +1015,7 @@
+     */
+ 
+     if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
+-        !RunUser && cupsArrayCount(Clients))
++        cupsArrayCount(Clients))
+     {
+      /*
+       * Update the root certificate...
+diff -urNad cups-1.2-ubuntu~/scheduler/process.c cups-1.2-ubuntu/scheduler/process.c
+--- cups-1.2-ubuntu~/scheduler/process.c	2006-04-06 22:32:07.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/process.c	2006-04-24 19:16:09.000000000 +0200
+@@ -245,15 +245,6 @@
+       if (setuid(User))
+         exit(errno);
+     }
+-    else
+-    {
+-     /*
+-      * Reset group membership to just the main one we belong to.
+-      */
+-
+-      setgid(Group);
+-      setgroups(1, &Group);
+-    }
+ 
+    /*
+     * Change umask to restrict permissions on created files...
--- cupsys-1.2.1.orig/debian/patches/03_clean.dpatch
+++ cupsys-1.2.1/debian/patches/03_clean.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_clean.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.r5357~/Makefile cupsys-1.1.99.r5357/Makefile
+--- cupsys-1.1.99.r5357~/Makefile	2006-03-20 19:06:50.000000000 +0000
++++ cupsys-1.1.99.r5357/Makefile	2006-03-30 15:18:54.000000000 +0000
+@@ -55,6 +55,7 @@
+ 		echo Cleaning in $$dir... ;\
+ 		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+ 	done
++	$(RM) init/cups.sh init/cups-lpd
+ 
+ 
+ #
+diff -urNad cupsys-1.1.99.r5357~/doc/Makefile cupsys-1.1.99.r5357/doc/Makefile
+--- cupsys-1.1.99.r5357~/doc/Makefile	2006-03-23 20:23:19.000000000 +0000
++++ cupsys-1.1.99.r5357/doc/Makefile	2006-03-30 15:15:07.000000000 +0000
+@@ -187,6 +187,8 @@
+ #
+ 
+ clean:
++	$(RM) doc/es/index.html
++	$(RM) doc/ja/index.html
+ 
+ 
+ #
+diff -urNad cupsys-1.1.99.r5357~/man/Makefile cupsys-1.1.99.r5357/man/Makefile
+--- cupsys-1.1.99.r5357~/man/Makefile	2006-03-21 02:35:37.000000000 +0000
++++ cupsys-1.1.99.r5357/man/Makefile	2006-03-30 15:17:26.000000000 +0000
+@@ -88,6 +88,7 @@
+ 	for file in $(MAN8); do \
+ 		$(RM) ../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \
+ 	done
++	$(RM) client.conf.man cups-deviced.man cups-driverd.man cups-lpd.man cupsaddsmb.man cupsd.man cupsd.conf.man lpoptions.man
+ 
+ 
+ #
+diff -urNad cupsys-1.1.99.r5357~/templates/Makefile cupsys-1.1.99.r5357/templates/Makefile
+--- cupsys-1.1.99.r5357~/templates/Makefile	2006-03-18 13:18:18.000000000 +0000
++++ cupsys-1.1.99.r5357/templates/Makefile	2006-03-30 15:18:07.000000000 +0000
+@@ -105,6 +105,7 @@
+ #
+ 
+ clean:
++	$(RM) ja/header.tmpl es/header.tmpl header.tmpl
+ 
+ 
+ #
--- cupsys-1.2.1.orig/debian/patches/09_runasuser_autoconf.dpatch
+++ cupsys-1.2.1/debian/patches/09_runasuser_autoconf.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_autoconf.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
+--- cupsys-1.2.1~/configure	2006-05-28 13:12:28.000000000 +0000
++++ cupsys-1.2.1/configure	2006-05-28 13:13:47.000000000 +0000
+@@ -309,7 +309,7 @@
+ #endif"
+ 
+ ac_default_prefix=/
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -881,6 +881,7 @@
+                           enable ImplicitClasses by default, default=yes
+   --enable-use-network-default
+                           enable UseNetworkDefault by default, default=auto
++  --enable-privilege-dropping       drop root privileges to normal user, default=no
+   --enable-pdftops        build pdftops filter, default=auto
+ 
+ Optional Packages:
+@@ -13147,6 +13148,26 @@
+ _ACEOF
+ 
+ 
++# Check whether --enable-privilege-dropping or --disable-privilege-dropping was given.
++if test "${enable_privilege_dropping+set}" = set; then
++  enableval="$enable_privilege_dropping"
++
++fi;
++if test "x$enable_privilege_dropping" = xyes; then
++	CUPS_DROP_PRIVILEGES=1
++	cat >>confdefs.h <<_ACEOF
++#define CUPS_DROP_PRIVILEGES 1
++_ACEOF
++
++else
++	CUPS_DROP_PRIVILEGES=0
++	cat >>confdefs.h <<_ACEOF
++#define CUPS_DROP_PRIVILEGES 0
++_ACEOF
++
++fi
++
++
+ 
+ # Check whether --with-printcap or --without-printcap was given.
+ if test "${with_printcap+set}" = set; then
+@@ -14415,6 +14436,7 @@
+ s,@CUPS_GROUP@,$CUPS_GROUP,;t t
+ s,@CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
+ s,@CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
++s,@CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
+ s,@PAP@,$PAP,;t t
+ s,@PDFTOPS@,$PDFTOPS,;t t
+ s,@JAVA@,$JAVA,;t t
--- cupsys-1.2.1.orig/debian/patches/13_default_log_warn.dpatch
+++ cupsys-1.2.1/debian/patches/13_default_log_warn.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_default_log_warn.dpatch by  <mpitt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys~/conf/cupsd.conf.in cupsys/conf/cupsd.conf.in
+--- cupsys~/conf/cupsd.conf.in	2006-04-12 16:32:11.000000000 +0200
++++ cupsys/conf/cupsd.conf.in	2006-04-12 17:04:58.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ # Log general information in error_log - change "info" to "debug" for
+ # troubleshooting...
+-LogLevel info
++LogLevel warning
+ 
+ # Administrator user group...
+ SystemGroup @CUPS_SYSTEM_GROUPS@
--- cupsys-1.2.1.orig/debian/patches/48_stdlib.dpatch
+++ cupsys-1.2.1/debian/patches/48_stdlib.dpatch
@@ -0,0 +1,130 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 48_stdlib.dpatch by Kenshi Muto <kmuto@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/cups/attr.c cupsys-1.1.99.b1.r4748/cups/attr.c
+--- cupsys-1.1.99.b1.r4748~/cups/attr.c	2005-11-13 05:25:56.280194158 +0000
++++ cupsys-1.1.99.b1.r4748/cups/attr.c	2005-11-13 05:25:57.358029198 +0000
+@@ -34,8 +34,8 @@
+ 
+ #include "ppd.h"
+ #include "debug.h"
+-#include "string.h"
+ #include <stdlib.h>
++#include "string.h"
+ 
+ 
+ /*
+diff -urNad cupsys-1.1.99.b1.r4748~/cups/dir.c cupsys-1.1.99.b1.r4748/cups/dir.c
+--- cupsys-1.1.99.b1.r4748~/cups/dir.c	2005-11-13 05:25:56.284193546 +0000
++++ cupsys-1.1.99.b1.r4748/cups/dir.c	2005-11-13 05:25:57.409021394 +0000
+@@ -41,9 +41,9 @@
+  */
+ 
+ #include "dir.h"
++#include <stdlib.h>
+ #include "string.h"
+ #include "debug.h"
+-#include <stdlib.h>
+ #include <errno.h>
+ 
+ 
+diff -urNad cupsys-1.1.99.b1.r4748~/cups/getputfile.c cupsys-1.1.99.b1.r4748/cups/getputfile.c
+--- cupsys-1.1.99.b1.r4748~/cups/getputfile.c	2005-11-13 05:25:56.289192781 +0000
++++ cupsys-1.1.99.b1.r4748/cups/getputfile.c	2005-11-13 05:25:57.409021394 +0000
+@@ -38,9 +38,9 @@
+ #include "cups.h"
+ #include "ipp.h"
+ #include "language.h"
++#include <stdlib.h>
+ #include "string.h"
+ #include "debug.h"
+-#include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>
+diff -urNad cupsys-1.1.99.b1.r4748~/filter/gziptoany.c cupsys-1.1.99.b1.r4748/filter/gziptoany.c
+--- cupsys-1.1.99.b1.r4748~/filter/gziptoany.c	2005-11-13 04:59:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/filter/gziptoany.c	2005-11-13 05:25:57.410021241 +0000
+@@ -32,8 +32,8 @@
+  * Include necessary headers...
+  */
+ 
+-#include <cups/string.h>
+ #include <stdlib.h>
++#include <cups/string.h>
+ #include <errno.h>
+ 
+ #ifdef HAVE_LIBZ
+diff -urNad cupsys-1.1.99.b1.r4748~/filter/interpret.c cupsys-1.1.99.b1.r4748/filter/interpret.c
+--- cupsys-1.1.99.b1.r4748~/filter/interpret.c	2005-11-13 04:59:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/filter/interpret.c	2005-11-13 05:25:57.410021241 +0000
+@@ -35,9 +35,9 @@
+  */
+ 
+ #include <cups/ppd.h>
++#include <stdlib.h>
+ #include <cups/string.h>
+ #include "raster.h"
+-#include <stdlib.h>
+ 
+ 
+ /*
+diff -urNad cupsys-1.1.99.b1.r4748~/filter/rastertoepson.c cupsys-1.1.99.b1.r4748/filter/rastertoepson.c
+--- cupsys-1.1.99.b1.r4748~/filter/rastertoepson.c	2005-11-13 04:59:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/filter/rastertoepson.c	2005-11-13 05:25:57.411021088 +0000
+@@ -41,9 +41,9 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/ppd.h>
++#include <stdlib.h>
+ #include <cups/string.h>
+ #include "raster.h"
+-#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+diff -urNad cupsys-1.1.99.b1.r4748~/filter/rastertohp.c cupsys-1.1.99.b1.r4748/filter/rastertohp.c
+--- cupsys-1.1.99.b1.r4748~/filter/rastertohp.c	2005-11-13 04:59:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/filter/rastertohp.c	2005-11-13 05:25:57.412020935 +0000
+@@ -41,9 +41,9 @@
+  */
+ 
+ #include <cups/cups.h>
++#include <stdlib.h>
+ #include <cups/string.h>
+ #include "raster.h"
+-#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+diff -urNad cupsys-1.1.99.b1.r4748~/systemv/cupstestppd.c cupsys-1.1.99.b1.r4748/systemv/cupstestppd.c
+--- cupsys-1.1.99.b1.r4748~/systemv/cupstestppd.c	2005-11-13 05:25:56.458166920 +0000
++++ cupsys-1.1.99.b1.r4748/systemv/cupstestppd.c	2005-11-13 05:25:57.413020782 +0000
+@@ -37,9 +37,9 @@
+  */
+ 
+ #include <cups/cups.h>
++#include <stdlib.h>
+ #include <cups/string.h>
+ #include <errno.h>
+-#include <stdlib.h>
+ 
+ 
+ /*
+diff -urNad cupsys-1.1.99.b1.r4748~/systemv/lpoptions.c cupsys-1.1.99.b1.r4748/systemv/lpoptions.c
+--- cupsys-1.1.99.b1.r4748~/systemv/lpoptions.c	2005-11-13 04:59:11.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/systemv/lpoptions.c	2005-11-13 05:25:57.413020782 +0000
+@@ -34,8 +34,8 @@
+  */
+ 
+ #include <cups/cups.h>
+-#include <cups/string.h>
+ #include <stdlib.h>
++#include <cups/string.h>
+ 
+ 
+ /*
--- cupsys-1.2.1.orig/debian/cupsys.templates
+++ cupsys-1.2.1/debian/cupsys.templates
@@ -0,0 +1,66 @@
+Template: cupsys/raw-print
+Type: boolean
+Default: true
+_Description: Do you want CUPS to print unknown jobs as raw jobs?
+ All print jobs in IPP get a MIME type. Since not all sources of print
+ jobs can attach an appropriate type, many jobs get submitted as the MIME
+ type application/octet-stream. Because of this, when CUPS receives a job
+ with that MIME type, it attempts to guess what the format is. By default,
+ if it cannot guess the proper type, it rejects the job.
+ .
+ It is possible to cause CUPS to treat all unrecognized jobs with this MIME
+ type as "raw" jobs, which causes them to be sent directly to the printer
+ without processing.
+ .
+ If you will be accepting print jobs from Windows computers, you probably
+ want this option set, as Windows gives all IPP print jobs processed by a
+ local driver the MIME type application/octet-stream. Samba also submits
+ its print jobs this way.
+
+Template: cupsys/backend
+Type: multiselect
+__Choices: ipp, lpd, parallel, scsi, serial, socket, usb
+Default: ipp, lpd, parallel, socket, usb
+_Description: Printer communication backends:
+ CUPS uses backend programs for communication with printer device or port.
+ .
+ Unfortunately, some backend programs cause some trouble.
+ (For example, some PPC kernel crashes with the parallel backend)
+ .
+ Please choose the backend program to be used by CUPS. The default choice
+ should fit the most common environments.
+
+Template: cupsys/ports
+Type: string
+Default: localhost:631 /var/run/cups/cups.sock
+_Description: Port or/and host name where CUPS will listen to:
+ Please specify the port or the host name CUPS daemon will listen to.
+ The following formats are allowed:
+ .
+  - Port number (631);
+  - Host name   (debian.example.com);
+  - Host:Port   (debian.example.com:631);
+  - File domain socket (/var/run/cups/cups.sock).
+ .
+ You can combine any of these by delimiting in a space-separated list.
+ .
+ The default port 631 is reserved for the Internet Printing Protocol (IPP).
+ "localhost:631" is recommended to setup a standalone environment for security
+ reasons.
+
+Template: cupsys/browse
+Type: boolean
+Default: false
+_Description: Broadcast and/or listen for CUPS printer information on the network?
+ CUPS daemon can broadcast printer information for clients on the network,
+ and detect printers on the network automatically.
+ .
+ If you choose this option, the CUPS daemon will periodically send UDP
+ broadcasts to detect printers.
+
+Template: cupsys/portserror
+Type: note
+_Description: Incorrect value entered
+ an error occurred while parsing the port number or the host name.
+ .
+ Please correct your input.
--- cupsys-1.2.1.orig/debian/copyright
+++ cupsys-1.2.1/debian/copyright
@@ -0,0 +1,155 @@
+This package was debianized by Jeff Licquia <licquia@debian.org> on
+Sun,  3 Oct 1999 20:58:02 -0500.
+
+It was downloaded from:
+	ftp://ftp2.easysw.com/pub/cups/
+
+Upstream Authors: Easy Software Products <cups-info@cups.org>
+                  Michael Sweet <mike@easysw.com>
+
+Copyright:
+
+[From the LICENSE.txt file.  GPL and LGPL cut for brevity; for a copy,
+look in /usr/share/common-licenses, files GPL and LGPL-2.]
+
+                Common UNIX Printing System License Agreement
+
+                Copyright 1997-2002 by Easy Software Products
+                        44141 AIRPORT VIEW DR STE 204
+                     HOLLYWOOD, MARYLAND 20636-3111 USA
+
+                           Voice: +1.301.373.9600
+                          Email: cups-info@cups.org
+                          WWW: http://www.cups.org
+
+
+INTRODUCTION
+
+The Common UNIX Printing System(tm), ("CUPS(tm)"), is provided
+under the GNU General Public License ("GPL") and GNU Library
+General Public License ("LGPL"), Version 2, with exceptions for
+Apple operating systems and the OpenSSL toolkit. A copy of the
+exceptions and licenses follow this introduction.
+
+The GNU LGPL applies to the CUPS API library, located in the
+"cups" subdirectory of the CUPS source distribution and in the
+"cups" include directory and library files in the binary
+distributions. The GNU GPL applies to the remainder of the CUPS
+distribution, including the "pdftops" filter which is based upon
+Xpdf and the CUPS imaging library.
+
+For those not familiar with the GNU GPL, the license basically
+allows you to:
+
+   - Use the CUPS software at no charge.
+   - Distribute verbatim copies of the software in source or
+     binary form.
+   - Sell verbatim copies of the software for a media fee, or
+     sell support for the software.
+   - Distribute or sell printer drivers and filters that use
+     CUPS so long as source code is made available under the
+     GPL.
+
+What this license *does not* allow you to do is make changes or
+add features to CUPS and then sell a binary distribution without
+source code. You must provide source for any new drivers,
+changes, or additions to the software, and all code must be
+provided under the GPL or LGPL as appropriate. The only
+exceptions to this are the portions of the CUPS software covered
+by the Apple operating system license exceptions outlined later
+in this license agreement.
+
+The GNU LGPL relaxes the "link-to" restriction, allowing you to
+develop applications that use the CUPS API library under other
+licenses and/or conditions as appropriate for your application.
+
+
+LICENSE EXCEPTIONS
+
+In addition, as the copyright holder of CUPS, Easy Software
+Products grants the following special exceptions:
+
+     1. Apple Operating System Development License Exception;
+
+	a. Software that is developed by any person or entity
+	   for an Apple Operating System ("Apple OS-Developed
+	   Software"), including but not limited to Apple and
+	   third party printer drivers, filters, and backends
+	   for an Apple Operating System, that is linked to the
+	   CUPS imaging library or based on any sample filters
+	   or backends provided with CUPS shall not be
+	   considered to be a derivative work or collective work
+	   based on the CUPS program and is exempt from the
+	   mandatory source code release clauses of the GNU GPL.
+	   You may therefore distribute linked combinations of
+	   the CUPS imaging library with Apple OS-Developed
+	   Software without releasing the source code of the
+	   Apple OS-Developed Software. You may also use sample
+	   filters and backends provided with CUPS to develop
+	   Apple OS-Developed Software without releasing the
+	   source code of the Apple OS-Developed Software.
+
+	b. An Apple Operating System means any operating system
+	   software developed and/or marketed by Apple Computer,
+	   Inc., including but not limited to all existing
+	   releases and versions of Apple's Darwin, Mac OS X,
+	   and Mac OS X Server products and all follow-on
+	   releases and future versions thereof.
+
+	c. This exception is only available for Apple
+	   OS-Developed Software and does not apply to software
+	   that is distributed for use on other operating
+	   systems.
+
+	d. All CUPS software that falls under this license
+	   exception have the following text at the top of each
+	   source file:
+
+	     This file is subject to the Apple OS-Developed
+	     Software exception.
+
+     2. OpenSSL Toolkit License Exception;
+
+	a. Easy Software Products explicitly allows the
+	   compilation and distribution of the CUPS software
+	   with the OpenSSL Toolkit.
+
+No developer is required to provide these exceptions in a
+derived work.
+
+
+TRADEMARKS
+
+Easy Software Products has trademarked the Common UNIX Printing
+System, CUPS, and CUPS logo. These names and logos may be used
+freely in any direct port or binary distribution of CUPS. Please
+contract Easy Software Products for written permission to use
+them in derivative products. Our intention is to protect the
+value of these trademarks and ensure that any derivative product
+meets the same high-quality standards as the original.
+
+
+BINARY DISTRIBUTION RIGHTS
+
+Easy Software Products also sells rights to the CUPS source code
+under a binary distribution license for vendors that are unable
+to release source code for their drivers, additions, and
+modifications to CUPS under the GNU GPL and LGPL. For
+information please contact us at the address shown above.
+
+The Common UNIX Printing System provides a "pdftops" filter that
+is based on the Xpdf software. For binary distribution licensing
+of this software, please contact:
+
+     Derek B. Noonburg
+     Email: derekn@foolabs.com
+     WWW: http://www.foolabs.com/xpdf/
+
+
+SUPPORT
+
+Easy Software Products sells software support for CUPS as well
+as a commercial printing product based on CUPS called ESP Print
+Pro. You can find out more at our web site:
+
+     http://www.easysw.com/
--- cupsys-1.2.1.orig/debian/pdftops
+++ cupsys-1.2.1/debian/pdftops
@@ -0,0 +1,162 @@
+#!/usr/bin/perl -w
+# pdftops.pl - wrapper script for xpdf's pdftops utility to act as a CUPS filter
+# ==============================================================================
+# 1.00 - 2004-10-05/Bl
+#	Initial implementation
+#
+# Copyright: Helge Blischke / SRZ Berlin 2004
+# This program is free seoftware and governed by the GNU Public License Version 2.
+#
+# Description:
+# ------------
+#	This program wraps the pdftops utility from the xpdf 3.00 (and higher) suite
+#	to behave as a CUPS filter as a replacement for the original pdftops filter.
+#
+#	The main purpose of this approach is to keep the properties of a PDF to be
+#	printed as undesturbed as possible, especially with respect to page size,
+#	scaling, and positioning.
+#
+#	The pdftops utility reads a configuration file 'pdftops.conf' in the 
+#	CUPS_SERVERROOT directory, which must exist but may be empty. The sample
+#	configuration file accompanying this program sets the defaults which
+#	seem plausible to me with respect to high end production printers.
+#
+#	To give the user highest possible flexibility, this program accepts and
+#	evaluates a set of job attributes special to this filter, which are 
+#	described below:
+#	
+#		pdf-pages=<f>,<l>
+#				expands to the -f and -l options of pdftops
+#				to select a page range to process. This is independent
+#				of the page-ranges attribute and may significantly
+#				increase throughput when printing page ranges.
+#				Either of these numbers may be omitted.
+#
+#		pdf-paper=<name>
+#		pdf-paper=<width>x<height>
+#				<name> may be one of letter, legal , A4, A3, or match;
+#				<width> and <height> are the paper width and height
+#				in printers points (1/72 inch). This expands to
+#				either the -paper or the -paperh and -paperw options
+#				of pdftops
+#
+#		pdf-opw=<password>
+#		pdf-upw=<password>
+#				expand to the -opw and -upw options of pdftops,
+#				respectively and permit printing of password
+#				protected PDFs.
+#
+#		pdf-<option>	where <option> is one of
+#				level1, level1sep, level2, level2sep, level3, level3sep,
+#				opi, nocrop, expand, noshrink, nocenter.
+#				See the pdftops manpage for a detailed description of
+#				the respective options.
+#
+#	All other pdftops commandline options are refused.
+#
+#	When printing from STDIN, the program copies the input to a temporary file
+#	in TMPDIR, which is deleted on exit.
+#
+#	The return code of the pdftops utility, if nonzero, is used as the exit code
+#	of this program; error messages of the pdftops utility are only visible
+#	if 'debug' is specified as LogLevel in cupsd.conf.
+
+#
+# Site specific parameters - modify as needed
+# ------------------------------------------------------------------------------
+$pdftops_path = "/usr/bin/pdftops";	# path to the xpdf utility
+# ------------------------------------------------------------------------------
+
+use File::Copy;
+
+#
+# Check the arguments
+#
+die ("ERROR: wrong number of arguments\n") if (scalar @ARGV < 5);
+
+$jobid = $username = $title = $copies = undef;
+$jobid = shift;					# Job ID
+$username = shift;				# Job requesting user name
+$title = shift;					# Job title
+$copies = shift;				# Number of requested copies
+$options = shift;				# Textual representation of job attributes
+$pdffile = shift;				# Pathname of PDF file to process
+
+# If we are reading from STDIN, we must copy the input to a temporary file
+# as the PDF consumer needs a seekable input.
+
+if (! defined $pdffile)
+{
+	my $tmpfile = $ENV{TMPDIR} . "pdfin.$$.tmp";
+	open (TEMP, ">$tmpfile") || die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
+	if (! copy (\*STDIN, \*TEMP))
+	{
+		close (TEMP);
+		unlink $tmpfile;
+		die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
+	}
+	close (TEMP);
+	$pdffile = $tmpfile;
+	$delete_input = 1;			# for deleting the temp file after converting
+}
+
+# 
+# Check the options string for options to modify the bahaviour of the pdftops utility:
+#
+@optarr = split (/\s+/, $options);
+$cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
+# The following are the (parameterless) command line options that may be used to change the 
+# defaults defiend by pdftops.conf
+$simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
+foreach my $option (@optarr)
+{
+	if ($option =~ /^pdf-(.+)$/)
+	{	# We assume this is an option to evaluate
+		my $optkey = $1;		# possible pdftops option
+		if ($optkey =~ /^pages=(\d*),(\d*)$/)
+		{
+			# We do this hack here to avoid clashes with the page-ranges atrribute
+			# which is handled by the pstops filter. And we allow one of the numbers
+			# to be omitted.
+			my $first = $1;
+			my $lastp = $2;
+			$cmdopt .= " -f $1" if ($1);		# first page
+			$cmdopt .= " -l $2" if ($2);		# last page
+		}
+		elsif ($optkey =~ /^paper=(letter|legal|A4|A3|match)$/)
+		{
+			$cmdopt .= " -paper $1";			# paper name
+		}
+		elsif ($optkey =~ /^paper=(\d+)x(\d+)$/)
+		{
+			$cmdopt .= " -paperw $1 -paperh $2";		# paper dimensions
+		}
+		elsif ($optkey =~ /^(o|u)pw=(\S+)$/)
+		{
+			$cmdopt .= " $1" . 'pw ' . $2;			# owner/user password
+		}
+		elsif ($optkey =~ /^($simple)$/)
+		{
+			$cmdopt .= ' -' . $1;				# allowed simple options
+		}
+		else
+		{
+			warn ("ERROR: pdftops wrapper: illegal attribute \"pdf-$optkey\"\n");
+		}
+	}
+	# All other attributes are processed elsewhere
+}
+#
+# Complete the command
+#
+warn ("ERROR: pdftops-options: $cmdopt\n");
+$rc = system ("$pdftops_path $cmdopt $pdffile -");
+if ($rc)
+{
+	$ir = $rc & 127;
+	$rc >>= 8;
+	warn ("ERROR: pdftops_path exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
+	exit $rc;
+}
+unlink ($pdffile) if (defined $delete_input);		# Delete the temp file if any
+exit 0;
--- cupsys-1.2.1.orig/debian/cupsys-client.postinst
+++ cupsys-1.2.1/debian/cupsys-client.postinst
@@ -0,0 +1,64 @@
+#! /bin/sh
+# postinst script for cupsys
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        if [ -z "`getent group lpadmin`" ]; then
+            addgroup --system lpadmin
+        fi
+
+	# Set up cupsys user.
+	if [ -z "`getent passwd cupsys`" ]; then
+	    adduser --system --no-create-home --ingroup lpadmin --disabled-password cupsys
+	fi
+	# necessary for access to local parallel and usb printers
+	adduser --quiet cupsys lp
+	# necessary for access to local serial printers
+	adduser --quiet cupsys dialout
+	# necessary for web authentication
+	# disabled by default since lpadmin membership is sufficient
+	# adduser --quiet cupsys shadow
+	chown cupsys:lpadmin /usr/bin/lppasswd
+
+	chmod u+s /usr/bin/lppasswd
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cupsys-1.2.1.orig/debian/libcupsimage2.shlibs
+++ cupsys-1.2.1/debian/libcupsimage2.shlibs
@@ -0,0 +1 @@
+libcupsimage 2 libcupsimage2 (>= 1.2.1)
--- cupsys-1.2.1.orig/debian/cupsys-bsd.preinst
+++ cupsys-1.2.1/debian/cupsys-bsd.preinst
@@ -0,0 +1,40 @@
+#! /bin/sh
+# preinst script for cupsys-bsd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if [ ! -L /usr/share/doc/cupsys-bsd ]; then
+	    rm -rf /usr/share/doc/cupsys-bsd
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+