Refresh d/control thanks to `cme fix dpkg-control`

1 files changed, 168 insertions, 154 deletions

diff --git a/debian/control b/debian/control
index 2134e56b0..44515885a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,58 +1,56 @@
 Source: cups
-Standards-Version: 4.2.1
-Priority: optional
-Section: net
 Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
-Uploaders:
- Didier Raboud <odyx@debian.org>,
- Till Kamppeter <till.kamppeter@gmail.com>,
-Build-Depends:
- debhelper (>= 10.2.5~),
- dh-apparmor,
- dh-exec,
- dpkg-dev (>= 1.16.1~),
- patch,
- autoconf,
- automake,
- libtool,
- pkg-config,
- ghostscript (>= 9.02~),
- libavahi-client-dev,
- libavahi-common-dev,
- libavahi-compat-libdnssd-dev,
- libdbus-1-dev (>= 1.0.2),
- 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,
- libusb-1.0-0-dev [!hurd-any],
- po4a (>= 0.31~),
- po-debconf,
- poppler-utils,
- sharutils,
- zlib1g-dev,
+Uploaders: Didier Raboud <odyx@debian.org>,
+           Till Kamppeter <till.kamppeter@gmail.com>
+Section: net
+Priority: optional
+Build-Depends: debhelper (>= 10.2.5~),
+               dh-apparmor,
+               dh-exec,
+               dpkg-dev,
+               patch,
+               autoconf,
+               automake,
+               libtool,
+               pkg-config,
+               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,
+               libusb-1.0-0-dev [!hurd-any],
+               po4a,
+               po-debconf,
+               poppler-utils,
+               sharutils,
+               zlib1g-dev
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
 Build-Conflicts: libgmp-dev (<< 2:6)
-Homepage: https://www.cups.org/
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
+Homepage: https://www.cups.org/
 
 Package: libcups2
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Suggests: cups-common
-Breaks: cups (<< 1.5.0)
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 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
@@ -62,13 +60,14 @@ Description: Common UNIX Printing System(tm) - Core library
  This package provides the base shared libraries for CUPS.
 
 Package: libcupsimage2
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libcups2 (= ${binary:Version}),
-Recommends: libcupsfilters1 (>= 1.0~b1),
-Pre-Depends: ${misc:Pre-Depends}
 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
@@ -80,37 +79,36 @@ Description: Common UNIX Printing System(tm) - Raster image library
 
 Package: cups
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
- ${misc:Depends},
- libc-bin (>= 2.13),
- cups-core-drivers (>= ${binary:Version}),
- cups-daemon (>= ${binary:Version}),
- debconf (>= 1.2.9) | debconf-2.0,
- poppler-utils (>= 0.12),
- procps,
- ghostscript (>= 9.02~),
- cups-common (>= ${source:Version}),
- cups-server-common (>= ${source:Version}),
- cups-client (>= ${binary:Version}),
- libcups2 (= ${binary:Version}),
- cups-ppdc,
- cups-filters (>= 1.0.24-3~)
+         ${misc:Depends},
+         cups-core-drivers (>= ${binary:Version}),
+         cups-daemon (>= ${binary:Version}),
+         debconf | debconf-2.0,
+         poppler-utils,
+         procps,
+         ghostscript,
+         cups-common (>= ${source:Version}),
+         cups-server-common (>= ${source:Version}),
+         cups-client (>= ${binary:Version}),
+         libcups2 (= ${binary:Version}),
+         cups-ppdc,
+         cups-filters (>= 1.0.24-3~)
 Recommends: avahi-daemon,
- colord,
- cups-filters (>= 1.0.42) | foomatic-filters (>= 4.0),
- printer-driver-gutenprint,
- cups-filters (>= 1.0.36) | ghostscript-cups (>= 9.02~)
+            colord,
+            cups-filters (>= 1.0.42) | foomatic-filters,
+            printer-driver-gutenprint,
+            cups-filters (>= 1.0.36) | ghostscript-cups
 Suggests: cups-bsd,
- foomatic-db-compressed-ppds | foomatic-db,
- printer-driver-hpcups,
- hplip,
- cups-pdf,
- udev,
- smbclient
-Replaces: ghostscript-cups (<< 9.02~), cups-bsd (<< 1.7.2-3~)
-Breaks: foomatic-filters (<< 4.0), ghostscript-cups (<< 9.02~), cups-bsd (<< 1.7.2-3~)
-Multi-Arch: foreign
+          foomatic-db-compressed-ppds | foomatic-db,
+          printer-driver-hpcups,
+          hplip,
+          cups-pdf,
+          udev,
+          smbclient
+Pre-Depends: ${misc:Pre-Depends}
+Breaks: cups-bsd (<< 1.7.2-3~)
+Replaces: cups-bsd (<< 1.7.2-3~)
 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
@@ -122,18 +120,18 @@ Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
 
 Package: cups-core-drivers
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
- ${misc:Depends},
- cups-daemon (>= ${binary:Version}),
- libcups2 (= ${binary:Version}),
- cups-filters-core-drivers (>= 1.0.24-3~)
+         ${misc:Depends},
+         cups-daemon (>= ${binary:Version}),
+         libcups2 (= ${binary:Version}),
+         cups-filters-core-drivers
 Recommends: avahi-daemon
-Replaces: cups (<< 1.7.1-4~),
- cups-server-common (<< 2.1.0-7~)
+Pre-Depends: ${misc:Pre-Depends}
 Breaks: cups (<< 1.7.1-4~),
- cups-server-common (<< 2.1.0-7~)
-Multi-Arch: foreign
+        cups-server-common (<< 2.1.0-7~)
+Replaces: cups (<< 1.7.1-4~),
+          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
@@ -145,37 +143,37 @@ Description: Common UNIX Printing System(tm) - driverless printing
 
 Package: cups-daemon
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.7.2)
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
- ${misc:Depends},
- procps,
- lsb-base (>= 3.2-14~),
- libcups2 (= ${binary:Version}),
- ssl-cert (>= 1.0.11),
- adduser,
- bc
+         ${misc:Depends},
+         procps,
+         lsb-base,
+         libcups2 (= ${binary:Version}),
+         ssl-cert,
+         adduser,
+         bc
 Recommends: colord,
- cups-browsed,
- avahi-daemon (>= 0.6.31-3~)
-Suggests: cups, cups-bsd,
- cups-common (>= ${source:Version}),
- cups-server-common (>= ${source:Version}),
- cups-client (>= ${binary:Version}),
- cups-ppdc,
- cups-filters,
- poppler-utils (>= 0.12),
- ghostscript (>= 9.02~),
- cups-filters (>= 1.0.42) | foomatic-filters (>= 4.0),
- foomatic-db-compressed-ppds | foomatic-db,
- printer-driver-gutenprint,
- printer-driver-hpcups,
- hplip,
- cups-pdf,
- udev,
- smbclient
-Replaces: cups (<< 2.1.0-6~)
+            cups-browsed,
+            avahi-daemon (>= 0.6.31-3~)
+Suggests: cups,
+          cups-bsd,
+          cups-common (>= ${source:Version}),
+          cups-server-common (>= ${source:Version}),
+          cups-client (>= ${binary:Version}),
+          cups-ppdc,
+          cups-filters,
+          poppler-utils,
+          ghostscript,
+          cups-filters (>= 1.0.42) | foomatic-filters,
+          foomatic-db-compressed-ppds | foomatic-db,
+          printer-driver-gutenprint,
+          printer-driver-hpcups,
+          hplip,
+          cups-pdf,
+          udev,
+          smbclient
 Breaks: cups (<< 2.1.0-6~)
-Multi-Arch: foreign
+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
@@ -186,15 +184,18 @@ Description: Common UNIX Printing System(tm) - daemon
 
 Package: cups-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- cups-common (>= ${source:Version}),
- libcups2 (= ${binary:Version}),
- adduser
-Suggests: cups, cups-bsd, smbclient
-Replaces: cups (<< 1.7.3-5~)
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         cups-common (>= ${source:Version}),
+         libcups2 (= ${binary:Version}),
+         adduser
+Suggests: cups,
+          cups-bsd,
+          smbclient
 Breaks: cups (<< 1.7.3-5~)
 Conflicts: lprng
-Multi-Arch: foreign
+Replaces: cups (<< 1.7.3-5~)
 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
@@ -205,11 +206,14 @@ Description: Common UNIX Printing System(tm) - client programs (SysV)
 
 Package: cups-ipp-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libcups2 (= ${binary:Version})
-Replaces: cups (<< 1.7.3-5~), cups-client (<< 2.0.3-2~)
-Breaks: cups (<< 1.7.3-5~), cups-client (<< 2.0.3-2~)
 Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libcups2 (= ${binary:Version})
+Breaks: cups (<< 1.7.3-5~),
+        cups-client (<< 2.0.3-2~)
+Replaces: cups (<< 1.7.3-5~),
+          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
@@ -219,13 +223,14 @@ Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
  This package provides IPP utilities for developers and system administrators
 
 Package: libcups2-dev
-Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libcupsimage2-dev (= ${binary:Version}),
- libcups2 (= ${binary:Version}),
- dpkg-dev,
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libcupsimage2-dev (= ${binary:Version}),
+         libcups2 (= ${binary:Version}),
+         dpkg-dev
 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
@@ -238,17 +243,18 @@ Description: Common UNIX Printing System(tm) - Development files CUPS library
  PHP).
 
 Package: libcupsimage2-dev
-Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libcupsimage2 (= ${binary:Version}),
- libcups2-dev (= ${binary:Version}),
- libpng-dev,
- libtiff-dev,
- libjpeg-dev,
- zlib1g-dev
-Recommends: libcupsfilters-dev (>= 1.0~b1),
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libcupsimage2 (= ${binary:Version}),
+         libcups2-dev (= ${binary:Version}),
+         libpng-dev,
+         libtiff-dev,
+         libjpeg-dev,
+         zlib1g-dev
+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
@@ -260,17 +266,19 @@ Description: Common UNIX Printing System(tm) - Development files CUPS image libr
 
 Package: cups-bsd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- cups-client (= ${binary:Version}),
- debconf | debconf-2.0,
- cups-common (>= ${source:Version})
+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
-Replaces: lpr
+          inetutils-inetd | inet-superserver,
+          update-inetd
+Conflicts: lpr,
+           lprng
 Provides: lpr
-Multi-Arch: foreign
+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
@@ -283,8 +291,9 @@ Description: Common UNIX Printing System(tm) - BSD commands
 
 Package: cups-common
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
 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
@@ -295,10 +304,13 @@ Description: Common UNIX Printing System(tm) - common files
 
 Package: cups-server-common
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: cups (<< 1.6.2-2~), cups-common (<< 1.7.0)
-Breaks: cups (<< 1.6.2-2~), cups-common (<< 1.7.0)
 Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Breaks: cups (<< 1.6.2-2~),
+        cups-common (<< 1.7.0)
+Replaces: cups (<< 1.6.2-2~),
+          cups-common (<< 1.7.0)
 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
@@ -308,10 +320,12 @@ Description: Common UNIX Printing System(tm) - server common files
  This package provides common files for CUPS server.
 
 Package: cups-ppdc
-Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cups-common (>= ${source:Version})
 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