[Pkg-cups-devel] r775 - in cupsys/trunk: . debian debian/filters debian/patches debian/po
Martin Pitt
mpitt at alioth.debian.org
Fri May 23 08:28:18 UTC 2008
Author: mpitt
Date: Fri May 23 08:28:17 2008
New Revision: 775
Log:
* Rename the package to cups. This is the proper upstream name. Upstream has
made it clear that the usual distro patches are not a trademark violation.
This unbreaks all the documentation out there, which refers to "cups", not
"cupsys" (including names of the init script), as well as unbreaks
dependencies of openprinting.org's LSB printer driver packages.
(Closes: #482296, LP: #233790)
* debian/cups.{config,postinst}: Remove some old cruft.
* debian/cups.preinst: Move conffiles to new names on upgrades, in a dpkg
conffile question avoiding manner.
Added:
cupsys/trunk/debian/cups-bsd.config
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.config
cupsys/trunk/debian/cups-bsd.install
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.install
cupsys/trunk/debian/cups-bsd.postinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.postinst
cupsys/trunk/debian/cups-bsd.postrm
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.postrm
cupsys/trunk/debian/cups-bsd.preinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.preinst
cupsys/trunk/debian/cups-bsd.prerm
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.prerm
cupsys/trunk/debian/cups-bsd.templates
- copied, changed from r774, /cupsys/trunk/debian/cupsys-bsd.templates
cupsys/trunk/debian/cups-client.install
- copied, changed from r774, /cupsys/trunk/debian/cupsys-client.install
cupsys/trunk/debian/cups-client.links
- copied, changed from r774, /cupsys/trunk/debian/cupsys-client.links
cupsys/trunk/debian/cups-client.postinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys-client.postinst
cupsys/trunk/debian/cups-client.preinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys-client.preinst
cupsys/trunk/debian/cups-common.install
- copied, changed from r774, /cupsys/trunk/debian/cupsys-common.install
cupsys/trunk/debian/cups.config
- copied, changed from r774, /cupsys/trunk/debian/cupsys.config
cupsys/trunk/debian/cups.default
- copied, changed from r774, /cupsys/trunk/debian/cupsys.default
cupsys/trunk/debian/cups.dirs
- copied, changed from r774, /cupsys/trunk/debian/cupsys.dirs
cupsys/trunk/debian/cups.doc-base
- copied, changed from r774, /cupsys/trunk/debian/cupsys.doc-base
cupsys/trunk/debian/cups.docs
- copied, changed from r774, /cupsys/trunk/debian/cupsys.docs
cupsys/trunk/debian/cups.examples
- copied, changed from r774, /cupsys/trunk/debian/cupsys.examples
cupsys/trunk/debian/cups.init.d
- copied, changed from r774, /cupsys/trunk/debian/cupsys.init.d
cupsys/trunk/debian/cups.install
- copied, changed from r774, /cupsys/trunk/debian/cupsys.install
cupsys/trunk/debian/cups.lintian-overrides
- copied, changed from r774, /cupsys/trunk/debian/cupsys.lintian-overrides
cupsys/trunk/debian/cups.logrotate
- copied, changed from r774, /cupsys/trunk/debian/cupsys.logrotate
cupsys/trunk/debian/cups.pam
- copied, changed from r774, /cupsys/trunk/debian/cupsys.pam
cupsys/trunk/debian/cups.postinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys.postinst
cupsys/trunk/debian/cups.postrm
- copied, changed from r774, /cupsys/trunk/debian/cupsys.postrm
cupsys/trunk/debian/cups.preinst
- copied, changed from r774, /cupsys/trunk/debian/cupsys.preinst
cupsys/trunk/debian/cups.prerm
- copied, changed from r774, /cupsys/trunk/debian/cupsys.prerm
cupsys/trunk/debian/cups.templates
- copied, changed from r774, /cupsys/trunk/debian/cupsys.templates
cupsys/trunk/debian/libcups2-dev.examples
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2-dev.examples
cupsys/trunk/debian/libcups2-dev.install
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2-dev.install
cupsys/trunk/debian/libcups2-dev.preinst
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2-dev.preinst
cupsys/trunk/debian/libcups2.dirs
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2.dirs
cupsys/trunk/debian/libcups2.examples
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2.examples
cupsys/trunk/debian/libcups2.install
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2.install
cupsys/trunk/debian/libcups2.postinst
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2.postinst
cupsys/trunk/debian/libcups2.shlibs
- copied, changed from r774, /cupsys/trunk/debian/libcupsys2.shlibs
Removed:
cupsys/trunk/debian/cupsys-bsd.config
cupsys/trunk/debian/cupsys-bsd.install
cupsys/trunk/debian/cupsys-bsd.postinst
cupsys/trunk/debian/cupsys-bsd.postrm
cupsys/trunk/debian/cupsys-bsd.preinst
cupsys/trunk/debian/cupsys-bsd.prerm
cupsys/trunk/debian/cupsys-bsd.templates
cupsys/trunk/debian/cupsys-client.install
cupsys/trunk/debian/cupsys-client.links
cupsys/trunk/debian/cupsys-client.postinst
cupsys/trunk/debian/cupsys-client.preinst
cupsys/trunk/debian/cupsys-common.install
cupsys/trunk/debian/cupsys.config
cupsys/trunk/debian/cupsys.default
cupsys/trunk/debian/cupsys.dirs
cupsys/trunk/debian/cupsys.doc-base
cupsys/trunk/debian/cupsys.docs
cupsys/trunk/debian/cupsys.examples
cupsys/trunk/debian/cupsys.init.d
cupsys/trunk/debian/cupsys.install
cupsys/trunk/debian/cupsys.lintian-overrides
cupsys/trunk/debian/cupsys.logrotate
cupsys/trunk/debian/cupsys.pam
cupsys/trunk/debian/cupsys.postinst
cupsys/trunk/debian/cupsys.postrm
cupsys/trunk/debian/cupsys.preinst
cupsys/trunk/debian/cupsys.prerm
cupsys/trunk/debian/cupsys.templates
cupsys/trunk/debian/libcupsys2-dev.examples
cupsys/trunk/debian/libcupsys2-dev.install
cupsys/trunk/debian/libcupsys2-dev.preinst
cupsys/trunk/debian/libcupsys2.dirs
cupsys/trunk/debian/libcupsys2.examples
cupsys/trunk/debian/libcupsys2.install
cupsys/trunk/debian/libcupsys2.lintian-overrides
cupsys/trunk/debian/libcupsys2.postinst
cupsys/trunk/debian/libcupsys2.shlibs
cupsys/trunk/debian/patches/pam.dpatch
Modified:
cupsys/trunk/ (props changed)
cupsys/trunk/debian/HOWTO_BUGREPORT.txt
cupsys/trunk/debian/README.Debian
cupsys/trunk/debian/changelog
cupsys/trunk/debian/control
cupsys/trunk/debian/filters/dvipipetops
cupsys/trunk/debian/filters/dvipipetops.INSTALL
cupsys/trunk/debian/filters/dvipipetops.convs
cupsys/trunk/debian/libcupsimage2.postinst
cupsys/trunk/debian/patches/00list
cupsys/trunk/debian/patches/CVE-2008-1722.dpatch
cupsys/trunk/debian/patches/classes_crash.dpatch
cupsys/trunk/debian/patches/confdirperms.dpatch
cupsys/trunk/debian/patches/cupsaccept.dpatch
cupsys/trunk/debian/patches/default_log_warn.dpatch
cupsys/trunk/debian/patches/device_uri.dpatch
cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch
cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
cupsys/trunk/debian/patches/quiesce_ipp_logging.dpatch
cupsys/trunk/debian/patches/reactivate_recommended_driver.dpatch
cupsys/trunk/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch
cupsys/trunk/debian/po/POTFILES.in
cupsys/trunk/debian/po/ca.po
cupsys/trunk/debian/po/cs.po
cupsys/trunk/debian/po/da.po
cupsys/trunk/debian/po/de.po
cupsys/trunk/debian/po/es.po
cupsys/trunk/debian/po/eu.po
cupsys/trunk/debian/po/fi.po
cupsys/trunk/debian/po/fr.po
cupsys/trunk/debian/po/gl.po
cupsys/trunk/debian/po/it.po
cupsys/trunk/debian/po/ja.po
cupsys/trunk/debian/po/ml.po
cupsys/trunk/debian/po/nb.po
cupsys/trunk/debian/po/nl.po
cupsys/trunk/debian/po/pt.po
cupsys/trunk/debian/po/pt_BR.po
cupsys/trunk/debian/po/ru.po
cupsys/trunk/debian/po/sv.po
cupsys/trunk/debian/po/templates.pot
cupsys/trunk/debian/po/tr.po
cupsys/trunk/debian/po/vi.po
cupsys/trunk/debian/rules
Modified: cupsys/trunk/debian/HOWTO_BUGREPORT.txt
==============================================================================
--- cupsys/trunk/debian/HOWTO_BUGREPORT.txt (original)
+++ cupsys/trunk/debian/HOWTO_BUGREPORT.txt Fri May 23 08:28:17 2008
@@ -8,7 +8,7 @@
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,
+ /etc/init.d/cups 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/.
Modified: cupsys/trunk/debian/README.Debian
==============================================================================
--- cupsys/trunk/debian/README.Debian (original)
+++ cupsys/trunk/debian/README.Debian Fri May 23 08:28:17 2008
@@ -1,4 +1,4 @@
-cupsys for Debian
+cups for Debian
----------------------
If you found a problem, please read HOWTO_BUGREPORT.txt and report me
@@ -46,7 +46,7 @@
if you use PPC, parallel backend is off also.
If you want to use these backends, you can configure by using
-'dpkg-reconfigure cupsys'.
+'dpkg-reconfigure cups'.
SSL Support
-----------
@@ -57,7 +57,7 @@
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
+that support CUPS. Therefore, the cups packages as shipped do not
support SSL.
It is possible to build the packages yourself with SSL support. You
@@ -74,7 +74,7 @@
Important Security Notes
------------------------
- - By default, cupsys is configured to only allow connections to
+ - By default, cups 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
@@ -114,7 +114,7 @@
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
+ apt-cache show cups | 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
@@ -136,7 +136,7 @@
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
+package (cups-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
@@ -148,20 +148,20 @@
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)
+ cups-driver-foo (for a driver for Foo printers)
+ cups-backend-bar (for a backend to print to Bar printers)
+ cups-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.
+wishlist bug against cups requesting that it be added to the
+Suggests line for cups.
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
+them in the "examples" directory with the rest of the cups package
documentation files. Check there for some interesting filters and
backends.
@@ -202,10 +202,10 @@
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.
+This method will require installation of the cups-client package.
For more tips on integration with Samba, check out the man page for
-cupsaddsmb, which is part of the cupsys-client package.
+cupsaddsmb, which is part of the cups-client package.
Miscellaneous Tips
------------------
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Fri May 23 08:28:17 2008
@@ -1,9 +1,18 @@
-cupsys (1.3.7-6) UNRELEASED; urgency=low
+cups (1.3.7-6) UNRELEASED; urgency=low
+ * Rename the package to cups. This is the proper upstream name. Upstream has
+ made it clear that the usual distro patches are not a trademark violation.
+ This unbreaks all the documentation out there, which refers to "cups", not
+ "cupsys" (including names of the init script), as well as unbreaks
+ dependencies of openprinting.org's LSB printer driver packages.
+ (Closes: #482296, LP: #233790)
+ * debian/cups.{config,postinst}: Remove some old cruft.
+ * debian/cups.preinst: Move conffiles to new names on upgrades, in a dpkg
+ conffile question avoiding manner.
* debian/cupsys.install: Install oopstops.{convs,types} in /etc/cups, they
do not work in /usr/share/cups/mime (loaded too early). (Closes: #474109)
- -- Martin Pitt <mpitt at debian.org> Wed, 30 Apr 2008 00:12:37 +0200
+ -- Martin Pitt <mpitt at debian.org> Fri, 23 May 2008 00:32:17 +0200
cupsys (1.3.7-5) unstable; urgency=low
Modified: cupsys/trunk/debian/control
==============================================================================
--- cupsys/trunk/debian/control (original)
+++ cupsys/trunk/debian/control Fri May 23 08:28:17 2008
@@ -1,4 +1,4 @@
-Source: cupsys
+Source: cups
Priority: optional
Section: net
Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
@@ -15,14 +15,15 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-cups/cupsys/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cups/cupsys/trunk
-Package: libcupsys2
+Package: libcups2
Priority: optional
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: cupsys-common
-Replaces: cupsys-client (<= 1.1.10-2)
-Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), cupsys (<< 1.2.1)
+Suggests: cups-common
+Conflicts: libcupsys2 (<< 1.3.7-6)
+Replaces: libcupsys2 (<< 1.3.7-6)
+Provides: libcupsys2
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
@@ -40,8 +41,6 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: libcupsys2 (<= 1.1.18-2)
-Conflicts: cupsys (<< 1.2.1)
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
@@ -55,20 +54,21 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: cupsys
+Package: cups
Priority: optional
Section: net
Architecture: any
Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0,
poppler-utils | xpdf-utils, perl-modules, procps,
- ghostscript | gs-esp, lsb-base (>= 3), cupsys-common,
+ ghostscript | gs-esp, lsb-base (>= 3), cups-common,
ssl-cert (>= 1.0.11), adduser
-Replaces: cupsys-pstoraster, cupsys-bsd (<< 1.3.7-5)
-Conflicts: cupsys-pstoraster (<< 2), cupsys-bsd (<< 1.3.7-5)
-Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
-Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds,
+Recommends: cups-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
+Suggests: cups-bsd, cups-driver-gutenprint, foomatic-filters-ppds,
hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified,
cups-pdf
+Replaces: cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6)
+Conflicts: cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6)
+Provides: cupsys
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
@@ -81,14 +81,15 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: cupsys-client
+Package: cups-client
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, cupsys-common, adduser
-Conflicts: lprng
-Suggests: cupsys, kdeprint, gtklp, cupsys-pt, xpp, cupsys-bsd
-Replaces: cupsys (<= 1.1.18-3)
+Depends: ${shlibs:Depends}, cups-common, adduser
+Suggests: cups, kdeprint, gtklp, cups-pt, xpp, cups-bsd
+Conflicts: lprng, cupsys-client (<< 1.3.7-6)
+Replaces: cupsys-client (<< 1.3.7-6)
+Provides: cupsys-client
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
@@ -101,14 +102,14 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: libcupsys2-dev
+Package: libcups2-dev
Priority: optional
Section: libdevel
Architecture: any
-Depends: libcupsys2 (= ${binary:Version}), libgnutls-dev, libkrb5-dev | heimdal-dev
-Provides: libcupsys-dev
-Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
-Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
+Depends: libcups2 (= ${binary:Version}), libgnutls-dev, libkrb5-dev | heimdal-dev
+Conflicts: libcupsys2-dev (<< 1.3.7-6)
+Replaces: libcupsys2-dev (<< 1.3.7-6)
+Provides: libcupsys2-dev
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
@@ -117,7 +118,7 @@
.
This package provides the files necessary for developing CUPS-aware
applications and CUPS drivers, as well as examples how to communicate
- with cupsys from different programming languages (Perl, Java, and
+ with cups from different programming languages (Perl, Java, and
PHP).
.
The terms "Common UNIX Printing System" and "CUPS" are trademarks of
@@ -128,11 +129,8 @@
Priority: optional
Section: libdevel
Architecture: any
-Depends: libcupsimage2 (= ${binary:Version}), libcupsys2-dev (= ${binary:Version}),
+Depends: libcupsimage2 (= ${binary:Version}), libcups2-dev (= ${binary: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
@@ -146,16 +144,16 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: cupsys-bsd
+Package: cups-bsd
Priority: extra
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, cupsys-client (= ${binary:Version}),
- debconf | debconf-2.0, update-inetd, cupsys-common
-Recommends: cupsys
-Conflicts: lpr, lprng, manpages-fr (<< 0.9.5-1)
-Provides: lpr
-Replaces: lpr, cupsys (<= 1.1.15-2), manpages-fr (<< 0.9.5-1)
+Depends: ${shlibs:Depends}, cups-client (= ${binary:Version}),
+ debconf | debconf-2.0, update-inetd, cups-common
+Recommends: cups
+Conflicts: lpr, lprng, cupsys-bsd (<< 1.3.7-6)
+Replaces: lpr, cupsys-bsd (<< 1.3.7-6)
+Provides: lpr, cupsys-bsd
Description: Common UNIX Printing System(tm) - BSD commands
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
general replacement for lpr, lpd and the like. It supports the
@@ -170,13 +168,14 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: cupsys-common
+Package: cups-common
Priority: optional
Section: net
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: cupsys (<< 1.2.3)
-Replaces: cupsys (<< 1.2.3)
+Conflicts: cupsys-common (<< 1.3.7-6)
+Replaces: cupsys-common (<< 1.3.7-6)
+Provides: cupsys-common
Description: Common UNIX Printing System(tm) - common 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
@@ -189,11 +188,13 @@
Easy Software Products (www.easysw.com), and refer to the original
source packages from which these packages are made.
-Package: cupsys-dbg
+Package: cups-dbg
Priority: extra
Section: libdevel
Architecture: any
-Depends: cupsys (= ${binary:Version})
+Depends: cups (= ${binary:Version})
+Conflicts: cupsys-dbg (<< 1.3.7-6)
+Replaces: cupsys-dbg (<< 1.3.7-6)
Description: Common UNIX Printing System(tm) - debugging symbols
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
general replacement for lpd and the like. It supports the Internet
@@ -205,3 +206,53 @@
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
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: cups
+Description: Common UNIX Printing System (transitional package)
+ This is a dummy package to ease transition to new package name.
+ .
+ It can be safely removed from your system.
+
+Package: cupsys-client
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: cups-client
+Description: Common UNIX Printing System (transitional package)
+ This is a dummy package to ease transition to new package name.
+ .
+ It can be safely removed from your system.
+
+Package: cupsys-bsd
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: cups-bsd
+Description: Common UNIX Printing System (transitional package)
+ This is a dummy package to ease transition to new package name.
+ .
+ It can be safely removed from your system.
+
+Package: cupsys-dbg
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: cups-dbg
+Description: Common UNIX Printing System (transitional package)
+ This is a dummy package to ease transition to new package name.
+ .
+ It can be safely removed from your system.
+
+Package: libcupsys2
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: libcups2
+Description: Common UNIX Printing System (transitional package)
+ This is a dummy package to ease transition to new package name.
+ .
+ It can be safely removed from your system.
Copied: cupsys/trunk/debian/cups-bsd.config (from r774, /cupsys/trunk/debian/cupsys-bsd.config)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.config (original)
+++ cupsys/trunk/debian/cups-bsd.config Fri May 23 08:28:17 2008
@@ -5,5 +5,5 @@
# Debconf library
. /usr/share/debconf/confmodule
-db_input medium cupsys-bsd/setuplpd || true
+db_input medium cups-bsd/setuplpd || true
db_go
Copied: cupsys/trunk/debian/cups-bsd.install (from r774, /cupsys/trunk/debian/cupsys-bsd.install)
==============================================================================
Copied: cupsys/trunk/debian/cups-bsd.postinst (from r774, /cupsys/trunk/debian/cupsys-bsd.postinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.postinst (original)
+++ cupsys/trunk/debian/cups-bsd.postinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
#
# see: dh_installdeb(1)
@@ -29,14 +29,14 @@
configure)
# Set documentation symlinks
- if [ -d /usr/share/doc/cupsys ]; then
- if [ ! -e /usr/share/doc/cupsys-bsd ]; then
- ln -sf cupsys-common /usr/share/doc/cupsys-bsd
+ if [ -d /usr/share/doc/cups ]; then
+ if [ ! -e /usr/share/doc/cups-bsd ]; then
+ ln -sf cups-common /usr/share/doc/cups-bsd
fi
fi
# Add cups-lpd to inetd.conf
- db_get cupsys-bsd/setuplpd
+ db_get cups-bsd/setuplpd
if [ "$RET" = "true" ]; then
update-inetd --add 'printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd'
fi
Copied: cupsys/trunk/debian/cups-bsd.postrm (from r774, /cupsys/trunk/debian/cupsys-bsd.postrm)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.postrm (original)
+++ cupsys/trunk/debian/cups-bsd.postrm Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postrm script for cupsys-bsd
+# postrm script for cups-bsd
#
# see: dh_installdeb(1)
Copied: cupsys/trunk/debian/cups-bsd.preinst (from r774, /cupsys/trunk/debian/cupsys-bsd.preinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.preinst (original)
+++ cupsys/trunk/debian/cups-bsd.preinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# preinst script for cupsys-bsd
+# preinst script for cups-bsd
#
# see: dh_installdeb(1)
@@ -16,8 +16,8 @@
;;
upgrade)
- if [ ! -L /usr/share/doc/cupsys-bsd ]; then
- rm -rf /usr/share/doc/cupsys-bsd
+ if [ ! -L /usr/share/doc/cups-bsd ]; then
+ rm -rf /usr/share/doc/cups-bsd
fi
;;
Copied: cupsys/trunk/debian/cups-bsd.prerm (from r774, /cupsys/trunk/debian/cupsys-bsd.prerm)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.prerm (original)
+++ cupsys/trunk/debian/cups-bsd.prerm Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# prerm script for cupsys-bsd
+# prerm script for cups-bsd
#
# see: dh_installdeb(1)
@@ -22,7 +22,7 @@
case "$1" in
remove|upgrade|deconfigure)
# Remove documentation links
- rm -rf /usr/share/doc/cupsys-bsd
+ rm -rf /usr/share/doc/cups-bsd
# Disable inetd entry
update-inetd --pattern cups-lpd --disable printer
Copied: cupsys/trunk/debian/cups-bsd.templates (from r774, /cupsys/trunk/debian/cupsys-bsd.templates)
==============================================================================
--- /cupsys/trunk/debian/cupsys-bsd.templates (original)
+++ cupsys/trunk/debian/cups-bsd.templates Fri May 23 08:28:17 2008
@@ -1,7 +1,7 @@
# These templates have been reviewed by debian-l10n-english
# Please do not modify them without asking for a review
-Template: cupsys-bsd/setuplpd
+Template: cups-bsd/setuplpd
Type: boolean
Default: false
_Description: Do you want to set up the BSD lpd compatibility server?
Copied: cupsys/trunk/debian/cups-client.install (from r774, /cupsys/trunk/debian/cupsys-client.install)
==============================================================================
Copied: cupsys/trunk/debian/cups-client.links (from r774, /cupsys/trunk/debian/cupsys-client.links)
==============================================================================
Copied: cupsys/trunk/debian/cups-client.postinst (from r774, /cupsys/trunk/debian/cupsys-client.postinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys-client.postinst (original)
+++ cupsys/trunk/debian/cups-client.postinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
#
# see: dh_installdeb(1)
Copied: cupsys/trunk/debian/cups-client.preinst (from r774, /cupsys/trunk/debian/cupsys-client.preinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys-client.preinst (original)
+++ cupsys/trunk/debian/cups-client.preinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# preinst script for cupsys-client
+# preinst script for cups-client
#
# see: dh_installdeb(1)
@@ -16,8 +16,8 @@
;;
upgrade)
- if [ ! -L /usr/share/doc/cupsys-client ]; then
- rm -rf /usr/share/doc/cupsys-client
+ if [ ! -L /usr/share/doc/cups-client ]; then
+ rm -rf /usr/share/doc/cups-client
fi
;;
Copied: cupsys/trunk/debian/cups-common.install (from r774, /cupsys/trunk/debian/cupsys-common.install)
==============================================================================
Copied: cupsys/trunk/debian/cups.config (from r774, /cupsys/trunk/debian/cupsys.config)
==============================================================================
--- /cupsys/trunk/debian/cupsys.config (original)
+++ cupsys/trunk/debian/cups.config Fri May 23 08:28:17 2008
@@ -2,54 +2,9 @@
set -e
-CONF=/etc/cups/cupsd.conf
-PORTS=/etc/cups/cups.d/ports.conf
-BROWSE=/etc/cups/cups.d/browse.conf
-
# 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
@@ -72,63 +27,3 @@
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" $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
-# 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
Copied: cupsys/trunk/debian/cups.default (from r774, /cupsys/trunk/debian/cupsys.default)
==============================================================================
Copied: cupsys/trunk/debian/cups.dirs (from r774, /cupsys/trunk/debian/cupsys.dirs)
==============================================================================
--- /cupsys/trunk/debian/cupsys.dirs (original)
+++ cupsys/trunk/debian/cups.dirs Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
var/run/cups
-usr/share/doc/cupsys
+usr/share/doc/cups
usr/share/cups/drivers
etc/default
etc/cups/ssl
Copied: cupsys/trunk/debian/cups.doc-base (from r774, /cupsys/trunk/debian/cupsys.doc-base)
==============================================================================
--- /cupsys/trunk/debian/cupsys.doc-base (original)
+++ cupsys/trunk/debian/cups.doc-base Fri May 23 08:28:17 2008
@@ -1,4 +1,4 @@
-Document: cupsys
+Document: cups
Title: CUPS Documentation
Author: Easy Software Products
Abstract: This documentation covers the use and administration of a CUPS
@@ -6,5 +6,5 @@
Section: System/Hardware
Format: HTML
-Index: /usr/share/doc/cupsys/online-docs/index.html
-Files: /usr/share/doc/cupsys/online-docs/*.html
+Index: /usr/share/doc/cups/online-docs/index.html
+Files: /usr/share/doc/cups/online-docs/*.html
Copied: cupsys/trunk/debian/cups.docs (from r774, /cupsys/trunk/debian/cupsys.docs)
==============================================================================
Copied: cupsys/trunk/debian/cups.examples (from r774, /cupsys/trunk/debian/cupsys.examples)
==============================================================================
Copied: cupsys/trunk/debian/cups.init.d (from r774, /cupsys/trunk/debian/cupsys.init.d)
==============================================================================
--- /cupsys/trunk/debian/cupsys.init.d (original)
+++ cupsys/trunk/debian/cups.init.d Fri May 23 08:28:17 2008
@@ -1,6 +1,6 @@
#! /bin/sh
### BEGIN INIT INFO
-# Provides: cupsys
+# Provides: cups
# Required-Start: $syslog
# Required-Stop: $syslog
# Should-Start: $network avahi
@@ -24,8 +24,8 @@
set -e
-if [ -r /etc/default/cupsys ]; then
- . /etc/default/cupsys
+if [ -r /etc/default/cups ]; then
+ . /etc/default/cups
fi
. /lib/lsb/init-functions
Copied: cupsys/trunk/debian/cups.install (from r774, /cupsys/trunk/debian/cupsys.install)
==============================================================================
--- /cupsys/trunk/debian/cupsys.install (original)
+++ cupsys/trunk/debian/cups.install Fri May 23 08:28:17 2008
@@ -33,7 +33,7 @@
usr/share/man/man8/cups-deviced.8.gz
usr/share/man/man8/cups-driverd.8.gz
usr/share/man/man8/cupsfilter.8.gz
-../presubj usr/share/bug/cupsys/
+../presubj usr/share/bug/cups/
../local/backends/* usr/lib/cups/backend-available/
../local/filters/* usr/lib/cups/filter/
../local/*.ppd usr/share/ppd/cups-included/
Copied: cupsys/trunk/debian/cups.lintian-overrides (from r774, /cupsys/trunk/debian/cupsys.lintian-overrides)
==============================================================================
--- /cupsys/trunk/debian/cupsys.lintian-overrides (original)
+++ cupsys/trunk/debian/cups.lintian-overrides Fri May 23 08:28:17 2008
@@ -1,4 +1,4 @@
-cupsys: executable-is-not-world-readable usr/lib/cups/backend-available/ipp 0700 != 0755
-cupsys: executable-is-not-world-readable usr/lib/cups/backend-available/lpd 0700 != 0755
-cupsys: package-contains-empty-directory usr/share/ppd/custom/
-cupsys: package-contains-empty-directory usr/lib/cups/backend/
+cups: executable-is-not-world-readable usr/lib/cups/backend-available/ipp 0700 != 0755
+cups: executable-is-not-world-readable usr/lib/cups/backend-available/lpd 0700 != 0755
+cups: package-contains-empty-directory usr/share/ppd/custom/
+cups: package-contains-empty-directory usr/lib/cups/backend/
Copied: cupsys/trunk/debian/cups.logrotate (from r774, /cupsys/trunk/debian/cupsys.logrotate)
==============================================================================
--- /cupsys/trunk/debian/cupsys.logrotate (original)
+++ cupsys/trunk/debian/cups.logrotate Fri May 23 08:28:17 2008
@@ -5,7 +5,7 @@
sharedscripts
postrotate
if [ -e /var/run/cups/cupsd.pid ]; then
- invoke-rc.d --quiet cupsys force-reload > /dev/null
+ invoke-rc.d --quiet cups force-reload > /dev/null
sleep 10
fi
endscript
Copied: cupsys/trunk/debian/cups.pam (from r774, /cupsys/trunk/debian/cupsys.pam)
==============================================================================
Copied: cupsys/trunk/debian/cups.postinst (from r774, /cupsys/trunk/debian/cupsys.postinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys.postinst (original)
+++ cupsys/trunk/debian/cups.postinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
#
# see: dh_installdeb(1)
@@ -26,15 +26,12 @@
. /usr/share/debconf/confmodule
# Default Configuration file
-if [ -e /etc/default/cupsys ]; then
- . /etc/default/cupsys
+if [ -e /etc/default/cups ]; then
+ . /etc/default/cups
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
@@ -47,17 +44,10 @@
rm -f /usr/share/cups/model/cups-included
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
+# This file was generated by the cups package. You may change it, or
# reconfigure this file with dpkg-reconfigure. If it is removed, it
# will be regenerated by the package scripts.
@@ -66,7 +56,7 @@
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
+# This file was generated by the cups package. You may change it, or
# reconfigure this file with dpkg-reconfigure. If it is removed, it
# will be regenerated by the package scripts.
@@ -142,7 +132,7 @@
# Remove shutdown and reboot links; this init script does not need them.
if dpkg --compare-versions "$2" lt-nl "1.3.6-2"; then
- rm -f /etc/rc0.d/K??cupsys /etc/rc6.d/K??cupsys
+ rm -f /etc/rc0.d/K??cups /etc/rc6.d/K??cups
fi
# Reload AppArmor profile if present
Copied: cupsys/trunk/debian/cups.postrm (from r774, /cupsys/trunk/debian/cupsys.postrm)
==============================================================================
--- /cupsys/trunk/debian/cupsys.postrm (original)
+++ cupsys/trunk/debian/cups.postrm Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postrm script for cupsys
+# postrm script for cups
#
# see: dh_installdeb(1)
Copied: cupsys/trunk/debian/cups.preinst (from r774, /cupsys/trunk/debian/cupsys.preinst)
==============================================================================
--- /cupsys/trunk/debian/cupsys.preinst (original)
+++ cupsys/trunk/debian/cups.preinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# preinst script for cupsys
+# preinst script for cups
#
# see: dh_installdeb(1)
@@ -11,6 +11,23 @@
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
+mv_conffile() {
+ OLD="$1"
+ NEW="$2"
+ PKGNAME="cupsys"
+ if [ -e "$OLD" ]; then
+ md5sum=$(md5sum "$OLD" | sed -e 's/ .*//')
+ old_md5sum=$(dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e "\\' $OLD'{s/ obsolete$//;s/.* //p}")
+ if [ "$md5sum" = "$old_md5sum" ]; then
+ echo "Removing obsolete unchanged $OLD..." >&2
+ rm -f "$OLD"
+ else
+ echo "Moving customized $OLD to new location $NEW..." >&2
+ mv -f "$OLD" "$NEW"
+ fi
+ fi
+}
+
case "$1" in
install)
;;
@@ -42,6 +59,14 @@
fi
chown -R root /etc/cups /var/log/cups /var/cache/cups /var/spool/cups
fi
+
+ # cupsys -> cups package/file rename
+ if dpkg --compare-versions "$2" le '1.3.7-6'; then
+ mv_conffile /etc/default/cupsys /etc/default/cups
+ mv_conffile /etc/init.d/cupsys /etc/init.d/cups
+ mv_conffile /etc/pam.d/cupsys /etc/pam.d/cups
+ mv_conffile /etc/logrotate.d/cupsys /etc/logrotate.d/cups
+ fi
;;
abort-upgrade)
Copied: cupsys/trunk/debian/cups.prerm (from r774, /cupsys/trunk/debian/cupsys.prerm)
==============================================================================
--- /cupsys/trunk/debian/cupsys.prerm (original)
+++ cupsys/trunk/debian/cups.prerm Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# prerm script for cupsys
+# prerm script for cups
#
# see: dh_installdeb(1)
Copied: cupsys/trunk/debian/cups.templates (from r774, /cupsys/trunk/debian/cupsys.templates)
==============================================================================
Modified: cupsys/trunk/debian/filters/dvipipetops
==============================================================================
--- cupsys/trunk/debian/filters/dvipipetops (original)
+++ cupsys/trunk/debian/filters/dvipipetops Fri May 23 08:28:17 2008
@@ -22,12 +22,12 @@
#
# 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.
+# date) distributed with the Debian cups package in
+# /usr/share/doc/cups/examples/filters/dvipipetops.
#
# This script...
#
-# - works with Debian cupsys version 1.1.20final+cvs20040330-1.
+# - works with Debian cups 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.
@@ -69,7 +69,7 @@
CUPS_DVIPS_OPTS=""
# Load configuration from default file.
-. /etc/default/cupsys
+. /etc/default/cups
## I do not expect you to want to change anything below here,
## except possibly to (dis)include the debugging statements.
Modified: cupsys/trunk/debian/filters/dvipipetops.INSTALL
==============================================================================
--- cupsys/trunk/debian/filters/dvipipetops.INSTALL (original)
+++ cupsys/trunk/debian/filters/dvipipetops.INSTALL Fri May 23 08:28:17 2008
@@ -4,4 +4,4 @@
- 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
+- restart cups with /etc/init.d/cups restart
Modified: cupsys/trunk/debian/filters/dvipipetops.convs
==============================================================================
--- cupsys/trunk/debian/filters/dvipipetops.convs (original)
+++ cupsys/trunk/debian/filters/dvipipetops.convs Fri May 23 08:28:17 2008
@@ -1,4 +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.
+# You can setup dvips options with /etc/default/cups.
application/x-dvi application/postscript 33 dvipipetops
Copied: cupsys/trunk/debian/libcups2-dev.examples (from r774, /cupsys/trunk/debian/libcupsys2-dev.examples)
==============================================================================
Copied: cupsys/trunk/debian/libcups2-dev.install (from r774, /cupsys/trunk/debian/libcupsys2-dev.install)
==============================================================================
Copied: cupsys/trunk/debian/libcups2-dev.preinst (from r774, /cupsys/trunk/debian/libcupsys2-dev.preinst)
==============================================================================
--- /cupsys/trunk/debian/libcupsys2-dev.preinst (original)
+++ cupsys/trunk/debian/libcups2-dev.preinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# preinst script for libcupsys2-dev
+# preinst script for libcups2-dev
#
# see: dh_installdeb(1)
@@ -16,8 +16,8 @@
;;
upgrade)
- if [ ! -L /usr/share/doc/libcupsys2-dev ]; then
- rm -rf /usr/share/doc/libcupsys2-dev
+ if [ ! -L /usr/share/doc/libcups2-dev ]; then
+ rm -rf /usr/share/doc/libcups2-dev
fi
;;
Copied: cupsys/trunk/debian/libcups2.dirs (from r774, /cupsys/trunk/debian/libcupsys2.dirs)
==============================================================================
Copied: cupsys/trunk/debian/libcups2.examples (from r774, /cupsys/trunk/debian/libcupsys2.examples)
==============================================================================
Copied: cupsys/trunk/debian/libcups2.install (from r774, /cupsys/trunk/debian/libcupsys2.install)
==============================================================================
Copied: cupsys/trunk/debian/libcups2.postinst (from r774, /cupsys/trunk/debian/libcupsys2.postinst)
==============================================================================
--- /cupsys/trunk/debian/libcupsys2.postinst (original)
+++ cupsys/trunk/debian/libcups2.postinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
#
# see: dh_installdeb(1)
Copied: cupsys/trunk/debian/libcups2.shlibs (from r774, /cupsys/trunk/debian/libcupsys2.shlibs)
==============================================================================
--- /cupsys/trunk/debian/libcupsys2.shlibs (original)
+++ cupsys/trunk/debian/libcups2.shlibs Fri May 23 08:28:17 2008
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.3.4)
+libcups 2 libcups2 (>= 1.3.7)
Modified: cupsys/trunk/debian/libcupsimage2.postinst
==============================================================================
--- cupsys/trunk/debian/libcupsimage2.postinst (original)
+++ cupsys/trunk/debian/libcupsimage2.postinst Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
#
# see: dh_installdeb(1)
Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list (original)
+++ cupsys/trunk/debian/patches/00list Fri May 23 08:28:17 2008
@@ -1,7 +1,6 @@
CVE-2008-1722.dpatch
freebsd.dpatch
removecvstag.dpatch
-pam.dpatch
quiesce_ipp_logging.dpatch
default_log_warn.dpatch
dont_force_ssl.dpatch
Modified: cupsys/trunk/debian/patches/CVE-2008-1722.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/CVE-2008-1722.dpatch (original)
+++ cupsys/trunk/debian/patches/CVE-2008-1722.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: http://www.cups.org/str.php?L2790
@DPATCH@
-diff -urNad cupsys-1.3.7~/filter/image-png.c cupsys-1.3.7/filter/image-png.c
---- cupsys-1.3.7~/filter/image-png.c 2007-07-11 23:46:42.000000000 +0200
-+++ cupsys-1.3.7/filter/image-png.c 2008-04-21 13:20:12.000000000 +0200
+diff -urNad cups-1.3.7~/filter/image-png.c cups-1.3.7/filter/image-png.c
+--- cups-1.3.7~/filter/image-png.c 2007-07-11 23:46:42.000000000 +0200
++++ cups-1.3.7/filter/image-png.c 2008-04-21 13:20:12.000000000 +0200
@@ -3,7 +3,7 @@
*
* PNG image routines for the Common UNIX Printing System (CUPS).
Modified: cupsys/trunk/debian/patches/classes_crash.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/classes_crash.dpatch (original)
+++ cupsys/trunk/debian/patches/classes_crash.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: TODO: forward upstream, find details
@DPATCH@
-diff -urNad cupsys-1.2.3~/scheduler/classes.c cupsys-1.2.3/scheduler/classes.c
---- cupsys-1.2.3~/scheduler/classes.c 2006-02-22 22:43:17.000000000 +0000
-+++ cupsys-1.2.3/scheduler/classes.c 2006-09-15 12:33:25.000000000 +0000
+diff -urNad cups-1.2.3~/scheduler/classes.c cups-1.2.3/scheduler/classes.c
+--- cups-1.2.3~/scheduler/classes.c 2006-02-22 22:43:17.000000000 +0000
++++ cups-1.2.3/scheduler/classes.c 2006-09-15 12:33:25.000000000 +0000
@@ -279,6 +279,11 @@
if (i >= c->num_printers)
i = 0;
Modified: cupsys/trunk/debian/patches/confdirperms.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/confdirperms.dpatch (original)
+++ cupsys/trunk/debian/patches/confdirperms.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/man/lppasswd.man cupsys-1.3.0~rc2/man/lppasswd.man
---- cupsys-1.3.0~rc2~/man/lppasswd.man 2007-07-11 22:46:42.000000000 +0100
-+++ cupsys-1.3.0~rc2/man/lppasswd.man 2007-08-02 16:30:14.000000000 +0100
+diff -urNad cups-1.3.0~rc2~/man/lppasswd.man cups-1.3.0~rc2/man/lppasswd.man
+--- cups-1.3.0~rc2~/man/lppasswd.man 2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.0~rc2/man/lppasswd.man 2007-08-02 16:30:14.000000000 +0100
@@ -50,6 +50,7 @@
that could grant super-user privileges to unprivileged users,
paranoid system administrators may wish to disable or change the
@@ -16,9 +16,9 @@
.SH SEE ALSO
\fIlp(1)\fR, \fIlpr(1)\fR,
.br
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.c cupsys-1.3.0~rc2/scheduler/conf.c
---- cupsys-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.c 2007-08-02 16:30:54.000000000 +0100
+diff -urNad cups-1.3.0~rc2~/scheduler/conf.c cups-1.3.0~rc2/scheduler/conf.c
+--- cups-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
++++ cups-1.3.0~rc2/scheduler/conf.c 2007-08-02 16:30:54.000000000 +0100
@@ -683,22 +683,10 @@
cupsdLogMessage(CUPSD_LOG_NOTICE,
Modified: cupsys/trunk/debian/patches/cupsaccept.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/cupsaccept.dpatch (original)
+++ cupsys/trunk/debian/patches/cupsaccept.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## 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
+diff -urNad cups-1.1.99.b1.r4748~/systemv/accept.c cups-1.1.99.b1.r4748/systemv/accept.c
+--- cups-1.1.99.b1.r4748~/systemv/accept.c 2005-02-18 02:18:11.000000000 +0000
++++ cups-1.1.99.b1.r4748/systemv/accept.c 2005-10-05 12:14:39.401595086 +0000
@@ -67,6 +67,9 @@
else
command = argv[0];
Modified: cupsys/trunk/debian/patches/default_log_warn.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/default_log_warn.dpatch (original)
+++ cupsys/trunk/debian/patches/default_log_warn.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## 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
+diff -urNad cups~/conf/cupsd.conf.in cups/conf/cupsd.conf.in
+--- cups~/conf/cupsd.conf.in 2006-04-12 16:32:11.000000000 +0200
++++ cups/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
Modified: cupsys/trunk/debian/patches/device_uri.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/device_uri.dpatch (original)
+++ cupsys/trunk/debian/patches/device_uri.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/cgi-bin/admin.c cupsys-1.2.1/cgi-bin/admin.c
---- cupsys-1.2.1~/cgi-bin/admin.c 2006-07-19 04:25:44.000000000 +0000
-+++ cupsys-1.2.1/cgi-bin/admin.c 2006-07-19 04:27:50.000000000 +0000
+diff -urNad cups-1.2.1~/cgi-bin/admin.c cups-1.2.1/cgi-bin/admin.c
+--- cups-1.2.1~/cgi-bin/admin.c 2006-07-19 04:25:44.000000000 +0000
++++ cups-1.2.1/cgi-bin/admin.c 2006-07-19 04:27:50.000000000 +0000
@@ -691,7 +691,7 @@
* Set the current device URI for the form to the old one...
*/
Modified: cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch (original)
+++ cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.3.0~/scheduler/job.h cupsys-1.3.0/scheduler/job.h
---- cupsys-1.3.0~/scheduler/job.h 2007-08-01 20:02:47.000000000 +0100
-+++ cupsys-1.3.0/scheduler/job.h 2007-08-13 22:53:14.000000000 +0100
+diff -urNad cups-1.3.0~/scheduler/job.h cups-1.3.0/scheduler/job.h
+--- cups-1.3.0~/scheduler/job.h 2007-08-01 20:02:47.000000000 +0100
++++ cups-1.3.0/scheduler/job.h 2007-08-13 22:53:14.000000000 +0100
@@ -13,6 +13,10 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
Modified: cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch (original)
+++ cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch Fri May 23 08:28:17 2008
@@ -9,9 +9,9 @@
## DP: (CUPS STR #2763, http://www.cups.org/str.php?L2763)
@DPATCH@
-diff -urNad cupsys-1.3.6~/cups/util.c cupsys-1.3.6/cups/util.c
---- cupsys-1.3.6~/cups/util.c 2008-01-17 00:42:35.000000000 +0100
-+++ cupsys-1.3.6/cups/util.c 2008-03-20 17:44:46.000000000 +0100
+diff -urNad cups-1.3.6~/cups/util.c cups-1.3.6/cups/util.c
+--- cups-1.3.6~/cups/util.c 2008-01-17 00:42:35.000000000 +0100
++++ cups-1.3.6/cups/util.c 2008-03-20 17:44:46.000000000 +0100
@@ -812,11 +812,13 @@
http2 = http;
else if ((http2 = httpConnectEncrypt(hostname, port,
Modified: cupsys/trunk/debian/patches/quiesce_ipp_logging.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/quiesce_ipp_logging.dpatch (original)
+++ cupsys/trunk/debian/patches/quiesce_ipp_logging.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.2~/scheduler/log.c cupsys-1.2.2/scheduler/log.c
---- cupsys-1.2.2~/scheduler/log.c 2006-08-13 04:49:19.000000000 +0000
-+++ cupsys-1.2.2/scheduler/log.c 2006-08-13 05:17:06.000000000 +0000
+diff -urNad cups-1.2.2~/scheduler/log.c cups-1.2.2/scheduler/log.c
+--- cups-1.2.2~/scheduler/log.c 2006-08-13 04:49:19.000000000 +0000
++++ cups-1.2.2/scheduler/log.c 2006-08-13 05:17:06.000000000 +0000
@@ -354,6 +354,12 @@
"STATUS"
};
Modified: cupsys/trunk/debian/patches/reactivate_recommended_driver.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/reactivate_recommended_driver.dpatch (original)
+++ cupsys/trunk/debian/patches/reactivate_recommended_driver.dpatch Fri May 23 08:28:17 2008
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/scheduler/cups-driverd.c cupsys-1.3.0~rc2/scheduler/cups-driverd.c
---- cupsys-1.3.0~rc2~/scheduler/cups-driverd.c 2007-07-11 22:46:42.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/cups-driverd.c 2007-08-01 15:23:01.000000000 +0100
+diff -urNad cups-1.3.0~rc2~/scheduler/cups-driverd.c cups-1.3.0~rc2/scheduler/cups-driverd.c
+--- cups-1.3.0~rc2~/scheduler/cups-driverd.c 2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.0~rc2/scheduler/cups-driverd.c 2007-08-01 15:23:01.000000000 +0100
@@ -180,7 +180,6 @@
int type) /* I - Driver type */
{
Modified: cupsys/trunk/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/ubuntu-default-error-policy-retry-job.dpatch (original)
+++ cupsys/trunk/debian/patches/ubuntu-default-error-policy-retry-job.dpatch Fri May 23 08:28:17 2008
@@ -10,9 +10,9 @@
. /usr/share/dpatch/dpatch-run
@DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.c cupsys-1.3.0~rc2/scheduler/conf.c
---- cupsys-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.c 2007-08-01 15:33:55.000000000 +0100
+diff -urNad cups-1.3.0~rc2~/scheduler/conf.c cups-1.3.0~rc2/scheduler/conf.c
+--- cups-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
++++ cups-1.3.0~rc2/scheduler/conf.c 2007-08-01 15:33:55.000000000 +0100
@@ -548,7 +548,7 @@
cupsdClearString(&BrowseLocalOptions);
cupsdClearString(&BrowseRemoteOptions);
Modified: cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch (original)
+++ cupsys/trunk/debian/patches/ubuntu-disable-browsing.dpatch Fri May 23 08:28:17 2008
@@ -10,9 +10,9 @@
. /usr/share/dpatch/dpatch-run
@DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/conf/cupsd.conf.in cupsys-1.3.0~rc2/conf/cupsd.conf.in
---- cupsys-1.3.0~rc2~/conf/cupsd.conf.in 2007-07-25 01:40:03.000000000 +0100
-+++ cupsys-1.3.0~rc2/conf/cupsd.conf.in 2007-08-01 15:27:56.000000000 +0100
+diff -urNad cups-1.3.0~rc2~/conf/cupsd.conf.in cups-1.3.0~rc2/conf/cupsd.conf.in
+--- cups-1.3.0~rc2~/conf/cupsd.conf.in 2007-07-25 01:40:03.000000000 +0100
++++ cups-1.3.0~rc2/conf/cupsd.conf.in 2007-08-01 15:27:56.000000000 +0100
@@ -19,9 +19,10 @@
@CUPS_LISTEN_DOMAINSOCKET@
Modified: cupsys/trunk/debian/po/POTFILES.in
==============================================================================
--- cupsys/trunk/debian/po/POTFILES.in (original)
+++ cupsys/trunk/debian/po/POTFILES.in Fri May 23 08:28:17 2008
@@ -1,2 +1,2 @@
-[type: gettext/rfc822deb] cupsys-bsd.templates
-[type: gettext/rfc822deb] cupsys.templates
+[type: gettext/rfc822deb] cups-bsd.templates
+[type: gettext/rfc822deb] cups.templates
Modified: cupsys/trunk/debian/po/ca.po
==============================================================================
--- cupsys/trunk/debian/po/ca.po (original)
+++ cupsys/trunk/debian/po/ca.po Fri May 23 08:28:17 2008
@@ -1,14 +1,14 @@
#
-# Catalan translation for cupsys package.
+# Catalan translation for cups package.
# Copyright (C) 2007 Debian CUPS Maintainers.
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
#
# Jordà Polo <jorda at ettin.org>, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: 1.2.7-4\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 11:01+0200\n"
"Last-Translator: Jordà Polo <jorda at ettin.org>\n"
@@ -19,13 +19,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Voleu configurar el servidor compatible amb l'lpd de BSD?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -39,14 +39,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Voleu que CUPS imprimeixi les tasques desconegudes com tasques en brut?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -81,67 +81,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paral·lel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "sèrie"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "sòcol"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Mecanisme de comunicació amb la impressora:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -150,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -160,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/cs.po
==============================================================================
--- cupsys/trunk/debian/po/cs.po (original)
+++ cupsys/trunk/debian/po/cs.po Fri May 23 08:28:17 2008
@@ -13,8 +13,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-12-16 15:37+0900\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -45,13 +45,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -66,7 +66,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -77,7 +77,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -87,74 +87,74 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paralelnÃ"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "sériový"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "OvladaÄe pro komunikaci s tiskárnou:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr "CUPS použÃvá ovladaÄe pro komunikaci s tiskárnou nebo jejÃm portem."
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -164,7 +164,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/da.po
==============================================================================
--- cupsys/trunk/debian/po/da.po (original)
+++ cupsys/trunk/debian/po/da.po Fri May 23 08:28:17 2008
@@ -1,13 +1,13 @@
-# translation of cupsys_1.1.20final+cvs20040317-3_da.po to Danish
+# translation of cups_1.1.20final+cvs20040317-3_da.po to Danish
# translation of da.po to Danish
-# translation of Debian cupsys debconf to Danish
+# translation of Debian cups debconf to Danish
#
# Claus Hindsgaul <claus_h at image.dk>, 2004.
# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 20:59+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
@@ -20,13 +20,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -41,13 +41,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -81,67 +81,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "sokkel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Printer-kommunikationsveje:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -150,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -160,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/de.po
==============================================================================
--- cupsys/trunk/debian/po/de.po (original)
+++ cupsys/trunk/debian/po/de.po Fri May 23 08:28:17 2008
@@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-31 11:14-0400\n"
"Last-Translator: Matthias Julius <mdeb at julius-net.net>\n"
@@ -28,13 +28,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Möchten Sie den Kompatibilitäts-Server für BSD lpd einrichten?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -49,14 +49,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Möchten Sie, dass CUPS unbekannte Druckaufträge unbearbeitet (raw) druckt?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -81,7 +81,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -91,67 +91,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "IPP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "SCSI"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "Socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "USB"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "SNMP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Backends für die Kommunikation mit dem Drucker:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -159,7 +159,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -169,7 +169,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/es.po
==============================================================================
--- cupsys/trunk/debian/po/es.po (original)
+++ cupsys/trunk/debian/po/es.po Fri May 23 08:28:17 2008
@@ -1,6 +1,6 @@
-# cupsys debconf translation to spanish
+# cups debconf translation to spanish
# Copyright (C) 2003, 2004, 2006, 2007 Software in the Public Interest
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
#
# Changes:
# - Initial translation
@@ -22,8 +22,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 1.2.2-1\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 1.2.2-1\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-06-21 18:51+0200\n"
"Last-Translator: Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>\n"
@@ -35,13 +35,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -56,13 +56,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -76,7 +76,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -86,7 +86,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -96,67 +96,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paralelo"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serie"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Motores de comunicación con la impresora:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -165,7 +165,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -176,7 +176,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/eu.po
==============================================================================
--- cupsys/trunk/debian/po/eu.po (original)
+++ cupsys/trunk/debian/po/eu.po Fri May 23 08:28:17 2008
@@ -1,11 +1,11 @@
-# translation of cupsys-eu.po to librezale
+# translation of cups-eu.po to librezale
# Piarres Beobide <pi at beobide.net>, 2005, 2007.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
msgid ""
msgstr ""
-"Project-Id-Version: cupsys-eu\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups-eu\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 15:56+0200\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "BSD lpd bateragarritasun zerbitzaria konfiguratu nahi al duzu?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "CUPS-ek lan ezezagunak lan gordinak bezala inprimatzea nahi duzu?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -58,7 +58,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -68,7 +68,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -78,67 +78,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lds"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paraleloa"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriea"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Inprimagailu komunikazio motorea:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -147,7 +147,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -157,7 +157,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/fi.po
==============================================================================
--- cupsys/trunk/debian/po/fi.po (original)
+++ cupsys/trunk/debian/po/fi.po Fri May 23 08:28:17 2008
@@ -1,12 +1,12 @@
-# translation of cupsys_1.3.2-1_templates.po to Finnish
+# translation of cups_1.3.2-1_templates.po to Finnish
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Esko Arajärvi <edu at iki.fi>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: cupsys_1.3.2-1_templates\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups_1.3.2-1_templates\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-10-15 13:13+0200\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
@@ -19,13 +19,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Haluatko pystyttää â€BSD lpdâ€-yhteensopivuuspalvelimen?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -40,13 +40,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Tuleeko CUPSin tulostaa tuntemattomat työt raakatöinä?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -81,67 +81,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "rinnakkainen"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "sarjallinen"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "pistoke"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Tulostusviestinnän taustaliitännät:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -150,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -161,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/fr.po
==============================================================================
--- cupsys/trunk/debian/po/fr.po (original)
+++ cupsys/trunk/debian/po/fr.po Fri May 23 08:28:17 2008
@@ -1,13 +1,13 @@
-# Translation of cupsys debconf templates to French
+# Translation of cups debconf templates to French
# Copyright (C) 2004-2007 Christian Perrier <bubulle at debian.org>
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
#
#
# Christian Perrier <bubulle at debian.org>, 2004, 2005, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-14 11:54+0530\n"
"PO-Revision-Date: 2007-12-14 11:57+0530\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
@@ -20,13 +20,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -41,13 +41,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -63,7 +63,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -73,7 +73,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -83,67 +83,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "IPP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallèle"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "SCSI"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "série"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "USB"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "SNMP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Mode de communication avec les imprimantes :"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -152,7 +152,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -163,7 +163,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/gl.po
==============================================================================
--- cupsys/trunk/debian/po/gl.po (original)
+++ cupsys/trunk/debian/po/gl.po Fri May 23 08:28:17 2008
@@ -1,12 +1,12 @@
-# Galician translation of cupsys' debconf templates.
+# Galician translation of cups' debconf templates.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
# Jacobo Tarrio <jtarrio at debian.org>, 2006, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-12-16 15:35+0900\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
@@ -17,7 +17,7 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr ""
"causan problemas (por exemplo, algúns núcleos para PPC fallan co adaptador "
@@ -25,7 +25,7 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -40,14 +40,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -62,7 +62,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -82,67 +82,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paralelo"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serie"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Sistemas de comunicación coa impresora:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -151,7 +151,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -161,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/it.po
==============================================================================
--- cupsys/trunk/debian/po/it.po (original)
+++ cupsys/trunk/debian/po/it.po Fri May 23 08:28:17 2008
@@ -1,12 +1,12 @@
-# Italian (it) translation of debconf templates for cupsys
+# Italian (it) translation of debconf templates for cups
# Copyright (C) 2006 Software in the Public Interest
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
# Luca Monducci <luca.mo at tiscali.it>, 2006, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 1.2.7 italian debconf templates\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 1.2.7 italian debconf templates\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 20:09+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Si vuole configurare il server di compatibilità con lpd di BSD?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Si vuole che CUPS stampi i job sconosciuti come job \"raw\"?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -58,7 +58,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -68,7 +68,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -78,67 +78,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallela"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriale"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Backend di comunicazione con la stampante:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -147,7 +147,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -158,7 +158,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/ja.po
==============================================================================
--- cupsys/trunk/debian/po/ja.po (original)
+++ cupsys/trunk/debian/po/ja.po Fri May 23 08:28:17 2008
@@ -13,8 +13,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 1.2\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 1.2\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-12-16 15:35+0900\n"
"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "BSD lpd 互æ›ã‚µãƒ¼ãƒã‚’セットアップã—ã¾ã™ã‹?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -46,13 +46,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "未知ã®ã‚¸ãƒ§ãƒ–を生データ (raw) ジョブã¨ã—㦠CUPS ã«å°åˆ·ã•ã›ã¾ã™ã‹?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -66,7 +66,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -76,7 +76,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -86,67 +86,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "IPP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "LPD"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "パラレル"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "SCSI"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "シリアル"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "ソケット"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "USB"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "SNMP"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "プリンタ通信ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -155,7 +155,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -165,7 +165,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/ml.po
==============================================================================
--- cupsys/trunk/debian/po/ml.po (original)
+++ cupsys/trunk/debian/po/ml.po Fri May 23 08:28:17 2008
@@ -1,13 +1,13 @@
-# Malayalam translation of cupsys debconf template.
-# Copyright (C) 2007 THE cupsys' COPYRIGHT HOLDER
-# This file is distributed under the same license as the cupsys package.
+# Malayalam translation of cups debconf template.
+# Copyright (C) 2007 THE cups' COPYRIGHT HOLDER
+# This file is distributed under the same license as the cups package.
# Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a at gmail.com>, 2007.
#
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 20070331\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 20070331\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-31 07:18+0530\n"
"Last-Translator: Praveen|à´ªàµà´°à´µàµ€à´£àµâ€ A|à´Ž <pravi.a at gmail.com>\n"
@@ -19,13 +19,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "BSD lpd പൊരàµà´¤àµà´¤ സേവകനàµâ€ സജàµà´œàµ€à´•à´°à´¿à´¯àµà´•àµà´•à´¾à´¨àµâ€ നിങàµà´™à´³à´¾à´—àµà´°à´¹à´¿à´¯àµà´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -40,14 +40,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"മനസിലാവാതàµà´¤ ജോലികളàµâ€ അസംസàµà´•àµƒà´¤ ജോലികളായി CUPS à´…à´šàµà´šà´Ÿà´¿à´¯àµà´•àµà´•à´£à´®àµ†à´¨àµà´¨àµ നിങàµà´™à´³à´¾à´—àµà´°à´¹à´¿à´¯àµà´•àµà´•àµà´¨àµà´¨àµà´£àµà´Ÿàµ‹?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -62,7 +62,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -82,67 +82,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "à´…à´šàµà´šà´Ÿà´¿ യനàµà´¤àµà´° ആശയവിനിമയ ബാകàµà´•àµ†à´¨àµâ€à´¡àµà´•à´³àµâ€:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -151,7 +151,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -161,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/nb.po
==============================================================================
--- cupsys/trunk/debian/po/nb.po (original)
+++ cupsys/trunk/debian/po/nb.po Fri May 23 08:28:17 2008
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: nb.po_[sQSfZa]\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 19:04+0200\n"
"Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Vil du sette opp en tjener kompatibel med BSD lpd?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -39,13 +39,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Vil du at CUPS skal skrive ut ukjente jobber som rå utskrift?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -59,7 +59,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -69,7 +69,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -79,67 +79,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "sokkel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Kommunikasjonsmotorer for skriver:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -148,7 +148,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -158,7 +158,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/nl.po
==============================================================================
--- cupsys/trunk/debian/po/nl.po (original)
+++ cupsys/trunk/debian/po/nl.po Fri May 23 08:28:17 2008
@@ -13,8 +13,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 1.1.20candidate6\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 1.1.20candidate6\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-30 17:47+0100\n"
"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
@@ -26,21 +26,21 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
"to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
"these computers cannot be converted to use the IPP protocol that CUPS uses."
msgstr ""
-"Het pakket 'cupsys-bsd' bevat een server die BSD-stijl afdrukopdrachten "
+"Het pakket 'cups-bsd' bevat een server die BSD-stijl afdrukopdrachten "
"accepteert en naar CUPS doorstuurt. Deze server dient enkel ingesteld te "
"worden als er andere computers zijn die afdrukopdrachten over het netwerk "
"sturen via \"BSD\"- of \"LPR\"-diensten, EN deze computers niet kunnen "
@@ -49,13 +49,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -81,7 +81,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -91,67 +91,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serieel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Backends voor printercommunicatie:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -160,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -170,7 +170,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/pt.po
==============================================================================
--- cupsys/trunk/debian/po/pt.po (original)
+++ cupsys/trunk/debian/po/pt.po Fri May 23 08:28:17 2008
@@ -1,13 +1,13 @@
-# Portuguese translation for cupsys's debconf messages
+# Portuguese translation for cups's debconf messages
# Copyright (C) 2007 Carlos Lisboa <carloslisboa at gmail.com>
-# This file is distributed under the same license as the cupsys package.
+# This file is distributed under the same license as the cups package.
# Carlos Lisboa <carloslisboa at gmail.com>, 2007.
# Miguel Figueiredo <elmig at debianpt.org>, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-04-08 23:35+0100\n"
"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
@@ -18,20 +18,20 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Deseja configurar o servidor de compatibilidade lpd BSD?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
"to submit jobs over the network via the \"BSD\" or \"LPR\" services, and "
"these computers cannot be converted to use the IPP protocol that CUPS uses."
msgstr ""
-"O pacote cupsys contém um servidor que pode aceitar trabalhos de impressão "
+"O pacote cups contém um servidor que pode aceitar trabalhos de impressão "
"do estilo BSD e submetê-los ao CUPS. Deve ser apenas configurado se possui "
"outros computadores que submetam trabalhos na rede através de serviços \"BSD"
"\" ou \"LPR\", e que esses computadores não possam ser convertidos para usar "
@@ -39,14 +39,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Deseja que o CUPS imprima trabalhos desconhecidos como trabalhos 'raw'?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -81,67 +81,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paralela"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "série"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "'Backends' de comunicação com a impressora"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -150,7 +150,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -160,7 +160,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/pt_BR.po
==============================================================================
--- cupsys/trunk/debian/po/pt_BR.po (original)
+++ cupsys/trunk/debian/po/pt_BR.po Fri May 23 08:28:17 2008
@@ -1,11 +1,11 @@
-# Brazilian Portuguese translation of cupsys
+# Brazilian Portuguese translation of cups
# This file is distributed under the same license as the aiccu package.
# André Luis Lopes (andrelop) <andrelop at debian.org>, 2005-2006.
# Felipe Augusto van de Wiel (faw) <faw at debian.org>, 2006-2007.
msgid ""
msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-12-16 15:36+0900\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Você quer configurar o servidor de compatibilidade BSD lpd?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,7 +38,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Você deseja que o CUPS imprima trabalhos desconhecidos como trabalhos \"raw"
@@ -46,7 +46,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -61,7 +61,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -82,67 +82,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "paralelo"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "\"Backends\" de comunicação com impressoras:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -151,7 +151,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -162,7 +162,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/ru.po
==============================================================================
--- cupsys/trunk/debian/po/ru.po (original)
+++ cupsys/trunk/debian/po/ru.po Fri May 23 08:28:17 2008
@@ -1,5 +1,5 @@
-# translation of cupsys-ru.po to Russian
-# translation of cupsys_1.1.23-12_ru.po to Russian
+# translation of cups-ru.po to Russian
+# translation of cups_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
@@ -17,8 +17,8 @@
# Translator: Yuri Kozlov <kozlov.y at gmail.com>"
msgid ""
msgstr ""
-"Project-Id-Version: cupsys_1.2.7-4_ru.po\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups_1.2.7-4_ru.po\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-04-05 11:27+0300\n"
"Last-Translator: Sergey Alyoshin <alyoshin.s at gmail.com>\n"
@@ -30,13 +30,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "Хотите уÑтановить Ñервер ÑовмеÑтимоÑти Ñ BSD lpd?"
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -51,14 +51,14 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
"Хотите чтобы CUPS печатал неизвеÑтные Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÐºÐ°Ðº необработанные заданиÑ?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -82,7 +82,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -92,67 +92,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallel"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "serial"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "socket"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "ИнтерфейÑные программы Ð´Ð»Ñ ÑвÑзи Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð¼:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -161,7 +161,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -171,7 +171,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/sv.po
==============================================================================
--- cupsys/trunk/debian/po/sv.po (original)
+++ cupsys/trunk/debian/po/sv.po Fri May 23 08:28:17 2008
@@ -13,8 +13,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys 1.1.23-13\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups 1.1.23-13\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-03-27 08:57+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -46,13 +46,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Vill du att CUPS ska skriva ut okända jobb som råjobb?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -66,7 +66,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -76,7 +76,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -86,67 +86,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "parallell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "seriell"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "uttag"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Bakändar för skrivarkommunikation:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -155,7 +155,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -165,7 +165,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/templates.pot
==============================================================================
--- cupsys/trunk/debian/po/templates.pot (original)
+++ cupsys/trunk/debian/po/templates.pot Fri May 23 08:28:17 2008
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr ""
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -34,13 +34,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr ""
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -50,7 +50,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -58,7 +58,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -66,74 +66,74 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -141,7 +141,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/tr.po
==============================================================================
--- cupsys/trunk/debian/po/tr.po (original)
+++ cupsys/trunk/debian/po/tr.po Fri May 23 08:28:17 2008
@@ -1,11 +1,11 @@
-# Turkish translation of cupsys.
-# This file is distributed under the same license as the cupsys package.
+# Turkish translation of cups.
+# This file is distributed under the same license as the cups package.
# Gürkan Aslan <gurkan at iaslan.com>, 2004.
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2004-04-25 10:34+0300\n"
"Last-Translator: Gürkan Aslan <gurkan at iaslan.com>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
#, fuzzy
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
@@ -39,13 +39,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
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:2001
+#: ../cups.templates:2001
#, fuzzy
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
@@ -62,7 +62,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
#, fuzzy
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
@@ -74,7 +74,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -82,67 +82,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr ""
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
#, fuzzy
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
@@ -152,7 +152,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
#, fuzzy
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
@@ -163,7 +163,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/po/vi.po
==============================================================================
--- cupsys/trunk/debian/po/vi.po (original)
+++ cupsys/trunk/debian/po/vi.po Fri May 23 08:28:17 2008
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cupsys_1.2.11-2\n"
-"Report-Msgid-Bugs-To: Source: cupsys at packages.debian.org\n"
+"Project-Id-Version: cups_1.2.11-2\n"
+"Report-Msgid-Bugs-To: Source: cups at packages.debian.org\n"
"POT-Creation-Date: 2007-12-16 15:35+0900\n"
"PO-Revision-Date: 2007-05-31 15:31+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:2001
+#: ../cups-bsd.templates:2001
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:2001
+#: ../cups-bsd.templates:2001
msgid ""
"The CUPS package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if other computers are likely "
@@ -38,13 +38,13 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "Bạn có muốn CUPS in việc in lạ như là việc thô không?"
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"The Internet Printing Protocol (IPP) enforces a MIME type for all print "
"jobs. Since not all sources of print jobs can attach an appropriate type, "
@@ -59,7 +59,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
"directly to the printer without processing."
@@ -69,7 +69,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:2001
+#: ../cups.templates:2001
msgid ""
"It is recommended to choose this option if the server will be accepting "
"print jobs from Windows computers or Samba servers."
@@ -79,67 +79,67 @@
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "ipp"
msgstr "ipp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "lpd"
msgstr "lpd"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "parallel"
msgstr "song song"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "scsi"
msgstr "scsi"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "serial"
msgstr "nối tiếp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "socket"
msgstr "ổ cắm"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "usb"
msgstr "usb"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "snmp"
msgstr "snmp"
#. Type: multiselect
#. Choices
-#: ../cupsys.templates:3001
+#: ../cups.templates:3001
msgid "dnssd"
msgstr "dnssd"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid "Printer communication backends:"
msgstr "Háºu phÆ°Æ¡ng liên lạc vá»›i máy in:"
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"CUPS uses backend programs to communicate with the printer device or port."
msgstr ""
@@ -148,7 +148,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Unfortunately, some backend programs are likely to cause some trouble. For "
"example, some PPC kernels crash with the parallel backend."
@@ -158,7 +158,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:3002
+#: ../cups.templates:3002
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules (original)
+++ cupsys/trunk/debian/rules Fri May 23 08:28:17 2008
@@ -27,9 +27,9 @@
DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
DEB_DH_INSTALLINIT_ARGS := -u'start 20 2 3 4 5 . stop 80 1 .'
-DEB_DH_STRIP_ARGS := --dbg-package=cupsys-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=cups-dbg
DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
-DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/libcupsys2-dev/examples/scripting
+DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/libcups2-dev/examples/scripting
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
ifneq ($(findstring $(DEB_BUILD_ARCH), arm m68k),)
DEB_MAKE_CHECK_TARGET := check || true
@@ -50,23 +50,23 @@
common-install-prehook-impl::
(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
-binary-post-install/cupsys::
- (cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf ../../cups/doc-root online-docs)
+binary-post-install/cups::
+ (cd $(DEB_DESTDIR)/../cups/usr/share/doc/cups && ln -sf ../../cups/doc-root online-docs)
# 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 \
+ for i in $(DEB_DESTDIR)/../cups/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/"; \
+ mkdir -p "$(DEB_DESTDIR)/../cups/usr/share/ppd/cups-included/$$m"; \
+ mv $$i "$(DEB_DESTDIR)/../cups/usr/share/ppd/cups-included/$$m/"; \
done
- rmdir $(DEB_DESTDIR)/../cupsys/usr/share/cups/model
+ rmdir $(DEB_DESTDIR)/../cups/usr/share/cups/model
dh_usrlocal
# Install DBUS configuration file so that job progress is reported to
# the system-config-printer applet
- install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cupsys/etc/dbus-1/system.d/cups.conf
+ install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cups/etc/dbus-1/system.d/cups.conf
# install AppArmor profile on Ubuntu
if [ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ]; then \
@@ -76,12 +76,12 @@
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/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::
+binary-post-install/cups-bsd::
+ rm -r debian/cups-bsd/usr/share/doc/cups-bsd
+ ln -s libcups2 debian/cups-bsd/usr/share/doc/cups-bsd
+binary-post-install/libcups2-dev::
rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.o
rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.so
-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
+binary-post-install/cups-client::
+ rm -r debian/cups-client/usr/share/doc/cups-client
+ ln -s libcups2 debian/cups-client/usr/share/doc/cups-client
More information about the Pkg-cups-devel
mailing list