Update tdelibs build-dep on libcups2-dev on Debian and Ubuntu

debian/lenny/tdelibs/debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libnm-util-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
@@ -81,7 +81,7 @@ Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
 Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,

debian/lenny/tdelibs/debian/control.in

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev,
@@ -78,7 +78,7 @@ Section: libdevel
 Architecture: any
 Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,

debian/squeeze/tdelibs/debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libnm-util-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
@@ -81,7 +81,7 @@ Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
 Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,

debian/squeeze/tdelibs/debian/control.in

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev,
@@ -78,7 +78,7 @@ Section: libdevel
 Architecture: any
 Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,

debian/wheezy/tdelibs/debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libnm-util-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
@@ -81,7 +81,7 @@ Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
 Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,

debian/wheezy/tdelibs/debian/control.in

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev,
@@ -78,7 +78,7 @@ Section: libdevel
 Architecture: any
 Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,

ubuntu/maverick/tdelibs/debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 14.0.0), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libnm-util-dev,
+ aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev, libnm-util-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
@@ -82,7 +82,7 @@ Replaces: kdelibs4-trinity-dev (<< 4:14.0.0)
 Breaks: kdelibs4-trinity-dev (<< 4:14.0.0)
 Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,

ubuntu/maverick/tdelibs/debian/control.in

@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext,
  libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev,
  liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libqt3-mt-dev (>= 3:3.3.7), libsasl2-dev, libssl-dev,
@@ -78,7 +78,7 @@ Section: libdevel
 Architecture: any
 Depends: tdelibs4c2a (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libarts1-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
- libaspell-dev, hspell, libbz2-dev, libcupsys2-dev,
+ libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
  libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
  libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,