* 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.
author: martin@piware.de <> 2008-05-23 10:14:05 +0200
committer: martin@piware.de <> 2008-05-23 10:14:05 +0200
commit: 9b0fd75c0491a094743dbe4684a367113c651f45 (patch)
tree: 57a2410c83130540055c08ec7ded022867973e6a
parent: da4b8cdf48ba4dff693687372c1546cf88a25a5f (diff)
download: cups-9b0fd75c0491a094743dbe4684a367113c651f45.tar.gz
85 files changed, 741 insertions, 792 deletions
diff --git a/debian/HOWTO_BUGREPORT.txt b/debian/HOWTO_BUGREPORT.txt
index 2bcaf79e..c6540e87 100644
--- a/debian/HOWTO_BUGREPORT.txt
+++ b/debian/HOWTO_BUGREPORT.txt
@@ -8,7 +8,7 @@ For making clear your printing problem, I need some information.
    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/.
 
diff --git a/debian/README.Debian b/debian/README.Debian
index 4d8115e9..013a55d4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -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 @@ So, CUPS setting puts serial and SCSI off from backend by default. And
 if you use PPC, parallel backend is off also.
 
 If you want to use these backends, you can configure by using
-'dpkg-reconfigure cupsys'.
+'dpkg-reconfigure cups'.
 
 SSL Support
 -----------
@@ -57,7 +57,7 @@ to use, even though the CUPS license itself allows this.  A competing
 library, GNU TLS, has an OpenSSL compatibility layer that could work
 with these packages, but the compatibility library is licensed under
 the GNU GPL, which could conflict with the license of certain programs
-that support CUPS.  Therefore, the cupsys packages as shipped do not
+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 @@ licenses of any of the software you distribute.
 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 @@ will support your printer better than the generic drivers that ship
 with CUPS.  I try to keep the package Suggestions current regarding
 popular CUPS driver packages; to see this list, run this command:
 
-  apt-cache show cupsys | grep Suggests
+  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 @@ command-line client programs, the BSD client and server compatibility
 programs, and the library and development packages.
 
 The CUPS BSD commands and cups-lpd daemon are separated into their own
-package (cupsys-bsd); the hope is to make it possible to run CUPS and
+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 @@ depend on the proper packages.  If your package is CUPS-specific, you
 should name it so it can be easily identified as a CUPS package, with
 names such as:
 
-  cupsys-driver-foo	(for a driver for Foo printers)
-  cupsys-backend-bar	(for a backend to print to Bar printers)
-  cupsys-client-baz	(for a client module to hook Baz into CUPS)
+  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 @@ be done by adding the following information to Samba's smb.conf
   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
 ------------------
diff --git a/debian/changelog b/debian/changelog
index 53ce5ae2..a22c5504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org>  Wed, 30 Apr 2008 00:12:37 +0200
+ -- Martin Pitt <mpitt@debian.org>  Fri, 23 May 2008 00:32:17 +0200
 
 cupsys (1.3.7-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7277d3c7..a01a70b2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: cupsys
+Source: cups
 Priority: optional
 Section: net
 Maintainer: Debian CUPS Maintainers <pkg-cups-devel@lists.alioth.debian.org>
@@ -15,14 +15,15 @@ Uploaders: Kenshi Muto <kmuto@debian.org>,
 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 @@ Priority: optional
 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 @@ Description: Common UNIX Printing System(tm) - image libs
  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 @@ Description: Common UNIX Printing System(tm) - server
  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 @@ Description: Common UNIX Printing System(tm) - client programs (SysV)
  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 @@ Description: Common UNIX Printing System(tm) - development files
  .
  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 @@ Package: libcupsimage2-dev
 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 @@ Description: Common UNIX Printing System(tm) - image development files
  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 @@ Description: Common UNIX Printing System(tm) - BSD commands
  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 @@ Description: Common UNIX Printing System(tm) - common files
  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 @@ Description: Common UNIX Printing System(tm) - debugging symbols
  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.
diff --git a/debian/cupsys-bsd.config b/debian/cups-bsd.config
index b797e05e..f6fc829b 100644
--- a/debian/cupsys-bsd.config
+++ b/debian/cups-bsd.config
@@ -5,5 +5,5 @@ set -e
 # Debconf library
 . /usr/share/debconf/confmodule
 
-db_input medium cupsys-bsd/setuplpd || true
+db_input medium cups-bsd/setuplpd || true
 db_go
diff --git a/debian/cupsys-bsd.install b/debian/cups-bsd.install
index de8d03b0..de8d03b0 100644
--- a/debian/cupsys-bsd.install
+++ b/debian/cups-bsd.install
diff --git a/debian/cupsys-bsd.postinst b/debian/cups-bsd.postinst
index 764f93b1..48d8a2dc 100644
--- a/debian/cupsys-bsd.postinst
+++ b/debian/cups-bsd.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
 #
 # see: dh_installdeb(1)
 
@@ -29,14 +29,14 @@ case "$1" in
     configure)
 
 	# Set documentation symlinks
-	if [ -d /usr/share/doc/cupsys ]; then
-	    if [ ! -e /usr/share/doc/cupsys-bsd ]; then
-		ln -sf cupsys-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
diff --git a/debian/cupsys-bsd.postrm b/debian/cups-bsd.postrm
index 80057d90..2f260fbe 100644
--- a/debian/cupsys-bsd.postrm
+++ b/debian/cups-bsd.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for cupsys-bsd
+# postrm script for cups-bsd
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/cupsys-bsd.preinst b/debian/cups-bsd.preinst
index 7bf309e1..d886e14e 100644
--- a/debian/cupsys-bsd.preinst
+++ b/debian/cups-bsd.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for cupsys-bsd
+# preinst script for cups-bsd
 #
 # see: dh_installdeb(1)
 
@@ -16,8 +16,8 @@ case "$1" in
     ;;
 
     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
     ;;
 
diff --git a/debian/cupsys-bsd.prerm b/debian/cups-bsd.prerm
index 955b9324..095e9390 100644
--- a/debian/cupsys-bsd.prerm
+++ b/debian/cups-bsd.prerm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for cupsys-bsd
+# prerm script for cups-bsd
 #
 # see: dh_installdeb(1)
 
@@ -22,7 +22,7 @@ fi
 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
diff --git a/debian/cupsys-bsd.templates b/debian/cups-bsd.templates
index 40af8bfd..d7206aff 100644
--- a/debian/cupsys-bsd.templates
+++ b/debian/cups-bsd.templates
@@ -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?
diff --git a/debian/cupsys-client.install b/debian/cups-client.install
index e7f9bba4..e7f9bba4 100644
--- a/debian/cupsys-client.install
+++ b/debian/cups-client.install
diff --git a/debian/cupsys-client.links b/debian/cups-client.links
index bf98b2e0..bf98b2e0 100644
--- a/debian/cupsys-client.links
+++ b/debian/cups-client.links
diff --git a/debian/cupsys-client.postinst b/debian/cups-client.postinst
index b44117ab..108c9b82 100644
--- a/debian/cupsys-client.postinst
+++ b/debian/cups-client.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/cupsys-client.preinst b/debian/cups-client.preinst
index c14515c7..9b31b52f 100644
--- a/debian/cupsys-client.preinst
+++ b/debian/cups-client.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for cupsys-client
+# preinst script for cups-client
 #
 # see: dh_installdeb(1)
 
@@ -16,8 +16,8 @@ case "$1" in
     ;;
 
     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
     ;;
 
diff --git a/debian/cupsys-common.install b/debian/cups-common.install
index 089f0fb9..089f0fb9 100644
--- a/debian/cupsys-common.install
+++ b/debian/cups-common.install
diff --git a/debian/cups.config b/debian/cups.config
new file mode 100644
index 00000000..b64af6d4
--- /dev/null
+++ b/debian/cups.config
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+# Debconf library
+. /usr/share/debconf/confmodule
+
+db_get cupsys/raw-print
+OLD_RET=$RET
+
+db_input low cupsys/raw-print || true
+db_go
+
+db_get cupsys/raw-print
+if [ "$OLD_RET" != "$RET" ]; then
+    db_fset cupsys/raw-print changed true
+fi
+
+# remove parallel from PPC default
+ARCH=`dpkg --print-architecture`
+if [ "$ARCH" = "ppc" -o "$ARCH" = "ppc-none" ]; then
+  db_fget cupsys/backend seen
+  if [ "$RET" = "false" ]; then
+    db_set cupsys/backend "ipp, lpd, socket, usb"
+  fi
+fi
+
+db_input low cupsys/backend || true
+db_go
diff --git a/debian/cupsys.default b/debian/cups.default
index ba8b3ccb..ba8b3ccb 100644
--- a/debian/cupsys.default
+++ b/debian/cups.default
diff --git a/debian/cupsys.dirs b/debian/cups.dirs
index b9f25d78..064093ad 100644
--- a/debian/cupsys.dirs
+++ b/debian/cups.dirs
@@ -1,5 +1,5 @@
 var/run/cups
-usr/share/doc/cupsys
+usr/share/doc/cups
 usr/share/cups/drivers
 etc/default
 etc/cups/ssl
diff --git a/debian/cupsys.doc-base b/debian/cups.doc-base
index 1b534232..21bdb8a0 100644
--- a/debian/cupsys.doc-base
+++ b/debian/cups.doc-base
@@ -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 @@ Abstract: This documentation covers the use and administration of a CUPS
 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
diff --git a/debian/cupsys.docs b/debian/cups.docs
index f2f3c62b..f2f3c62b 100644
--- a/debian/cupsys.docs
+++ b/debian/cups.docs
diff --git a/debian/cupsys.examples b/debian/cups.examples
index f384c941..f384c941 100644
--- a/debian/cupsys.examples
+++ b/debian/cups.examples
diff --git a/debian/cupsys.init.d b/debian/cups.init.d
index 106c6459..f27e5a70 100644
--- a/debian/cupsys.init.d
+++ b/debian/cups.init.d
@@ -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 @@ test -f $DAEMON || exit 0
 
 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
diff --git a/debian/cupsys.install b/debian/cups.install
index 3af9b802..3f2a9242 100644
--- a/debian/cupsys.install
+++ b/debian/cups.install
@@ -33,7 +33,7 @@ usr/share/man/man8/cupsd.8.gz
 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/
diff --git a/debian/cups.lintian-overrides b/debian/cups.lintian-overrides
new file mode 100644
index 00000000..18417a7c
--- /dev/null
+++ b/debian/cups.lintian-overrides
@@ -0,0 +1,4 @@
+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/
diff --git a/debian/cupsys.logrotate b/debian/cups.logrotate
index 38c5bb34..d1645463 100644
--- a/debian/cupsys.logrotate
+++ b/debian/cups.logrotate
@@ -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
diff --git a/debian/cupsys.pam b/debian/cups.pam
index e2c7a993..e2c7a993 100644
--- a/debian/cupsys.pam
+++ b/debian/cups.pam
diff --git a/debian/cupsys.postinst b/debian/cups.postinst
index 9fa29daf..ad3efc04 100644
--- a/debian/cupsys.postinst
+++ b/debian/cups.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
 #
 # see: dh_installdeb(1)
 
@@ -26,15 +26,12 @@ set -e
 . /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 @@ case "$1" in
 	    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 @@ EOF
 	fi
 	if [ ! -e /etc/cups/raw.convs ]; then
 	    cat >/etc/cups/raw.convs <<EOF
-# This file was generated by the cupsys package.  You may change it, or
+# 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 @@ EOF
 
         # 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
diff --git a/debian/cupsys.postrm b/debian/cups.postrm
index f4be8c44..7718c313 100644
--- a/debian/cupsys.postrm
+++ b/debian/cups.postrm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for cupsys
+# postrm script for cups
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/cupsys.preinst b/debian/cups.preinst
index 1b2ed1b7..4fdb1a04 100644
--- a/debian/cupsys.preinst
+++ b/debian/cups.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for cupsys
+# preinst script for cups
 #
 # see: dh_installdeb(1)
 
@@ -11,6 +11,23 @@ set -e
 #        * <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 @@ case "$1" in
 	    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)
diff --git a/debian/cupsys.prerm b/debian/cups.prerm
index d6a96e9d..6ad71c0f 100644
--- a/debian/cupsys.prerm
+++ b/debian/cups.prerm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for cupsys
+# prerm script for cups
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/cupsys.templates b/debian/cups.templates
index a2a4dffe..a2a4dffe 100644
--- a/debian/cupsys.templates
+++ b/debian/cups.templates
diff --git a/debian/cupsys.config b/debian/cupsys.config
deleted file mode 100644
index 8a5f5ae6..00000000
--- a/debian/cupsys.config
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-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
-
-db_input low cupsys/raw-print || true
-db_go
-
-db_get cupsys/raw-print
-if [ "$OLD_RET" != "$RET" ]; then
-    db_fset cupsys/raw-print changed true
-fi
-
-# remove parallel from PPC default
-ARCH=`dpkg --print-architecture`
-if [ "$ARCH" = "ppc" -o "$ARCH" = "ppc-none" ]; then
-  db_fget cupsys/backend seen
-  if [ "$RET" = "false" ]; then
-    db_set cupsys/backend "ipp, lpd, socket, usb"
-  fi
-fi
-
-db_input low cupsys/backend || true
-db_go
-
-#RET=
-#if [ -f "$CONF" ]; then
-#  if [ "$(grep -h "Include[[:space:]]\+$PORTS" $CONF)" -a -f "$PORTS" ]; then
-#    RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF $PORTS | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
-#  else
-#    RET=$(grep -h -e "^\(Port\|Listen\)[[:space:]]\+" $CONF | sort | uniq | sed -e "s/Port[[:space:]]\+//" -e "s/Listen[[:space:]]\+//" | tr "\n" " ")
-#  fi
-#  if [ "$RET" ]; then
-#    db_set cupsys/ports $RET
-#  fi
-#  db_input low cupsys/ports || true
-#  db_go
-#  db_get cupsys/ports
-#  STATE=0
-#  while ! is_ports "$RET"; do
-#    db_input critical cupsys/portserror || true
-#    db_go
-#    db_fset cupsys/ports seen false
-#    STATE=$(expr $STATE + 1)
-#    if [ "$STATE" = "5" ]; then
-#      echo "Illegal port value for CUPS. Please correct this by running 'dpkg-reconfigure cupsys'."
-#      exit 1
-#    fi
-#    db_input high cupsys/ports || true
-#    db_go
-#    db_get cupsys/ports
-#  done
-
-#  if [ "$(grep -h "Include[[:space:]]\+$BROWSE" $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
diff --git a/debian/cupsys.lintian-overrides b/debian/cupsys.lintian-overrides
deleted file mode 100644
index 24227011..00000000
--- a/debian/cupsys.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-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/
diff --git a/debian/filters/dvipipetops b/debian/filters/dvipipetops
index 603cc7f2..08f495fb 100755
--- a/debian/filters/dvipipetops
+++ b/debian/filters/dvipipetops
@@ -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=/usr/bin/dvips
 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.
diff --git a/debian/filters/dvipipetops.INSTALL b/debian/filters/dvipipetops.INSTALL
index 9e925c91..1c10aefe 100644
--- a/debian/filters/dvipipetops.INSTALL
+++ b/debian/filters/dvipipetops.INSTALL
@@ -4,4 +4,4 @@ To use the dvipipetops filter:
 - 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
diff --git a/debian/filters/dvipipetops.convs b/debian/filters/dvipipetops.convs
index b8316889..1a4ee5f2 100644
--- a/debian/filters/dvipipetops.convs
+++ b/debian/filters/dvipipetops.convs
@@ -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
diff --git a/debian/libcupsys2-dev.examples b/debian/libcups2-dev.examples
index 6c0e1e38..6c0e1e38 100644
--- a/debian/libcupsys2-dev.examples
+++ b/debian/libcups2-dev.examples
diff --git a/debian/libcupsys2-dev.install b/debian/libcups2-dev.install
index 9c817c10..9c817c10 100644
--- a/debian/libcupsys2-dev.install
+++ b/debian/libcups2-dev.install
diff --git a/debian/libcupsys2-dev.preinst b/debian/libcups2-dev.preinst
index 0ae47a24..7908b93b 100644
--- a/debian/libcupsys2-dev.preinst
+++ b/debian/libcups2-dev.preinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# preinst script for libcupsys2-dev
+# preinst script for libcups2-dev
 #
 # see: dh_installdeb(1)
 
@@ -16,8 +16,8 @@ case "$1" in
     ;;
 
     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
     ;;
 
diff --git a/debian/libcupsys2.dirs b/debian/libcups2.dirs
index cf5ddc52..cf5ddc52 100644
--- a/debian/libcupsys2.dirs
+++ b/debian/libcups2.dirs
diff --git a/debian/libcupsys2.examples b/debian/libcups2.examples
index 43a0cea7..43a0cea7 100644
--- a/debian/libcupsys2.examples
+++ b/debian/libcups2.examples
diff --git a/debian/libcupsys2.install b/debian/libcups2.install
index ac5797fa..ac5797fa 100644
--- a/debian/libcupsys2.install
+++ b/debian/libcups2.install
diff --git a/debian/libcupsys2.postinst b/debian/libcups2.postinst
index ab28644a..a2ab10b3 100644
--- a/debian/libcupsys2.postinst
+++ b/debian/libcups2.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/libcups2.shlibs b/debian/libcups2.shlibs
new file mode 100644
index 00000000..c46b0124
--- /dev/null
+++ b/debian/libcups2.shlibs
@@ -0,0 +1 @@
+libcups 2 libcups2 (>= 1.3.7)
diff --git a/debian/libcupsimage2.postinst b/debian/libcupsimage2.postinst
index 1858ae29..331aec34 100644
--- a/debian/libcupsimage2.postinst
+++ b/debian/libcupsimage2.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cupsys
+# postinst script for cups
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/libcupsys2.lintian-overrides b/debian/libcupsys2.lintian-overrides
deleted file mode 100644
index 13520bbf..00000000
--- a/debian/libcupsys2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcupsys2: package-name-doesnt-match-sonames libcups2
diff --git a/debian/libcupsys2.shlibs b/debian/libcupsys2.shlibs
deleted file mode 100644
index d41f41af..00000000
--- a/debian/libcupsys2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libcups 2 libcupsys2 (>= 1.3.4)
diff --git a/debian/patches/00list b/debian/patches/00list
index 57c6fe42..88ae6fff 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/CVE-2008-1722.dpatch b/debian/patches/CVE-2008-1722.dpatch
index 3e48bebe..104d0fff 100755
--- a/debian/patches/CVE-2008-1722.dpatch
+++ b/debian/patches/CVE-2008-1722.dpatch
@@ -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).
diff --git a/debian/patches/classes_crash.dpatch b/debian/patches/classes_crash.dpatch
index 37264d52..21992127 100755
--- a/debian/patches/classes_crash.dpatch
+++ b/debian/patches/classes_crash.dpatch
@@ -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;
diff --git a/debian/patches/confdirperms.dpatch b/debian/patches/confdirperms.dpatch
index b03b68c6..b9c07e8e 100755
--- a/debian/patches/confdirperms.dpatch
+++ b/debian/patches/confdirperms.dpatch
@@ -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 @@ diff -urNad cupsys-1.3.0~rc2~/man/lppasswd.man cupsys-1.3.0~rc2/man/lppasswd.man
  .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,
diff --git a/debian/patches/cupsaccept.dpatch b/debian/patches/cupsaccept.dpatch
index 3b1d6686..918fbd12 100755
--- a/debian/patches/cupsaccept.dpatch
+++ b/debian/patches/cupsaccept.dpatch
@@ -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];
diff --git a/debian/patches/default_log_warn.dpatch b/debian/patches/default_log_warn.dpatch
index 54a5e602..05d403cf 100755
--- a/debian/patches/default_log_warn.dpatch
+++ b/debian/patches/default_log_warn.dpatch
@@ -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
diff --git a/debian/patches/device_uri.dpatch b/debian/patches/device_uri.dpatch
index 391b2c7d..f19a4430 100755
--- a/debian/patches/device_uri.dpatch
+++ b/debian/patches/device_uri.dpatch
@@ -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...
        */
diff --git a/debian/patches/include_krb5_h_in_job_h.dpatch b/debian/patches/include_krb5_h_in_job_h.dpatch
index 3aef1802..ab576220 100755
--- a/debian/patches/include_krb5_h_in_job_h.dpatch
+++ b/debian/patches/include_krb5_h_in_job_h.dpatch
@@ -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/".
   */
diff --git a/debian/patches/pam.dpatch b/debian/patches/pam.dpatch
deleted file mode 100755
index 42440674..00000000
--- a/debian/patches/pam.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_pam.dpatch by Kenshi Muto <kmuto@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad cupsys-1.1.99.b1.r4748~/scheduler/auth.c cupsys-1.1.99.b1.r4748/scheduler/auth.c
---- cupsys-1.1.99.b1.r4748~/scheduler/auth.c	2005-11-04 13:35:45.087637554 +0000
-+++ cupsys-1.1.99.b1.r4748/scheduler/auth.c	2005-11-04 13:36:32.953633141 +0000
-@@ -478,7 +478,7 @@
- 	    auth_data = &data;
- #  endif /* __hpux */
- 
--	    pamerr = pam_start("cups", username, &pamdata, &pamh);
-+	    pamerr = pam_start("cupsys", username, &pamdata, &pamh);
- 	    if (pamerr != PAM_SUCCESS)
- 	    {
- 	      cupsdLogMessage(CUPSD_LOG_ERROR,
diff --git a/debian/patches/ppd-poll-with-client-conf.dpatch b/debian/patches/ppd-poll-with-client-conf.dpatch
index a7b4a421..3fdd9e1e 100755
--- a/debian/patches/ppd-poll-with-client-conf.dpatch
+++ b/debian/patches/ppd-poll-with-client-conf.dpatch
@@ -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,
diff --git a/debian/patches/quiesce_ipp_logging.dpatch b/debian/patches/quiesce_ipp_logging.dpatch
index f1547538..7e3f6b7b 100755
--- a/debian/patches/quiesce_ipp_logging.dpatch
+++ b/debian/patches/quiesce_ipp_logging.dpatch
@@ -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"
  		};
diff --git a/debian/patches/reactivate_recommended_driver.dpatch b/debian/patches/reactivate_recommended_driver.dpatch
index c9db8eb3..3691f290 100755
--- a/debian/patches/reactivate_recommended_driver.dpatch
+++ b/debian/patches/reactivate_recommended_driver.dpatch
@@ -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 */
  {
diff --git a/debian/patches/ubuntu-default-error-policy-retry-job.dpatch b/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
index fa0965e8..cf249809 100755
--- a/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
+++ b/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
@@ -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);
diff --git a/debian/patches/ubuntu-disable-browsing.dpatch b/debian/patches/ubuntu-disable-browsing.dpatch
index 629ed068..7accab43 100755
--- a/debian/patches/ubuntu-disable-browsing.dpatch
+++ b/debian/patches/ubuntu-disable-browsing.dpatch
@@ -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@
  
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 5c5effb2..f4ab6cd3 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -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
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 5c3769da..6fd6ec9a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -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@ettin.org>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.7-4\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@ettin.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -160,7 +160,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 0a3c2ff7..e875cb83 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debian.cz>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/da.po b/debian/po/da.po
index 7a6998c8..8363e5b2 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -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@image.dk>, 2004.
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@gmail.com>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -160,7 +160,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/de.po b/debian/po/de.po
index 9de51593..7cb37423 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@julius-net.net>\n"
@@ -28,13 +28,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -169,7 +169,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/es.po b/debian/po/es.po
index 1dc7af74..85796da6 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -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@packages.debian.org\n"
+"Project-Id-Version: cups 1.2.2-1\n"
+"Report-Msgid-Bugs-To: Source: cups@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@dat.etsit.upm.es>\n"
@@ -35,13 +35,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -176,7 +176,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 346d535e..0e559a39 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -1,11 +1,11 @@
-# translation of cupsys-eu.po to librezale
+# translation of cups-eu.po to librezale
 # Piarres Beobide <pi@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@packages.debian.org\n"
+"Project-Id-Version: cups-eu\n"
+"Report-Msgid-Bugs-To: Source: cups@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@beobide.net>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -157,7 +157,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 71833fec..5a3a2b88 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -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@iki.fi>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys_1.3.2-1_templates\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups_1.3.2-1_templates\n"
+"Report-Msgid-Bugs-To: Source: cups@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@iki.fi>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -161,7 +161,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 616287ed..a2cd26db 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -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@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@debian.org>, 2004, 2005, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debian.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -163,7 +163,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 1055a3f9..fcd35eb3 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -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@debian.org>, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debian.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #. 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 @@ 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 "
@@ -40,14 +40,14 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -161,7 +161,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/it.po b/debian/po/it.po
index a5fd19b9..2c257de3 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -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@tiscali.it>, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.2.7 italian debconf templates\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups 1.2.7 italian debconf templates\n"
+"Report-Msgid-Bugs-To: Source: cups@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@tiscali.it>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -158,7 +158,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 33993dc0..bade072f 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.2\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups 1.2\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -165,7 +165,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/ml.po b/debian/po/ml.po
index 24eceef0..9954209a 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -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@gmail.com>, 2007.
 # 
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 20070331\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups 20070331\n"
+"Report-Msgid-Bugs-To: Source: cups@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@gmail.com>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -161,7 +161,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 0ba67229..59ceda2c 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb.po_[sQSfZa]\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@powertech.no>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -158,7 +158,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 897308aa..216bc204 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.1.20candidate6\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups 1.1.20candidate6\n"
+"Report-Msgid-Bugs-To: Source: cups@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@skolelinux.no>\n"
@@ -26,21 +26,21 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -170,7 +170,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 8b4ecc4f..2e6692b1 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,13 +1,13 @@
-# Portuguese translation for cupsys's debconf messages
+# Portuguese translation for cups's debconf messages
 # Copyright (C) 2007 Carlos Lisboa <carloslisboa@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@gmail.com>, 2007.
 # Miguel Figueiredo <elmig@debianpt.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debianpt.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -160,7 +160,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 8519b3fb..3e8b5b87 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -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@debian.org>, 2005-2006.
 # Felipe Augusto van de Wiel (faw) <faw@debian.org>, 2006-2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups@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@debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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, "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -162,7 +162,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index e894061a..e76776f3 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -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@gmail.com>"
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys_1.2.7-4_ru.po\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups_1.2.7-4_ru.po\n"
+"Report-Msgid-Bugs-To: Source: cups@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@gmail.com>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -171,7 +171,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index cdcd47ef..a5b6531b 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys 1.1.23-13\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups 1.1.23-13\n"
+"Report-Msgid-Bugs-To: Source: cups@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@danielnylander.se>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -165,7 +165,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f5deb899..dfdc4af7 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Report-Msgid-Bugs-To: Source: cups@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@ADDRESS>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 346ea163..583b64c3 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -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@iaslan.com>, 2004. 
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups\n"
+"Report-Msgid-Bugs-To: Source: cups@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@iaslan.com>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index eaaa61a9..10bd02cc 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -4,8 +4,8 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: cupsys_1.2.11-2\n"
-"Report-Msgid-Bugs-To: Source: cupsys@packages.debian.org\n"
+"Project-Id-Version: cups_1.2.11-2\n"
+"Report-Msgid-Bugs-To: Source: cups@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@riverland.net.au>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -158,7 +158,7 @@ msgstr ""
 
 #. 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."
diff --git a/debian/rules b/debian/rules
index 928f48b9..0d135a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --ma
 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 @@ clean::
 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/cupsys::
 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
author	martin@piware.de <>	2008-05-23 10:14:05 +0200
committer	martin@piware.de <>	2008-05-23 10:14:05 +0200
commit	9b0fd75c0491a094743dbe4684a367113c651f45 (patch)
tree	57a2410c83130540055c08ec7ded022867973e6a
parent	da4b8cdf48ba4dff693687372c1546cf88a25a5f (diff)
download	cups-9b0fd75c0491a094743dbe4684a367113c651f45.tar.gz