Apply patchs.

debian/changelog

@@ -1,3 +1,15 @@
+cups (2.4.2-ok3) yangtze; urgency=medium
+
+  * Apply patchs.
+
+ -- sufang <sufang@kylinos.cn>  Tue, 21 Mar 2023 14:46:32 +0800
+
+cups (2.4.2-ok2) yangtze; urgency=medium
+
+  * Update the debian directory.
+
+ -- sufang <sufang@kylinos.cn>  Tue, 21 Mar 2023 10:52:04 +0800
+
 cups (2.4.2-ok1) yangtze; urgency=medium
 
   * Update upstream version.

debian/control

@@ -1,54 +1,51 @@
 Source: cups
-Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
+Maintainer: OpenKylin Developers <packaging@lists.openkylin.top>
-Uploaders: Didier Raboud <odyx@debian.org>,
-           Till Kamppeter <till.kamppeter@gmail.com>
 Section: net
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends:
-               dh-apparmor,
-               patch,
  autoconf,
  automake,
-               libtool,
+ debhelper-compat (= 13),
-               pkg-config,
+ dh-strip-nondeterminism,
-               ghostscript,
  libavahi-client-dev,
  libavahi-common-dev,
-               libavahi-compat-libdnssd-dev,
  libdbus-1-dev,
-               libfontconfig1-dev,
-               libfreetype6-dev,
  libgnutls28-dev,
-               libijs-dev,
-               libjpeg-dev,
-               libldap2-dev,
  libkrb5-dev,
  libpam0g-dev,
  libpaper-dev,
-               libpng-dev,
  libsystemd-dev [linux-any],
-               libtiff-dev,
+ libtool,
  libusb-1.0-0-dev [!hurd-any],
-               po4a,
+ patch,
+ pkg-config,
  po-debconf,
-               poppler-utils,
+ po4a,
-               sharutils,
+ zlib1g-dev,
-               zlib1g-dev
+ libapparmor-dev,
-Build-Conflicts: libgmp-dev (<< 2:6)
+ libsnapd-glib-dev,
-Standards-Version: 4.5.0
+Build-Depends-Arch:
-Vcs-Browser: https://salsa.debian.org/printing-team/cups
+ dh-apparmor,
-Vcs-Git: https://salsa.debian.org/printing-team/cups.git
+# libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
-Homepage: https://www.cups.org/
+Build-Conflicts:
+ libgmp-dev (<< 2:6),
+Standards-Version: 4.6.0
+Vcs-Browser: https://gitee.com/openkylin/cups
+Vcs-Git: https://gitee.com/openkylin/cups.git
+Homepage: https://github.com/OpenPrinting/cups/
 Rules-Requires-Root: no
 
 Package: libcups2
 Architecture: any
 Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends},
+Depends:
-         ${misc:Depends}
+ ${misc:Depends},
-Suggests: cups-common
+ ${shlibs:Depends},
-Pre-Depends: ${misc:Pre-Depends}
+Suggests:
+ cups-common,
+Pre-Depends:
+ ${misc:Pre-Depends},
 Description: Common UNIX Printing System(tm) - Core library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -57,51 +54,37 @@ Description: Common UNIX Printing System(tm) - Core library
  .
  This package provides the base shared libraries for CUPS.
 
-Package: libcupsimage2
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcups2 (= ${binary:Version})
-Recommends: libcupsfilters1
-Pre-Depends: ${misc:Pre-Depends}
-Description: Common UNIX Printing System(tm) - Raster image library
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like.  It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides the image libraries for handling the CUPS
- raster format.
-
 Package: cups
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
+Depends:
-         ${misc:Depends},
+ cups-client (>= ${binary:Version}),
+ cups-common (>= ${source:Version}),
  cups-core-drivers (>= ${binary:Version}),
  cups-daemon (>= ${binary:Version}),
+ cups-filters,
+ cups-ppdc,
+ cups-server-common (>= ${source:Version}),
  debconf | debconf-2.0,
+ ghostscript,
+ libcups2 (= ${binary:Version}),
  poppler-utils,
  procps,
-         ghostscript,
+ ${misc:Depends},
-         cups-common (>= ${source:Version}),
+ ${shlibs:Depends},
-         cups-server-common (>= ${source:Version}),
+Recommends:
-         cups-client (>= ${binary:Version}),
+ avahi-daemon,
-         libcups2 (= ${binary:Version}),
-         cups-ppdc,
-         cups-filters
-Recommends: avahi-daemon,
  colord,
  cups-filters | foomatic-filters,
-            cups-filters | ghostscript-cups
+ cups-filters | ghostscript-cups,
-Suggests: cups-bsd,
+Suggests:
-          foomatic-db-compressed-ppds | foomatic-db,
+ cups-bsd,
  cups-pdf,
+ foomatic-db-compressed-ppds | foomatic-db,
+ smbclient,
  udev,
-          smbclient
+Pre-Depends:
-Pre-Depends: ${misc:Pre-Depends}
+ ${misc:Pre-Depends},
 Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -111,18 +94,90 @@ Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
  This package provides the parts of CUPS which are needed for using printer
  drivers.
 
+Package: cups-bsd
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ cups-client (= ${binary:Version}),
+ cups-common (>= ${source:Version}),
+ debconf | debconf-2.0,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cups,
+ inetutils-inetd | inet-superserver,
+ update-inetd,
+Conflicts:
+ lpr,
+ lprng,
+Provides:
+ lpr,
+Replaces:
+ lpr,
+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
+ Internet Printing Protocol (IPP), and has its own filtering driver
+ model for handling various document types.
+ .
+ This package provides the BSD commands for interacting with CUPS.  It
+ is provided separately to allow CUPS to coexist with other printing
+ systems (to a small degree).
+
+Package: cups-client
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ adduser,
+ cups-common (>= ${source:Version}),
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cups,
+ cups-bsd,
+ smbclient,
+Conflicts:
+ lprng,
+Description: Common UNIX Printing System(tm) - client programs (SysV)
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like.  It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides the System V style print client programs.
+
+Package: cups-common
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+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
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides common files for CUPS server and client packages.
+
 Package: cups-core-drivers
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
+Depends:
-         ${misc:Depends},
  cups-daemon (>= ${binary:Version}),
+ cups-filters-core-drivers,
  libcups2 (= ${binary:Version}),
-         cups-filters-core-drivers
+ ${misc:Depends},
-Recommends: avahi-daemon
+ ${shlibs:Depends},
-Pre-Depends: ${misc:Pre-Depends}
+Recommends:
-Breaks: cups-server-common (<< 2.1.0-0)
+ avahi-daemon,
-Replaces: cups-server-common (<< 2.1.0-0)
+Pre-Depends:
+ ${misc:Pre-Depends},
+Breaks:
+ cups-server-common (<< 2.1.0-7~),
+Replaces:
+ cups-server-common (<< 2.1.0-7~),
 Description: Common UNIX Printing System(tm) - driverless printing
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -135,33 +190,41 @@ Description: Common UNIX Printing System(tm) - driverless printing
 Package: cups-daemon
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
+Pre-Depends:
-         ${misc:Depends},
+ ${misc:Pre-Depends},
-         procps,
+Depends:
-         lsb-base,
-         libcups2 (= ${binary:Version}),
-         ssl-cert,
  adduser,
-         bc
+ bc,
-Recommends: colord,
+ libcups2 (= ${binary:Version}),
+ lsb-base,
+ procps,
+ ssl-cert,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ avahi-daemon,
+ colord,
  cups-browsed,
-            avahi-daemon
+ ipp-usb,
-Suggests: cups,
+Suggests:
+ cups,
  cups-bsd,
-          cups-common (>= ${source:Version}),
-          cups-server-common (>= ${source:Version}),
  cups-client (>= ${binary:Version}),
-          cups-ppdc,
+ cups-common (>= ${source:Version}),
  cups-filters,
-          poppler-utils,
-          ghostscript,
  cups-filters | foomatic-filters,
-          foomatic-db-compressed-ppds | foomatic-db,
  cups-pdf,
+ cups-ppdc,
+ cups-server-common (>= ${source:Version}),
+ foomatic-db-compressed-ppds | foomatic-db,
+ ghostscript,
+ poppler-utils,
+ smbclient,
  udev,
-          smbclient
+Breaks:
-Breaks: cups (<< 2.1.0-0)
+ cups (<< 2.1.0-6~),
-Replaces: cups (<< 2.1.0-0)
+Replaces:
+ cups (<< 2.1.0-6~),
 Description: Common UNIX Printing System(tm) - daemon
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -170,34 +233,17 @@ Description: Common UNIX Printing System(tm) - daemon
  .
  This package provides the CUPS scheduler/daemon.
 
-Package: cups-client
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-common (>= ${source:Version}),
-         libcups2 (= ${binary:Version}),
-         adduser
-Suggests: cups,
-          cups-bsd,
-          smbclient
-Conflicts: lprng
-Description: Common UNIX Printing System(tm) - client programs (SysV)
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like.  It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides the System V style print client programs.
-
 Package: cups-ipp-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
+Depends:
+ libcups2 (= ${binary:Version}),
  ${misc:Depends},
-         libcups2 (= ${binary:Version})
+ ${shlibs:Depends},
-Breaks: cups-client (<< 2.0.3-0)
+Breaks:
-Replaces: cups-client (<< 2.0.3-0)
+ cups-client (<< 2.0.3-2~),
+Replaces:
+ cups-client (<< 2.0.3-2~),
 Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -206,15 +252,46 @@ Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
  .
  This package provides IPP utilities for developers and system administrators
 
+Package: cups-ppdc
+Architecture: any
+Multi-Arch: foreign
+Section: utils
+Depends:
+ cups-common (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Common UNIX Printing System(tm) - PPD manipulation utilities
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like.  It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides utilities to generate and manipulate PPD files.
+
+Package: cups-server-common
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Common UNIX Printing System(tm) - server 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
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides common files for CUPS server.
+
 Package: libcups2-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: ${shlibs:Depends},
+Depends:
-         ${misc:Depends},
+ dpkg-dev,
-         libcupsimage2-dev (= ${binary:Version}),
  libcups2 (= ${binary:Version}),
-         dpkg-dev
+ libcupsimage2-dev (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Common UNIX Printing System(tm) - Development files CUPS library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -226,19 +303,42 @@ Description: Common UNIX Printing System(tm) - Development files CUPS library
  with cups from different programming languages (Perl, Java, and
  PHP).
 
+Package: libcupsimage2
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends:
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ libcupsfilters1,
+Pre-Depends:
+ ${misc:Pre-Depends},
+Description: Common UNIX Printing System(tm) - Raster image library
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like.  It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides the image libraries for handling the CUPS
+ raster format.
+
 Package: libcupsimage2-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: ${shlibs:Depends},
+Depends:
-         ${misc:Depends},
-         libcupsimage2 (= ${binary:Version}),
  libcups2-dev (= ${binary:Version}),
+ libcupsimage2 (= ${binary:Version}),
+ libjpeg-dev,
  libpng-dev,
  libtiff-dev,
-         libjpeg-dev,
+ zlib1g-dev,
-         zlib1g-dev
+ ${misc:Depends},
-Recommends: libcupsfilters-dev
+ ${shlibs:Depends},
+Recommends:
+ libcupsfilters-dev,
 Description: Common UNIX Printing System(tm) - Development files CUPS image library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -247,69 +347,3 @@ Description: Common UNIX Printing System(tm) - Development files CUPS image libr
  .
  This package provides the files necessary for developing applications
  that use the CUPS raster image format.
-
-Package: cups-bsd
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-client (= ${binary:Version}),
-         debconf | debconf-2.0,
-         cups-common (>= ${source:Version})
-Suggests: cups,
-          inetutils-inetd | inet-superserver,
-          update-inetd
-Conflicts: lpr,
-           lprng
-Provides: lpr
-Replaces: lpr
-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
- Internet Printing Protocol (IPP), and has its own filtering driver
- model for handling various document types.
- .
- This package provides the BSD commands for interacting with CUPS.  It
- is provided separately to allow CUPS to coexist with other printing
- systems (to a small degree).
-
-Package: cups-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-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
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides common files for CUPS server and client packages.
-
-Package: cups-server-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Common UNIX Printing System(tm) - server 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
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides common files for CUPS server.
-
-Package: cups-ppdc
-Architecture: any
-Multi-Arch: foreign
-Section: utils
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-common (>= ${source:Version})
-Description: Common UNIX Printing System(tm) - PPD manipulation utilities
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like.  It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides utilities to generate and manipulate PPD files.

debian/copyright

@@ -1,13 +1,16 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: CUPS
 Upstream-Contact: Michael Sweet <msweet@apple.com>
-Source: https://www.cups.org/software.html
+Source: https://github.com/OpenPrinting/cups/
-Copyright: 2005-2018, Apple Inc.
+Copyright: 2020-2021 by Michael R Sweet
+  2007-2019 by Apple Inc.
+  1997-2007 by Easy Software Products.
 License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: *
-Copyright: 2007-2019, Apple Inc.
+Copyright: 2020-2021 by Michael R Sweet
-  1993-2007, Easy Software Products
+  2007-2019 by Apple Inc.
+  1997-2007 by Easy Software Products.
 License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: config-scripts/cups-gssapi.m4
@@ -94,33 +97,30 @@ License: Apache-2.0-with-GPL2-LGPL2-Exception
  the License, but only in their entirety and only with respect to the Combined
  Software.
 
-License: BSD-3-clause
+License: BSD-2-Clause
- This software is Copyright (c) 2019 by foo.
- This is free software, licensed under:
- The (three-clause) BSD License
- The BSD License
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
+ modification, are permitted provided that the following conditions
- met:
+ are met:
- * Redistributions of source code must retain the above copyright
+ .
+   Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
+ .
+   Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
- * Neither the name of foo nor the names of its
+ .
- contributors may be used to endorse or promote products derived from
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- this software without specific prior written permission.
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ OF THE POSSIBILITY OF SUCH DAMAGE.
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: Zlib
  The zlib License

debian/cups-bsd.install

@@ -1,4 +1,4 @@
-usr/sbin/lpc
 usr/bin/lpq
 usr/bin/lpr
 usr/bin/lprm
+usr/sbin/lpc

debian/cups-bsd.manpages

@@ -1,4 +1,4 @@
+usr/share/man/man1/lpq.1
 usr/share/man/man1/lpr.1
 usr/share/man/man1/lprm.1
-usr/share/man/man1/lpq.1
 usr/share/man/man8/lpc.8

debian/cups-bsd.postinst

@@ -7,14 +7,6 @@ set -e
 
 case "$1" in
     configure)
-
-	# Set documentation symlinks
-	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
-
 	if [ -x "`which update-inetd 2>/dev/null`" ]; then
 	    # Add cups-lpd to inetd.conf
 	    db_get cups-bsd/setuplpd

debian/cups-bsd.preinst

@@ -1,28 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install)
-    ;;
-
-    upgrade)
-	if [ ! -L /usr/share/doc/cups-bsd ]; then
-	    rm -rf /usr/share/doc/cups-bsd
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-

debian/cups-client.install

@@ -1,14 +1,14 @@
+debian/tests/utils/test-drivers usr/share/cups/
 usr/bin/cancel
 usr/bin/cupstestppd
 usr/bin/lp
 usr/bin/lpoptions
 usr/bin/lpstat
+usr/sbin/cupsaccept
+usr/sbin/cupsctl
+usr/sbin/cupsdisable
+usr/sbin/cupsenable
+usr/sbin/cupsreject
 usr/sbin/lpadmin
 usr/sbin/lpinfo
 usr/sbin/lpmove
-usr/sbin/cupsaccept
-usr/sbin/cupsreject
-usr/sbin/cupsdisable
-usr/sbin/cupsenable
-usr/sbin/cupsctl
-debian/tests/utils/test-drivers usr/share/cups/

debian/cups-client.manpages

@@ -1,15 +1,14 @@
+usr/share/man/man1/cancel.1
 usr/share/man/man1/cupstestppd.1
 usr/share/man/man1/lp.1
 usr/share/man/man1/lpoptions.1
 usr/share/man/man1/lpstat.1
-usr/share/man/man1/cancel.1
 usr/share/man/man5/client.conf.5
+usr/share/man/man8/cupsaccept.8
+usr/share/man/man8/cupsctl.8
+usr/share/man/man8/cupsdisable.8
 usr/share/man/man8/cupsenable.8
+usr/share/man/man8/cupsreject.8
 usr/share/man/man8/lpadmin.8
 usr/share/man/man8/lpinfo.8
 usr/share/man/man8/lpmove.8
-usr/share/man/man8/cupsreject.8
-usr/share/man/man8/cupsdisable.8
-usr/share/man/man8/cupsaccept.8
-usr/share/man/man8/cupsctl.8
-

debian/cups-client.preinst

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install)
-    ;;
-
-    upgrade)
-	if [ -L /usr/share/doc/cups-client ]; then
-	    rm /usr/share/doc/cups-client
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/cups-common.install

@@ -1,4 +1,4 @@
 usr/share/cups/drv
 usr/share/cups/locale
-usr/share/cups/profiles
 usr/share/cups/ppdc/*.defs
+usr/share/cups/profiles

debian/cups-core-drivers.dirs

@@ -1,2 +1,2 @@
-etc/cups/ppd
 etc/cups/interfaces
+etc/cups/ppd

debian/cups-core-drivers.install

@@ -1,4 +1,4 @@
-usr/lib/cups/filter/pstops
-usr/lib/cups/filter/gziptoany
 usr/lib/cups/filter/commandtops
+usr/lib/cups/filter/gziptoany
+usr/lib/cups/filter/pstops
 usr/share/cups/mime/mime.convs

debian/cups-core-drivers.lintian-overrides

@@ -0,0 +1 @@
+cups-core-drivers: executable-in-usr-lib usr/lib/cups/filter/*

debian/cups-daemon.install

@@ -1,16 +1,16 @@
-var/
 etc/cups/cups-files.conf
-usr/lib/cups/backend/ipp
-usr/lib/cups/backend/ipps
-usr/lib/cups/backend/http
-usr/lib/cups/backend/https
-usr/lib/cups/daemon/cups-exec
-usr/lib/cups/notifier
-usr/share/cups/mime/mime.types
-usr/share/cups/cupsd.conf.default
-usr/share/cups/cups-files.conf.default
-usr/share/cups/snmp.conf.default
-usr/sbin/cupsd
-lib/systemd/system/cups.socket
 lib/systemd/system/cups.path
 lib/systemd/system/cups.service
+lib/systemd/system/cups.socket
+usr/lib/cups/backend/http
+usr/lib/cups/backend/https
+usr/lib/cups/backend/ipp
+usr/lib/cups/backend/ipps
+usr/lib/cups/daemon/cups-exec
+usr/lib/cups/notifier
+usr/sbin/cupsd
+usr/share/cups/cups-files.conf.default
+usr/share/cups/cupsd.conf.default
+usr/share/cups/mime/mime.types
+usr/share/cups/snmp.conf.default
+var/

debian/cups-daemon.lintian-overrides

@@ -1,3 +1,7 @@
 cups-daemon: init.d-script-possible-missing-stop etc/init.d/cups 0 6
 # CUPS is WantedBy=printer.target
 cups-daemon: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/cups.service printer.target
+cups-daemon: spare-manual-page usr/share/man/*man8/cups-snmp.8.gz
+cups-daemon: executable-in-usr-lib usr/lib/cups/backend/*
+cups-daemon: executable-in-usr-lib usr/lib/cups/daemon/*
+cups-daemon: executable-in-usr-lib usr/lib/cups/notifier/*

debian/cups-daemon.maintscript

@@ -1,3 +0,0 @@
-rm_conffile /etc/cups/cupsd.conf.default 1.7.1-3~
-rm_conffile /etc/default/cups 1.7.1-6~
-mv_conffile /etc/pam.d/cups-daemon /etc/pam.d/cups 1.7.3-2~

debian/cups-daemon.manpages

@@ -1,12 +1,11 @@
 usr/share/man/man5/classes.conf.5
-usr/share/man/man5/cupsd.conf.5
 usr/share/man/man5/cups-files.conf.5
 usr/share/man/man5/cups-snmp.conf.5
+usr/share/man/man5/cupsd.conf.5
 usr/share/man/man5/mailto.conf.5
 usr/share/man/man5/mime.types.5
 usr/share/man/man5/printers.conf.5
 usr/share/man/man7/backend.7
 usr/share/man/man7/notifier.7
-usr/share/man/man8/cupsd.8
 usr/share/man/man8/cups-snmp.8
-
+usr/share/man/man8/cupsd.8

debian/cups-daemon.postinst

@@ -15,23 +15,6 @@ if [ "$1" = configure ]; then
         fi
     done
 
-    # Enforce the ConfigFilePerm on ppd file if we upgrade to 2.1.x
-    if dpkg --compare-versions "$2" lt-nl "2.1.0-2~"; then
-        configfileperm=`egrep '^ConfigFilePerm ' /etc/cups/cupsd.conf | awk '{print $2}' | tail -n 1`
-        if [ -z "$configfileperm" ]; then
-            configfileperm=0640
-        fi
-	if [ -d /etc/cups/ppd ]; then
-            for i in /etc/cups/ppd/*
-            do
-		if [ -f $i ]; then
-                    chown root:lp $i
-                    chmod $configfileperm $i
-		fi
-            done
-	fi
-    fi
-
     # Manage printcap file and associated symlinks
     if [ -e /etc/cups/cupsd.conf ]; then
 	if [ -e /etc/printcap.cups ]; then

debian/cups-ipp-utils.install

@@ -1,4 +1,4 @@
+tools/ippeveprinter usr/sbin
 usr/bin/ippfind
 usr/bin/ipptool
-tools/ippeveprinter usr/sbin
 usr/share/cups/ipptool/*.test

debian/cups-ppdc.install

@@ -1,4 +1,4 @@
 usr/bin/ppd*
-usr/share/cups/ppdc/*.h
 usr/share/cups/examples/
+usr/share/cups/ppdc/*.h
 usr/share/man/man?/ppd*.?

debian/cups-server-common.lintian-overrides

@@ -1,2 +1,3 @@
 cups-server-common: package-contains-empty-directory usr/share/cups/data/
 cups-server-common: package-contains-empty-directory usr/share/cups/model/
+cups-server-common: package-contains-documentation-outside-usr-share-doc usr/share/cups/doc-root/*

debian/cups.dirs

@@ -1,4 +1,3 @@
-#usr/local/share/ppd
-usr/share/ppd/custom
 # PPD-updating triggers directory
 usr/share/cups/ppd-updaters
+usr/share/ppd/custom

debian/cups.install

@@ -1,15 +1,15 @@
+../presubj usr/share/bug/cups/
 etc/cups/snmp.conf
+usr/lib/cups/backend/dnssd usr/lib/cups/backend-available
 usr/lib/cups/backend/lpd usr/lib/cups/backend-available
+usr/lib/cups/backend/snmp usr/lib/cups/backend-available
 usr/lib/cups/backend/socket usr/lib/cups/backend-available
 usr/lib/cups/backend/usb usr/lib/cups/backend-available
-usr/lib/cups/backend/dnssd usr/lib/cups/backend-available
-usr/lib/cups/backend/snmp usr/lib/cups/backend-available
 usr/lib/cups/cgi-bin
-usr/lib/cups/monitor
 usr/lib/cups/daemon/cups-deviced
 usr/lib/cups/daemon/cups-driverd
 usr/lib/cups/daemon/cups-lpd
-usr/lib/cups/filter/rasterto*
 usr/lib/cups/driver/
+usr/lib/cups/filter/rasterto*
+usr/lib/cups/monitor
 usr/sbin/cupsfilter
-../presubj usr/share/bug/cups/

debian/cups.lintian-overrides

@@ -1,6 +1,15 @@
-cups: non-standard-executable-perm usr/lib/cups/backend-available/lpd 0744 != 0755
+cups: executable-in-usr-lib usr/lib/cups/backend-available/*
-cups: non-standard-executable-perm usr/lib/cups/backend-available/dnssd 0744 != 0755
+cups: executable-in-usr-lib usr/lib/cups/cgi-bin/*
-cups: non-standard-executable-perm usr/lib/cups/backend-available/usb 0744 != 0755
+cups: executable-in-usr-lib usr/lib/cups/daemon/*
+cups: executable-in-usr-lib usr/lib/cups/filter/*
+cups: executable-in-usr-lib usr/lib/cups/monitor/*
+cups: non-standard-executable-perm usr/lib/cups/backend-available/* 0744 != 0755
 cups: package-contains-empty-directory usr/lib/cups/driver/
 cups: package-contains-empty-directory usr/share/ppd/custom/
 cups: package-contains-empty-directory usr/share/cups/ppd-updaters/
+cups: spare-manual-page usr/share/man/*man1/cups.1.gz
+cups: spare-manual-page usr/share/man/*man8/cups-deviced.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-driverd.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-exec.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-lpd.8.gz
+cups: spare-manual-page usr/share/man/*man8/cupsd-helper.8.gz

debian/cups.maintscript

@@ -1,14 +0,0 @@
-# These three were removed in 1.3.10-3, but we're only finally doing this in 2.1.0-4~
-rm_conffile /etc/cups/pstopdf.convs 2.1.0-4~
-rm_conffile /etc/cups/oopstops.convs 2.1.0-4~
-rm_conffile /etc/cups/oopstops.types 2.1.0-4~
-
-# These two were removed in 1.4.0~svn8773-1~, but we're only finally doing this in 2.0.3-9~
-rm_conffile /etc/cups/mime.convs 2.0.3-9~
-rm_conffile /etc/cups/mime.types 2.0.3-9~
-
-rm_conffile /etc/cups/acroread.conf 1.6.2-9~
-rm_conffile /etc/cups/pdftops.conf  1.6.2-9~
-rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
-mv_conffile /etc/logrotate.d/cups /etc/logrotate.d/cups-daemon 1.6.1~
-rm_conffile /etc/logrotate.d/cups 1.6.2-3~

debian/cups.manpages

@@ -1,11 +1,10 @@
 usr/share/man/man1/cups.1
-usr/share/man/man7/filter.7
-usr/share/man/man5/subscriptions.conf.5
 usr/share/man/man5/mime.convs.5
-usr/share/man/man8/cupsd-helper.8
+usr/share/man/man5/subscriptions.conf.5
+usr/share/man/man7/filter.7
 usr/share/man/man8/cups-deviced.8
 usr/share/man/man8/cups-driverd.8
 usr/share/man/man8/cups-exec.8
-usr/share/man/man8/cupsfilter.8
 usr/share/man/man8/cups-lpd.8
-
+usr/share/man/man8/cupsd-helper.8
+usr/share/man/man8/cupsfilter.8

debian/gbp.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/main
 upstream-branch = upstream/latest
 pristine-tar = True

debian/gitlab-ci.yml

@@ -1,6 +1,3 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-variables:
-  RELEASE: 'experimental'

debian/libcups2-dev.install

@@ -1,6 +1,6 @@
+#../../cups/language-private.h
+#usr/include/cups/i18n.h
 usr/bin/cups-config
-usr/lib/*/libcups.so
-usr/lib/*/libcups.a
 usr/include/cups/adminutil.h
 usr/include/cups/array.h
 usr/include/cups/backend.h
@@ -15,4 +15,5 @@ usr/include/cups/pwg.h
 usr/include/cups/sidechannel.h
 usr/include/cups/transcode.h
 usr/include/cups/versioning.h
-#../../cups/language-private.h usr/include/cups/i18n.h
+usr/lib/*/libcups.a
+usr/lib/*/libcups.so

debian/libcups2-dev.lintian-overrides

@@ -0,0 +1 @@
+libcups2-dev: old-style-config-script usr/bin/cups-config

debian/libcups2-dev.preinst

@@ -1,32 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install)
-    ;;
-
-    upgrade)
-	if [ ! -L /usr/share/doc/libcups2-dev ]; then
-	    rm -rf /usr/share/doc/libcups2-dev
-	fi
-	# workaround for upgrades where this changed from a directory to a file;
-	# this fails with overlays (containers, schroots) sometimes (LP: #1272285)
-	# this can be dropped in jessie+1/trusty+1
-	if [ -d /usr/include/cups/i18n.h ]; then
-	    rm -rf /usr/include/cups/i18n.h
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/libcups2.symbols

@@ -1,4 +1,5 @@
 libcups.so.2 libcups2 #MINVER#
+* Build-Depends-Package: libcups2-dev
 # Keep these at the latest upstream release
  (optional|regex)"^_pwg.*@Base$" 2.3~b6
  (optional|regex)"^_cups.*@Base$" 2.3~b6
@@ -178,6 +179,7 @@ libcups.so.2 libcups2 #MINVER#
  cupsSetDests2@Base 1.4.0
  cupsSetDests@Base 1.4.0
  cupsSetEncryption@Base 1.4.0
+ cupsSetOAuthCB@Base 2.4.1op1
  cupsSetPasswordCB2@Base 1.4.0
  cupsSetPasswordCB@Base 1.4.0
  cupsSetServer@Base 1.4.0

debian/libcupsimage2-dev.install

@@ -1,3 +1,3 @@
-usr/lib/*/libcupsimage.so
-usr/lib/*/libcupsimage.a
 usr/include/cups/raster.h
+usr/lib/*/libcupsimage.a
+usr/lib/*/libcupsimage.so

debian/libcupsimage2-dev.preinst

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install)
-    ;;
-
-    upgrade)
-	if [ ! -L /usr/share/doc/libcupsimage2-dev ]; then
-	    rm -rf /usr/share/doc/libcupsimage2-dev
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/libcupsimage2.preinst

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-    install)
-    ;;
-
-    upgrade)
-	if [ ! -L /usr/share/doc/libcupsimage2 ]; then
-	    rm -rf /usr/share/doc/libcupsimage2
-	fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/libcupsimage2.symbols

@@ -1,4 +1,5 @@
 libcupsimage.so.2 libcupsimage2 #MINVER#
+* Build-Depends-Package: libcupsimage2-dev
 # Keep this one at the latest upstream release
  (optional|regex)|^_cups.*@Base$" 1.6.2
  cupsRasterClose@Base 1.4.0

debian/local/apparmor-profile

@@ -47,6 +47,15 @@
   network econet dgram,
   network ash dgram,
 
+  # To allow cupsd to determine which interfaces a snapped client
+  # is plugging
+  /{,var/}run/snapd.socket rw,
+
+  # CUPS is of systemd service type "notify" now, meaning that cupsd notifies
+  # systemd when it is up and running, give CUPS access to systemd's
+  # notification socket
+  /run/systemd/notify w,
+
   /{usr/,}bin/bash ixr,
   /{usr/,}bin/dash ixr,
   /{usr/,}bin/hostname ixr,
@@ -67,6 +76,7 @@
   /etc/pnm2ppa.conf r,
   /etc/printcap rwl,
   /etc/ssl/** r,
+  /etc/letsencrypt/archive/** r,
   @{PROC}/net/ r,
   @{PROC}/net/* r,
   @{PROC}/sys/dev/parport/** r,

debian/not-installed

@@ -0,0 +1,46 @@
+# Debian moves this to /usr/share/cups/cupsd.conf.default
+etc/cups/cupsd.conf
+# Back from CUPS 1.5
+etc/dbus-1/system.d/cups.conf
+# Installed by dh_installpam (debian/cups-daemon.cups.pam)
+etc/pam.d/cups
+# Deprecated, not installed (use xinetd)
+lib/systemd/system/cups-lpd.socket
+lib/systemd/system/cups-lpd@.service
+# Not decided whether worth installing or not yet
+usr/bin/ippeveprinter
+usr/lib/cups/command/ippevepcl
+usr/lib/cups/command/ippeveps
+usr/share/man/man7/ippevepcl.7
+usr/share/man/man7/ippeveps.7
+# Ipptool utils
+usr/share/cups/ipptool/color.jpg
+usr/share/cups/ipptool/document-a4.pdf
+usr/share/cups/ipptool/document-a4.ps
+usr/share/cups/ipptool/document-letter.pdf
+usr/share/cups/ipptool/document-letter.ps
+usr/share/cups/ipptool/gray.jpg
+usr/share/cups/ipptool/onepage-a4.pdf
+usr/share/cups/ipptool/onepage-a4.ps
+usr/share/cups/ipptool/onepage-letter.pdf
+usr/share/cups/ipptool/onepage-letter.ps
+usr/share/cups/ipptool/testfile.jpg
+usr/share/cups/ipptool/testfile.pcl
+usr/share/cups/ipptool/testfile.pdf
+usr/share/cups/ipptool/testfile.ps
+usr/share/cups/ipptool/testfile.txt
+# CUPS "desktop" entry, to access the webinterface
+usr/share/applications/cups.desktop
+usr/share/icons/hicolor/*x*/apps/cups.png
+# Translated manpages only get installed if sufficiently translated
+usr/share/man/de/man1/*.1
+usr/share/man/de/man5/*.5
+usr/share/man/de/man7/*.7
+usr/share/man/de/man8/*.8
+usr/share/man/fr/man1/*.1
+usr/share/man/fr/man5/*.5
+usr/share/man/fr/man7/*.7
+usr/share/man/fr/man8/*.8
+#
+# temporary exclude
+usr/lib/pkgconfig/cups.pc

debian/patches/series

@@ -0,0 +1 @@
+0001-Apply-patchs.patch

debian/po/da.po

@@ -14,7 +14,7 @@ msgstr ""
 "Language-Team: Danish\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -23,7 +23,7 @@ msgstr ""
 #. Description
 #: ../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?"
+msgstr "Ønsker du at sætte BSD lpd-kompatibilitetsserveren op?"
 
 #. Type: boolean
 #. Description
@@ -34,17 +34,17 @@ msgid ""
 "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 ""
-"CUPS-pakken indeholder en server, der kan modtage print-jobs på BSD-form og "
+"CUPS-pakken indeholder en server, der kan modtage print-jobs på BSD-form og "
-"sende dem videre til CUPS. Den bør kun sættes op, hvis det er muligt, at "
+"sende dem videre til CUPS. Den bør kun sættes op, hvis det er muligt, at "
-"andre computere sender jobs over netværket via servicerne \"BSD\" eller \"LPR"
+"andre computere sender jobs over netværket via servicerne \"BSD\" eller \"LPR"
-"\", og disse computere ikke kan overgå til at benytte den IPP-protokol, som "
+"\", og disse computere ikke kan overgå til at benytte den IPP-protokol, som "
 "CUPS benytter."
 
 #. Type: boolean
 #. Description
 #: ../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?"
+msgstr "Ønsker du at CUPS skal udskrive ukendte jobs som rå jobs?"
 
 #. Type: boolean
 #. Description
@@ -55,10 +55,10 @@ msgid ""
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
 msgstr ""
-"Internet Printing Protocol IPP kræver, at der angives MIME-type for alle "
+"Internet Printing Protocol IPP kræver, at der angives MIME-type for alle "
 "printjobs. Da ikke alle printjob-kilder kan medsende den relevante type, vil "
 "mange jobs blive sendt med MIME-typen \"application/octet-stream\", og kunne "
-"blive afvist, såfremt CUPS ikke kan gætte jobbets format."
+"blive afvist, såfremt CUPS ikke kan gætte jobbets format."
 
 #. Type: boolean
 #. Description
@@ -67,7 +67,7 @@ msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"CUPS kan håndtere sådanne jobs som \"rå\" jobs, hvilket betyder, at de "
+"CUPS kan håndtere sådanne jobs som \"rå\" jobs, hvilket betyder, at de "
 "sendes direkte til printeren uden yderligere behandling."
 
 #. Type: boolean
@@ -77,7 +77,7 @@ msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
 msgstr ""
-"Det anbefales at vælge denne indstilling, hvis serveren kommer til at "
+"Det anbefales at vælge denne indstilling, hvis serveren kommer til at "
 "modtage printjobs fra Windows-computere eller Samba-servere."
 
 #. Type: multiselect
@@ -132,15 +132,15 @@ msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
+"Vælg det bagvedliggende program, CUPS skal bruge. Det forvalgte burde være "
 "passende under de mest almindelige forhold."
 
 #~ msgid ""
 #~ "Unfortunately, some backend programs are likely to cause some trouble. "
 #~ "For example, some PPC kernels crash with the parallel backend."
 #~ msgstr ""
-#~ "Desværre giver nogle af disse bagvedliggende programmer ofte visse "
+#~ "Desværre giver nogle af disse bagvedliggende programmer ofte visse "
-#~ "problemer (f.eks. bryder kernen sammen på nogle PPC-maskiner med parallel-"
+#~ "problemer (f.eks. bryder kernen sammen på nogle PPC-maskiner med parallel-"
 #~ "programmet)."
 
 #~ msgid "ipp"
@@ -155,19 +155,19 @@ msgstr ""
 #~ "local driver the MIME type application/octet-stream. Samba also submits "
 #~ "its print jobs this way."
 #~ msgstr ""
-#~ "Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
+#~ "Hvis du vil acceptere printjobs fra Windows-computere, bør du acceptere "
-#~ "denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
+#~ "denne funktion, da Windows giver alle IPP-printjobs, som håndteres af en "
 #~ "lokal driver MIME-typen \"application/octet-stream\". Samba sender sine "
-#~ "jobs på samme måde."
+#~ "jobs på samme måde."
 
 #~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
+#~ msgstr "Port og/eller værtsnavn, CUPS skal lytte på:"
 
 #~ msgid ""
 #~ "Please specify the port or the host name CUPS daemon will listen to. The "
 #~ "following formats are allowed:"
 #~ msgstr ""
-#~ "Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater "
+#~ "Angiv port eller værtsnavn, CUPS-dæmonen skal lytte på. Følgende formater "
 #~ "er gyldige:"
 
 #~ msgid ""
@@ -177,9 +177,9 @@ msgstr ""
 #~ " - File domain socket (/var/run/cups/cups.sock)."
 #~ msgstr ""
 #~ " - Portnummer  (631);\n"
-#~ " - værtsnavn   (debian.eksempel.dk);\n"
+#~ " - værtsnavn   (debian.eksempel.dk);\n"
-#~ " - Vært:Port   (debian.eksempel.dk:631);\n"
+#~ " - Vært:Port   (debian.eksempel.dk:631);\n"
-#~ " - Fildomænesokkel (/var/run/cups/cups.sock)."
+#~ " - Fildomænesokkel (/var/run/cups/cups.sock)."
 
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."
@@ -191,31 +191,31 @@ msgstr ""
 #~ "for security reasons."
 #~ msgstr ""
 #~ "Standardporten 631 er reserveret til Internet-PrinterProtokollen (IPP). "
-#~ "\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et "
+#~ "\"localhost:631\" anbefales af sikkerhedsgrunde for at sætte et "
-#~ "selvstændigt miljø op."
+#~ "selvstændigt miljø op."
 
 #~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
-#~ msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
+#~ msgstr "Rundsend og/eller lyt efter CUPS-printeroplysninger på netværket?"
 
 #~ msgid ""
 #~ "CUPS daemon can broadcast printer information for clients on the network, "
 #~ "and detect printers on the network automatically."
 #~ msgstr ""
-#~ "CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket "
+#~ "CUPS-dæmonen kan rundsende printeroplysninger til klienter på netværket "
-#~ "og detektere printere på netværket automatisk."
+#~ "og detektere printere på netværket automatisk."
 
 #~ msgid ""
 #~ "If you choose this option, the CUPS daemon will periodically send UDP "
 #~ "broadcasts to detect printers."
 #~ msgstr ""
-#~ "Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
+#~ "Hvis du vælger denne indstilling, vil CUPS-dæmonen periodisk sende UDP-"
 #~ "rundsendinger for at detektere printere."
 
 #~ msgid "Incorrect value entered"
-#~ msgstr "Ugyldig værdi indtastet"
+#~ msgstr "Ugyldig værdi indtastet"
 
 #~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
+#~ msgstr "der opstod en fejl under tolkningaf portnummer eller værtsnavn."
 
 #~ msgid "Please correct your input."
 #~ msgstr "Ret venligst din indtastning."
@@ -224,4 +224,4 @@ msgstr ""
 #~ msgstr "ipp, lpd, parallel, scsi, seriel, sokkel, usb"
 
 #~ msgid "Select the backends you want."
-#~ msgstr "Vælg det bagvedliggende program, du ønsker."
+#~ msgstr "Vælg det bagvedliggende program, du ønsker."

debian/po/es.po

@@ -4,7 +4,7 @@
 #
 # Changes:
 # - Initial translation
-#        Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2003, 2004, 2006
+#        Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2003, 2004, 2006
 # - Translation update
 #        Javier Fernandez-Sanguino <jfs@debian.org>, 2007
 #
@@ -26,19 +26,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: cups@packages.debian.org\n"
 "POT-Creation-Date: 2016-12-20 08:55+0100\n"
 "PO-Revision-Date: 2007-06-21 18:51+0200\n"
-"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
+"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish Team <debian-l10n-spanish@lists.debian."
 "org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
 #: ../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?"
+msgstr "¿Desea configurar el servidor de compatibilidad lpd de BSD?"
 
 #. Type: boolean
 #. Description
@@ -49,9 +49,9 @@ msgid ""
 "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 ""
-"Este paquete incluye un servidor que acepta trabajos de impresión al estilo "
+"Este paquete incluye un servidor que acepta trabajos de impresión al estilo "
-"BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya "
+"BSD y se los envía a CUPS. Configúrelo únicamente en el caso de que haya "
-"otras máquinas que envíen trabajos de impresión mediante la red, usando los "
+"otras máquinas que envíen trabajos de impresión mediante la red, usando los "
 "servicios \"BSD\" o \"LPR\" y no se puede hacer que estos utilice el "
 "protocolo IPP que utiliza CUPS."
 
@@ -59,7 +59,7 @@ msgstr ""
 #. Description
 #: ../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?"
+msgstr "¿Quiere que CUPS imprima en bruto los trabajos desconocidos?"
 
 #. Type: boolean
 #. Description
@@ -70,9 +70,9 @@ msgid ""
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
 msgstr ""
-"En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no "
+"En IPP todos los trabajos de impresión tienen un tipo MIME. Puesto que no "
-"todas las fuentes de trabajos de impresión asignan correctamente algún tipo "
+"todas las fuentes de trabajos de impresión asignan correctamente algún tipo "
-"MIME, muchos llegan con el tipo «application/octet-stream» y podrían "
+"MIME, muchos llegan con el tipo «application/octet-stream» y podrían "
 "rechazarse si CUPS no puede adivinar el formato del trabajo."
 
 #. Type: boolean
@@ -82,8 +82,8 @@ msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"Es posible hacer que CUPS trate todos estos trabajos como trabajos «en "
+"Es posible hacer que CUPS trate todos estos trabajos como trabajos «en "
-"crudo», con lo que se mandan directamente a la impresora sin procesar."
+"crudo», con lo que se mandan directamente a la impresora sin procesar."
 
 #. Type: boolean
 #. Description
@@ -92,8 +92,8 @@ msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
 msgstr ""
-"Se recomienda que escoga esta opción si el servidor va a aceptar trabajos de "
+"Se recomienda que escoga esta opción si el servidor va a aceptar trabajos de "
-"impresión de ordenadores con Windows o servidores Samba."
+"impresión de ordenadores con Windows o servidores Samba."
 
 #. Type: multiselect
 #. Choices
@@ -129,7 +129,7 @@ msgstr "dnssd"
 #. Description
 #: ../cups.templates:3002
 msgid "Printer communication backends:"
-msgstr "Motores de comunicación con la impresora:"
+msgstr "Motores de comunicación con la impresora:"
 
 #. Type: multiselect
 #. Description
@@ -147,15 +147,15 @@ msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Por favor, elija el motor que utilizará CUPS. La opción predeterminada "
+"Por favor, elija el motor que utilizará CUPS. La opción predeterminada "
-"debería ser apta para los entornos más comunes."
+"debería ser apta para los entornos más comunes."
 
 #~ msgid ""
 #~ "Unfortunately, some backend programs are likely to cause some trouble. "
 #~ "For example, some PPC kernels crash with the parallel backend."
 #~ msgstr ""
 #~ "Desafortunadamente, ciertos motores pueden causar problemas. Por ejemplo, "
-#~ "con el motor del puerto paralelo se producen algunas caídas del núcleo en "
+#~ "con el motor del puerto paralelo se producen algunas caídas del núcleo en "
 #~ "la arquitectura PPC."
 
 #~ msgid "ipp"
@@ -170,7 +170,7 @@ msgstr ""
 #~ "local driver the MIME type application/octet-stream. Samba also submits "
 #~ "its print jobs this way."
 #~ msgstr ""
-#~ "Si va a recibir trabajos de impresión desde sistemas Windows es muy "
+#~ "Si va a recibir trabajos de impresión desde sistemas Windows es muy "
-#~ "probable que desee activar esta opción, ya que Windows da a los trabajos "
+#~ "probable que desee activar esta opción, ya que Windows da a los trabajos "
-#~ "de impresión IPP que procesa localmente el tipo application/octet-stream. "
+#~ "de impresión IPP que procesa localmente el tipo application/octet-stream. "
-#~ "Samba también envía los trabajos de impresión de esta manera."
+#~ "Samba también envía los trabajos de impresión de esta manera."

debian/po/it.po

@@ -13,14 +13,14 @@ msgstr ""
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
 #. Description
 #: ../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?"
+msgstr "Si vuole configurare il server di compatibilità con lpd di BSD?"
 
 #. Type: boolean
 #. Description
@@ -31,11 +31,11 @@ msgid ""
 "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 ""
-"Il pacchetto CUPS contiene un server che può accettare job di stampa in "
+"Il pacchetto CUPS contiene un server che può accettare job di stampa in "
 "formato BSD per poi girarli a CUPS. Questo server dovrebbe essere attivato "
 "solo se in rete ci sono altri computer che potrebbero inviare job tramite i "
 "servizi \"BSD\" o \"LPR\" e che non possono essere configurati per usare il "
-"protocollo IPP, cioè quello usato da CUPS."
+"protocollo IPP, cioè quello usato da CUPS."
 
 #. Type: boolean
 #. Description
@@ -64,7 +64,7 @@ msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"CUPS può trattare tutti questi job come job \"raw\", ciò comporta l'invio "
+"CUPS può trattare tutti questi job come job \"raw\", ciò comporta l'invio "
 "diretto alla stampante, senza ulteriori elaborazioni."
 
 #. Type: boolean

debian/po/sv.po

@@ -21,7 +21,7 @@ msgstr ""
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: boolean
@@ -39,17 +39,17 @@ msgid ""
 "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 ""
-"CUPS-paketet innehåller en server som kan acceptera utskriftsjobb av BSD-"
+"CUPS-paketet innehåller en server som kan acceptera utskriftsjobb av BSD-"
-"stil och skicka dem till CUPS. Den bör endast konfigureras om du har andra "
+"stil och skicka dem till CUPS. Den bör endast konfigureras om du har andra "
-"datorer som kommer att skicka jobb över nätverket via \"BSD\" eller \"LPR\"-"
+"datorer som kommer att skicka jobb över nätverket via \"BSD\" eller \"LPR\"-"
-"tjänster och dessa datorer inte kan konverteras till att använda IPP-"
+"tjänster och dessa datorer inte kan konverteras till att använda IPP-"
-"protokollet som CUPS använder."
+"protokollet som CUPS använder."
 
 #. Type: boolean
 #. Description
 #: ../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?"
+msgstr "Vill du att CUPS ska skriva ut okända jobb som råjobb?"
 
 #. Type: boolean
 #. Description
@@ -60,9 +60,9 @@ msgid ""
 "many jobs get submitted as the MIME type application/octet-stream and could "
 "be rejected if CUPS cannot guess the job's format."
 msgstr ""
-"Internet Printing Protocol (IPP) använder en MIME-typ för alla sorters "
+"Internet Printing Protocol (IPP) använder en MIME-typ för alla sorters "
-"utskriftsjobb. Eftersom inte alla källor för utskriftsjobb kan skicka med en "
+"utskriftsjobb. Eftersom inte alla källor för utskriftsjobb kan skicka med en "
-"lämplig typ blir många jobb skickade som MIME-typen \"application/octet-"
+"lämplig typ blir många jobb skickade som MIME-typen \"application/octet-"
 "stream\" och kan bli nekade om CUPS inte kan gissa jobbtypen."
 
 #. Type: boolean
@@ -72,8 +72,8 @@ msgid ""
 "CUPS can handle all such jobs as \"raw\" jobs, which causes them to be sent "
 "directly to the printer without processing."
 msgstr ""
-"CUPS kan hantera alla sådan jobb som \"raw\"-jobb vilket orsakar att de "
+"CUPS kan hantera alla sådan jobb som \"raw\"-jobb vilket orsakar att de "
-"skickas direkt till skrivaren utan att först behandlas."
+"skickas direkt till skrivaren utan att först behandlas."
 
 #. Type: boolean
 #. Description
@@ -82,8 +82,8 @@ msgid ""
 "It is recommended to choose this option if the server will be accepting "
 "print jobs from Windows computers or Samba servers."
 msgstr ""
-"Det är rekommenderat att välja det här alternativet om servern ska acceptera "
+"Det är rekommenderat att välja det här alternativet om servern ska acceptera "
-"utskriftsjobb från Windows-datorer eller Samba-servrar."
+"utskriftsjobb från Windows-datorer eller Samba-servrar."
 
 #. Type: multiselect
 #. Choices
@@ -119,7 +119,7 @@ msgstr "dnssd"
 #. Description
 #: ../cups.templates:3002
 msgid "Printer communication backends:"
-msgstr "Bakändar för skrivarkommunikation:"
+msgstr "Bakändar för skrivarkommunikation:"
 
 #. Type: multiselect
 #. Description
@@ -127,7 +127,7 @@ msgstr "Bak
 msgid ""
 "CUPS uses backend programs to communicate with the printer device or port."
 msgstr ""
-"CUPS använder bakändesprogram för att kommunicera med skrivarenheten eller "
+"CUPS använder bakändesprogram för att kommunicera med skrivarenheten eller "
 "porten."
 
 #. Type: multiselect
@@ -137,15 +137,15 @@ msgid ""
 "Please choose the backend program to be used by CUPS. The default choice "
 "should fit the most common environments."
 msgstr ""
-"Välj det bakändesprogram som ska användas av CUPS. Standardvalet bör passa "
+"Välj det bakändesprogram som ska användas av CUPS. Standardvalet bör passa "
-"de flesta vanliga miljöer."
+"de flesta vanliga miljöer."
 
 #~ msgid ""
 #~ "Unfortunately, some backend programs are likely to cause some trouble. "
 #~ "For example, some PPC kernels crash with the parallel backend."
 #~ msgstr ""
-#~ "Tyvärr kan vissa bakändesprogram orsaka en del problem. Till exempel kan "
+#~ "Tyvärr kan vissa bakändesprogram orsaka en del problem. Till exempel kan "
-#~ "vissa PPC-kärnor krascha när den parallella bakänden används."
+#~ "vissa PPC-kärnor krascha när den parallella bakänden används."
 
 #~ msgid "ipp"
 #~ msgstr "ipp"
@@ -159,21 +159,21 @@ msgstr ""
 #~ "local driver the MIME type application/octet-stream. Samba also submits "
 #~ "its print jobs this way."
 #~ msgstr ""
-#~ "Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
+#~ "Om du vill att utskriftsjobb ska accepteras från Windows-datorer bör du "
-#~ "antagligen välja denna funktion eftersom Windows sätter alla IPP-"
+#~ "antagligen välja denna funktion eftersom Windows sätter alla IPP-"
 #~ "utskriftsjobb som hanteras av en lokal drivare till MIME-typen "
-#~ "\"application/octet-stream\". Samba skickar också sina utskriftsjobb på "
+#~ "\"application/octet-stream\". Samba skickar också sina utskriftsjobb på "
-#~ "detta sätt."
+#~ "detta sätt."
 
 #~ msgid "Port or/and host name where CUPS will listen to:"
-#~ msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
+#~ msgstr "Port och/eller värdnamn som CUPS lyssnar på:"
 
 #~ msgid ""
 #~ "Please specify the port or the host name CUPS daemon will listen to. The "
 #~ "following formats are allowed:"
 #~ msgstr ""
-#~ "Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. "
+#~ "Vänligen ange porten eller värdnamnet som CUPS-demonen ska lyssna på. "
-#~ "Följande format är tillåtna:"
+#~ "Följande format är tillåtna:"
 
 #, fuzzy
 #~ msgid ""
@@ -183,79 +183,79 @@ msgstr ""
 #~ " - File domain socket (/var/run/cups/cups.sock)."
 #~ msgstr ""
 #~ " - Portnummer (631);\n"
-#~ " - Värdnamn   (debian.exempel.se);\n"
+#~ " - Värdnamn   (debian.exempel.se);\n"
-#~ " - Värd:Port   (debian.exempel.se:631)."
+#~ " - Värd:Port   (debian.exempel.se:631)."
 
 #~ msgid ""
 #~ "You can combine any of these by delimiting in a space-separated list."
-#~ msgstr "Du kan kombinera flera av dessa genom att avgränsa med mellanslag."
+#~ msgstr "Du kan kombinera flera av dessa genom att avgränsa med mellanslag."
 
 #~ msgid ""
 #~ "The default port 631 is reserved for the Internet Printing Protocol "
 #~ "(IPP). \"localhost:631\" is recommended to setup a standalone environment "
 #~ "for security reasons."
 #~ msgstr ""
-#~ "Standardport 631 är reserverad för Internet Printing Protocol (IPP). "
+#~ "Standardport 631 är reserverad för Internet Printing Protocol (IPP). "
-#~ "\"localhost:631\" är rekommenderad för att ställa in en fristående miljö "
+#~ "\"localhost:631\" är rekommenderad för att ställa in en fristående miljö "
-#~ "av säkerhetsskäl."
+#~ "av säkerhetsskäl."
 
 #~ msgid "Broadcast and/or listen for CUPS printer information on the network?"
 #~ msgstr ""
-#~ "Vill du sända ut och/eller lyssna efter skrivarinformation för CUPS på "
+#~ "Vill du sända ut och/eller lyssna efter skrivarinformation för CUPS på "
-#~ "nätverket?"
+#~ "nätverket?"
 
 #~ msgid ""
 #~ "CUPS daemon can broadcast printer information for clients on the network, "
 #~ "and detect printers on the network automatically."
 #~ msgstr ""
-#~ "CUPS-demonen kan sända ut skrivarinformation för klienter på nätverket "
+#~ "CUPS-demonen kan sända ut skrivarinformation för klienter på nätverket "
-#~ "och automatiskt identifiera skrivare på nätverket."
+#~ "och automatiskt identifiera skrivare på nätverket."
 
 #~ msgid ""
 #~ "If you choose this option, the CUPS daemon will periodically send UDP "
 #~ "broadcasts to detect printers."
 #~ msgstr ""
-#~ "Om du valde detta alternativ kommer CUPS-demonen att med jämna mellanrum "
+#~ "Om du valde detta alternativ kommer CUPS-demonen att med jämna mellanrum "
-#~ "sända UDP-broadcast för att identifiera skrivare."
+#~ "sända UDP-broadcast för att identifiera skrivare."
 
 #~ msgid "Incorrect value entered"
-#~ msgstr "Felaktigt värde angivet"
+#~ msgstr "Felaktigt värde angivet"
 
 #~ msgid "an error occurred while parsing the port number or the host name."
-#~ msgstr "ett fel inträffade vid tolkning av portnumret eller värdnamnet."
+#~ msgstr "ett fel inträffade vid tolkning av portnumret eller värdnamnet."
 
 #~ msgid "Please correct your input."
-#~ msgstr "Vänligen rätt till det."
+#~ msgstr "Vänligen rätt till det."
 
 #~ msgid "ipp, lpd, parallel, scsi, serial, socket, usb"
 #~ msgstr "ipp, lpd, parallell, scsi, seriell, socket, usb"
 
 #~ msgid "Select the backends you want."
-#~ msgstr "Välj det baksystem du vill använda."
+#~ msgstr "Välj det baksystem du vill använda."
 
 #~ msgid "Specify the port or/and host name that wants to be listened."
-#~ msgstr "Ange port och/eller värdnamn som ska lyssnas på."
+#~ msgstr "Ange port och/eller värdnamn som ska lyssnas på."
 
 #~ msgid "- Port number (631)"
 #~ msgstr "- Portnummer (631)"
 
 #~ msgid "- Host name   (debian.example.com)"
-#~ msgstr "- Värdnamn   (debian.exempel.se)"
+#~ msgstr "- Värdnamn   (debian.exempel.se)"
 
 #~ msgid "- Host:Port   (debian.example.com:631)"
-#~ msgstr "- Värd:Port   (debian.exempel.se:631)"
+#~ msgstr "- Värd:Port   (debian.exempel.se:631)"
 
 #~ msgid "It is possible to combine by delimiting two or more values in space."
 #~ msgstr ""
-#~ "Det är möjligt att kombinera genom att avgränsa två eller fler värden med "
+#~ "Det är möjligt att kombinera genom att avgränsa två eller fler värden med "
 #~ "mellanslag."
 
 #~ msgid ""
 #~ "When this option is accepted, CUPS daemon will broadcast and detect by "
 #~ "using UDP periodically."
 #~ msgstr ""
-#~ "När denna funktion accepteras kommer CUPS-demonen att sända ut och "
+#~ "När denna funktion accepteras kommer CUPS-demonen att sända ut och "
-#~ "identifiera genom att använda UDP med jämna mellanrum."
+#~ "identifiera genom att använda UDP med jämna mellanrum."
 
 #~ msgid "The wrong value is found in the input."
-#~ msgstr "Fel värde matades in."
+#~ msgstr "Fel värde matades in."

debian/rules

@@ -1,12 +1,15 @@
 #!/usr/bin/make -f
 
+# temporarily deactivate tests
+export LOCAL_DEB_BUILD_OPTIONS = nocheck
+
 derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
 derives_from_openkylin := $(shell (dpkg-vendor --derives-from openKylin && echo "yes") || echo "no")
 
 # Enabling PIE globally doesn't work, but ./configure already enables PIE
 # where necessary.
+# temporarily deactivate tests
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
    skip_packages = -Ncups -Ncups-core-drivers
@@ -31,20 +34,21 @@ else
 CONFIG_LIBUSB=--enable-libusb
 endif
 
-override_dh_auto_configure:
+ifeq ($(derives_from_ubuntu),yes)
-ifeq ($(filter yes,$(derives_from_ubuntu) $(derives_from_openkylin)),yes)
+CUPS_CONFIGURE_DISTRO_OPTIONS=--disable-browsing
-	set -e; if ! [ -e debian/patches-ubuntu/stamp-applied ]; then \
+else
-	    echo '---- Applying Ubuntu specific patches'; \
+CUPS_CONFIGURE_DISTRO_OPTIONS=
-	    for p in debian/patches-ubuntu/*; do \
-	        patch -p1 --no-backup-if-mismatch < $$p; \
-	    done; \
-	    touch debian/patches-ubuntu/stamp-applied; \
-	fi
 endif
+
+override_dh_auto_configure:
 	# Rebuild ./configure to get build system patches working
 	aclocal
 	autoconf
+	# --with-error-policy=retry-job # Set default job error policy to "retry-job", since it is less confusing and a better default on most machines
+	# --enable-sync-on-close # Set SyncOnClose to yes; considered saner on Linux
+	# --with-max-log-size=0 # Deactivate CUPS' internal logrotating, as we provide a better one, especially LogLevel debug2 gets usable now
 	dh_auto_configure -- \
+		$(CUPS_CONFIGURE_DISTRO_OPTIONS) \
 		--with-docdir=/usr/share/cups/doc-root \
 		--localedir=/usr/share/cups/locale \
 		--enable-libpaper \
@@ -59,12 +63,17 @@ endif
 		--enable-avahi \
 		--disable-launchd \
 		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
+		--with-system-groups="root lpadmin" \
 		--with-rundir=/run/cups \
 		--with-printcap=/run/cups/printcap \
 		--with-log-file-perm=0640 \
 		--with-local_protocols='dnssd' \
 		--with-systemd=/lib/systemd/system \
+		--with-system-groups='lpadmin root' \
+		--with-error-policy=retry-job \
+		--enable-sync-on-close \
+		--with-max-log-size=0 \
+		--enable-snapped-clients \
 		$(CONFIG_LIBUSB)
 
 override_dh_auto_install:
@@ -167,10 +176,6 @@ endif
 
 
 override_dh_install:
-	# Rename the systemd service units to cups.* instead of org.cups.cupsd.*
-	set -e; for type in socket path service; do \
-	    mv debian/tmp/lib/systemd/system/org.cups.cupsd.$$type debian/tmp/lib/systemd/system/cups.$$type ;\
-	done
 	dh_install
 
 ifneq (,$(filter cups-server-common,$(shell dh_listpackages)))
@@ -218,27 +223,17 @@ override_dh_strip_nondeterminism: override_dh_fixperms
 	dh_strip_nondeterminism
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nocheck,$(LOCAL_DEB_BUILD_OPTIONS)))
-	CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) make check
+	CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) dh_auto_test
 	# Check that cups-config is not architecture-specific
 	[ -r cups-config ] && grep -vq $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cups-config
 endif
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring noopt,$(LOCAL_DEB_BUILD_OPTIONS)))
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c4
 endif
 
-override_dh_clean:
-	dh_clean
-	if [ -e debian/patches-ubuntu/stamp-applied ]; then \
-	    echo '---- Unapplying Ubuntu specific patches'; \
-	    for p in debian/patches-ubuntu/*; do \
-	        patch -Rp1 --no-backup-if-mismatch < $$p; \
-	    done; \
-	    rm debian/patches-ubuntu/stamp-applied; \
-	fi
-
 override_dh_auto_clean:
 	[ ! -f Makedefs ] || dh_auto_clean
 	rm -f man/client.conf.man packaging/cups.list

debian/tests/control

@@ -1,7 +1,18 @@
 Tests: cups-core-drivers
 Restrictions: needs-root
-Depends: cups-core-drivers, cups-client
+Depends:
+ cups-client,
+ cups-core-drivers,
 
 Tests: cups
 Restrictions: needs-root
-Depends: cups, cups-client
+Depends:
+ cups,
+ cups-client,
+
+Tests: cups-basiccommands
+Restrictions: needs-root
+Depends:
+ cups,
+ cups-bsd,
+ cups-client,

debian/tests/cups-basiccommands

@@ -0,0 +1,141 @@
+#!/bin/bash
+
+set -e -u
+
+filter_stderr_from_file() {
+    cat $1 | \
+        grep -v -E "lpadmin: (Raw queues|Printer drivers) are deprecated and will stop working in a future version of CUPS." \
+        || true \
+        1>&2
+}
+
+# What follows is widely taken from https://src.fedoraproject.org/rpms/cups/blob/master/f/tests/basic-commands/runtest.sh , with small adaptations for Debian
+# runtest.sh - basic commands
+# Author: Yulia Kopkova <ykopkova@redhat.com>
+# Location: /CoreOS/cups/Sanity/basic_commands/Makefile
+# Description: Test for basic CUPS commands
+# Copyright (c) 2008 Red Hat, Inc. This copyrighted material
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Make sure we can print to Files
+sed -e 's/^#.*FileDevice.*$/FileDevice Yes/g' -i /etc/cups/cups-files.conf
+service cups restart
+
+FILEPDF=/usr/share/cups/data/default-testpage.pdf
+FILEJPG=/usr/share/cups/doc-root/images/smiley.jpg
+NUMJOBS=50
+TIMEOUT=30
+TPRN1="test-printer1"
+TPRN2="test-printer2"
+ML="drv:///sample.drv/deskjet.ppd"
+STDERR_FILE=`mktemp`
+
+cleanup() {
+    # Delete it
+    echo -n " - Interrupted (or finished), delete test printers:"
+    lpadmin -x $TPRN1 2>/dev/null || :
+    lpadmin -x $TPRN2 2>/dev/null || :
+    rm -f $STDERR_FILE
+    echo " done."
+}
+
+trap cleanup EXIT INT
+
+
+# Configure the running CUPS server to do debug2 logging
+echo " - Setting CUPS into debug2 mode"
+sed -e 's/^.*LogLevel.*$/LogLevel debug2/g' -i /etc/cups/cupsd.conf
+# Configure the running CUPS server to allow root to do administrative tasks
+echo " - Setting CUPS to allow root to do administrative tasks"
+sed -e 's/^.*SystemGroup.*$/SystemGroup lpadmin root/g' -i /etc/cups/cups-files.conf
+# Restart CUPS
+echo " - Restarting CUPS to apply configuration changes"
+service cups restart
+
+echo " - Create printer $TPRN1"
+lpadmin -p $TPRN1 -v file:/dev/null -E -m $ML 2> $STDERR_FILE; filter_stderr_from_file $STDERR_FILE
+echo " - Set $TPRN1 default"
+lpadmin -d $TPRN1 
+echo " - Create printer $TPRN2"
+lpadmin -p $TPRN2 -v file:/dev/null -E -m $ML 2> $STDERR_FILE; filter_stderr_from_file $STDERR_FILE
+echo " - Print $FILEPDF with lp and default printer"
+lp $FILEPDF 
+echo " - Print $FILEJPG with lp and $TPRN2"
+lp -d $TPRN2 $FILEJPG 
+echo " - Print $FILEPDF with lp and $TPRN1"
+lp -d $TPRN1 -P 1-2 -o job-sheets=classified,classified $FILEPDF 
+
+for ((i=0; i < $NUMJOBS; i++)); do
+    lp -d $TPRN1 $FILEJPG &
+    sleep 0.02s
+    lp -d $TPRN2 $FILEJPG &
+    sleep 0.02s
+    lppid=$!
+done
+echo " - $NUMJOBS jobs queued"
+wait $lppid
+
+for ((i=$TIMEOUT; i>0; i-=5 )); do
+        jobs=$(lpstat)
+    [ "x$jobs" = "x" ] && break
+    sleep 5
+done
+echo " - Print $FILEPDF with lpr and default printer"
+lpr $FILEPDF 
+echo " - Print $FILEJPG with lpr and $TPRN2"
+lpr -P $TPRN2 $FILEJPG 
+echo " - Print $FILEPDF with lpr and $TPRN1"
+lpr -P $TPRN1 -o number-up=2 -o job-sheets=standard,none $FILEPDF 
+for ((i=0; i < $NUMJOBS ; i++)); do
+    lpr -P $TPRN1 $FILEJPG &
+    sleep 0.02s
+    lpr -P $TPRN2 $FILEJPG &
+    sleep 0.02s
+    lprpid=$!
+done
+echo " - $NUMJOBS jobs queued"
+wait $lprpid 
+for ((i=$TIMEOUT; i>0 ; i-=5)); do
+    jobs=$(lpstat)
+    [ "x$jobs" = "x" ] && break
+    sleep 5
+done
+job_id=$(lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG | sed "s/^.*$TPRN1-\([[:digit:]]*\).*/\1/g")
+echo " - Cancel $TPRN1-$job_id job"
+cancel $TPRN1-$job_id 
+echo " - Hold job on $TPRN1"
+lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG 
+echo " - Hold job on $TPRN2"
+lp -d $TPRN2 -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel all jobs"
+cancel -a 
+echo " - Show printers status"
+lpc status 
+echo " - Show printer queue status"
+lpq 
+echo " - Show all status information"
+lpstat -t 
+echo " - Show list of available drivers"
+lpinfo -m 
+echo " - Show list of available devices"
+lpinfo -v 
+echo " - Hold test file"
+lpr -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel current job on default printer"
+lprm 
+echo " - Hold test file"
+lpr -P $TPRN1 -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel current job on $TPRN1"
+lprm $TPRN1 
+echo " - Modify $TPRN1"
+lpadmin -p $TPRN1 -v file:/tmp/$TPRN1 -o PageSize=A4 

debian/tests/utils/test-drivers

@@ -29,13 +29,23 @@ cleanup() {
     # Delete it
     echo -n " - Interrupted (or finished), delete test printer:"
     rm -f ${DUMMY_PRINTER_STDERR_FILE}
+    rm -f ${DUMMY_PRINTER_PRINT_FILE}
     /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null || :
     echo " done."
 }
 
 trap cleanup EXIT INT
 
+# Configure the running CUPS server to do debug2 logging
+sed -e 's/^.*LogLevel.*$/LogLevel debug2/g' -i /etc/cups/cupsd.conf
+# Configure the running CUPS server to set FileDevice to Yes
+sed -e 's/^.*FileDevice.*$/FileDevice Yes/g' -i /etc/cups/cups-files.conf
+# Configure the running CUPS server to allow root to do administrative tasks
+sed -e 's/^.*SystemGroup.*$/SystemGroup lpadmin root/g' -i /etc/cups/cups-files.conf
+service cups restart
+
 DUMMY_PRINTER_STDERR_FILE=`mktemp`
+DUMMY_PRINTER_PRINT_FILE=`mktemp`
 
 for driver in $DRIVERS_LIST; do
 
@@ -43,7 +53,7 @@ for driver in $DRIVERS_LIST; do
 
     echo -n " - Create test printer:"
     # Create dummy printer
-    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null 2> $DUMMY_PRINTER_STDERR_FILE
+    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file://${DUMMY_PRINTER_PRINT_FILE} 2> $DUMMY_PRINTER_STDERR_FILE
     echo " done."
     # Tell stderr whether some unknown lines have been seen
     # Filter out the deprecation messages
@@ -54,7 +64,7 @@ for driver in $DRIVERS_LIST; do
         1>&2
     
     for file in $(find $PDFS_PATH -name '*.pdf') ; do
-        echo -n " - Print test job with $file: "
+        echo -n " - Print $file: "
         # Print the default testprint to it, get request id
         rid=$(/usr/bin/lp -d $DUMMY_PRINTER_NAME $file | sed -e 's/^.*request id is \(.*\) (.*)$/\1/g')
     
@@ -74,6 +84,12 @@ for driver in $DRIVERS_LIST; do
             /bin/sleep 1s
             echo -n "."
         done
+        # Make sure the resulting data is not empty
+        if [ ! -s "${DUMMY_PRINTER_PRINT_FILE}" ]; then
+            echo " Filter succeeded but resulting file is empty; aborting!"
+            false
+        fi
+        rm -f ${DUMMY_PRINTER_PRINT_FILE}
         echo " done."
     done
 

debian/upstream/metadata

@@ -1,4 +1,4 @@
-Bug-Database: https://github.com/apple/cups/issues
+Bug-Database: https://github.com/OpenPrinting/cups/issues
-Bug-Submit: https://github.com/apple/cups/issues
+Bug-Submit: https://github.com/OpenPrinting/cups/issues
-Repository: https://github.com/apple/cups.git
+Repository: https://github.com/OpenPrinting/cups.git
-Repository-Browse: https://github.com/apple/cups
+Repository-Browse: https://github.com/OpenPrinting/cups

debian/upstream/signing-key.asc

@@ -1,52 +1,14 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBFo5hCYBEAD7WeR8qWUuD4Z3spmcjwIIcFsjF5V7MpqCZrGRcFiTH+MRiomQ
+mDMEYfKEjRYJKwYBBAHaRw8BAQdAJggn9NALyWqrgrFGPJ9RvPb7wYbskxKRKQcL
-Ylr652+9JlQjS9e/6Gtist6ydADvHqELmg42wQX7MrOCTDfKpM/mP2InMIDkel16
+v+8Hpbq0QVpkZW5layBEb2huYWwgKFRoZSBvbGQgNEQ0MjI3RDcga2V5IHJldm9r
-SZbtBORR44LOzsZ9Cm7739M4hZWp2PVn+ElWJr6t3l9NXVZDXaPWugHlxUYYGz7O
+ZWQpIDx6ZG9obmFsQHJlZGhhdC5jb20+iJQEExYKADwWIQRwgqClCi6SZA84gODk
-UxfYdkFQ3ND5ST60+Ir8P7YoSfCvxi2dus6/One7dhuTGdm/8+EtwrFPJWgbVxah
+Ui3MmyRv9wUCYfKEjQIbAwULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AACgkQ
-FQHD8TKht3poGm6+mqgDley6soo4vUlUnYRbrEe+oXRnTx4Yih3FsXNez7IHFtJv
+5FItzJskb/fbUQEAm6R78JoZSIOpu68gtUUp1qbfDdsfoQkbdyfws/myB6gA/A6/
-MzHPSLE+2KsWp1gylp4hgLc5NGUD67nRO8GDqkhLK+PgJERx1NozLXqBa4XaoC6F
+9QiIk50DNCmBTisZk5CFP51YNvwnyxafmE3cDn8GuDgEYfKEjRIKKwYBBAGXVQEF
-rq4i3C+JSsWqWUUs85tpZHwEnZmfYMV+cWcUkuHRwhls2PIVzm2b2BALXV8MY9yO
+AQEHQF6Qgj5UQqUdvqvnDqygQ6Vm59nRGHbPVDTwendtM5cCAwEIB4h4BBgWCgAg
-w8EBTrPo1ae1AplCZnLQX7gBdgBhX6ou+UKXqrAlaqiXlaxY2psajrmY+IqUXJL9
+FiEEcIKgpQoukmQPOIDg5FItzJskb/cFAmHyhI0CGwwACgkQ5FItzJskb/e2CwD/
-H9IPMmzHz+apfAvIc4WY2APUI9BDT11gh8ko3ZWVUNxlL1rUwbCBjtwKdmVLLNmr
+SyRi/I5Il5XY5VXEL/eBsnNvvtaO0T10V4/vBMiDb+sBAK3YmRl6WStfRiEvMXQv
-mU1JbKY9L1PAXElEbpyJ6KrXk49KrFE8lnhTE4g2rUZ0wdmzjbAL0oaBL5qdNupd
+OhMT+sEjx6ufQXkuPeXHvrgK
-MjW20Y+PyYgvIrXNPTk/mhx79rAMlUIhNRYQhyATywr9/ubimhkNgYbcfQARAQAB
+=vSEm
-tBxDVVBTLm9yZyA8c2VjdXJpdHlAY3Vwcy5vcmc+iQJUBBMBCgA+FiEERdCDlG4w
-NSgrPMqa9DQQQjXal+sFAlo5hCYCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQAC
-HgECF4AACgkQ9DQQQjXal+v1Fg//YlAD/woMIwumfTIBGdc7oye+JLRKTXOnIDxb
-VATpcSZOS6LMHy0x7k6kQ+G81r7NkfbQFHZRhvmf62qkg46JhPVJqWBqwVgrbQbk
-RRFbo38NkZ37WW2xhImt8iGC8XjfpbfraVYaZQuU7Jbn4vrAppOZbzgVI1T2FIh/
-+GXWbv4WV7hNaNvjREZl1UrzzCTpxrSBgoyx+1P6SwDHYWrC/gp4CMLEj6zf2Hwz
-KyIU+FmW54LIZafnswgNpoW1taZx7iSWfvqoyySomtL0PwhYWpKAyIZDf+6cffjx
-Fwp5UufEkLjyui0b/6DbCjyWiNHh8BT7niLZ54VXcO8IWr/kQH61s41xp0xU9/Pr
-N7Mn22Qd5SCFcDmbFvSI8m7Gn61G8mUfCL2zeAMUkNuzZgc+p2VhRCr+/9gk2eEg
-BOqxrrsKDa0g5mWLA0y8a5oohlXKM6SoyRcujCfQxO3rCD1+qM48Zm+4l/6NBg8w
-wRJNKoARnR2c9wGvHRbJY3kXllnd/3Fk/EzXwilFK4Fk0uIk8AtMSTh0Se1KNEum
-/AbUxRG50dq9pyrfYxsjhNmzu92NIR5sR5PyRQRbGDJkIlNEEbh87TBCrYqnKaPU
-lev+476zFE/raaum/DL0ANOUQCtX5ftWEK2Xo1s28DEo2DzyJWmYSmr/wnf8wrp7
-lNWA/F25Ag0EWjmEJgEQAPZvzo1nX/F4+9BGE9o0OSPZt/BLkusiyz6fd46k5vj7
-LGPFpjtMxUxbPNhMJi3QVBhtb8yiNugRmE0sWaA7b2COsXT8jaHZ2EBV0XnTr4Tv
-hSxNbdXu9fiDRFQ9x3D/LhDvDRgq0lKQw5cRBLCZw4as9Ytxn1WnS8evwhHRMMYL
-/lCyviyyj8zczXPmdWLVlMbhD02Yf5DpteSyhjMTvZFJWZiIUupnM1WXppDo4/Id
-nr2Sc5awhuFxdrSYFpaB5+hOdsjhDENcm+GY10iUNCqklCP5BZOeDprap7XwMElW
-/chdrwovPYn54Sugl9oHjUOfiJLi/e4J+ey86+2sWY0rZvmOViR1w4NldB+GbEQW
-/HOyTwo1Og36+7Ci9m2yothSC0wJAb5Bvg2tc1u4AsG2ylaxMFmwX226d2jJlFNl
-2crNFaIE/Uuo7YqH8pcm9kVZ+0apLHoxtZFnZF5QzLmcA83YFFWkqjEfmdLobWXX
-pZ+jPkHZDEhj21D+6LYCtUjDwnICySLoIawoMpkV+tdRyHuzxdYX1Nkh74mC2A7d
-koxMw86CgXP4UHJwCYunN+rUi7oC8oI1isqtMK8MZhcPdlvE721+fpdAdBIo8KVs
-RxQJ3vzhTuugZl5w3E8Jt7lC/q6CC6VI7V74fCNJjXiytrcpYg+FYCyfvxJ/4GH/
-ABEBAAGJAjwEGAEKACYWIQRF0IOUbjA1KCs8ypr0NBBCNdqX6wUCWjmEJgIbDAUJ
-B4YfgAAKCRD0NBBCNdqX65zoEACdIsOlto5FQtv2Yx/ayYklEsPgrx1IDnudvVUZ
-C+vsDoF9aOUBjUvpHjdBWOBnc/ThOw8ARvOcZLT06HNyzvkJNjj05N+hy1hiSY5B
-kL+TGCVkE/wUIDf69lt+KEG89EjpRDSTLDw8t05bEiaZ1XKfDmcIXbao38zhI2CD
-r+h1eQotY8bGA7hC7knwQv4VRnN8zBgZhQZdapjC8fBoaY00YZ4wBvd4Yz13/HGi
-gXssFNd35n+K+mnUaqulLIwjVfN1/luOubTpqCGVtSEVvHiq7XVRR6cSc345vFMa
-3AtRtHKQpZutEz08gZqrXXwALom+HWNbPqdHXEE/mZxvpEVMQr325KLKSPQGZSCq
-s8AFeYLYf66gn7T50VX5ws9sGANVvq1CHbouSbfc+UJkibeKG4/jSlqUwWNktEEJ
-hI+yGJP5xitfA4IGPaipfVHsxP1z37oht6BTj0zUlfEg9YoPmuHEAhxP7CGOatMM
-QkRQ7l0W3F05XL1HzynDnKkEigAUlwhq8Z5oO3Vf9b0MJg/V6T2+jzGIcy0PmliX
-rR6FQB5SMRaGCrJxSaPeadnSkJOpFM0dRqKDB049IAIbSxz5ZuqCpbB8tH17ezqu
-J3b3cDsSI2TOkacnMo01+IUcrgySKwl/4eUHd92FSq/m085HOQnlae4fjjJ/7qDd
-/yDo+w==
-=padA
 -----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -1,3 +1,3 @@
 version=4
 opts="uversionmangle=s/^(release|v)?\.//;s/(rc|b)/~$1/,pgpsigurlmangle=s/$/\.sig/" \
-  https://github.com/apple/cups/releases .*/cups-(release|v)?@ANY_VERSION@-source@ARCHIVE_EXT@
+  https://github.com/OpenPrinting/cups/releases .*/cups-(release|v)?@ANY_VERSION@-source@ARCHIVE_EXT@