From: Didier Raboud Date: Sun, 19 Feb 2012 15:31:56 +0000 (+0100) Subject: Upgrade to support LSB 4.1. X-Git-Tag: archive/raspbian/10.2018112800+rpi1^2~159^2~14 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0b0dcd7c5755173e578f120c2ec7ed0552c119bd;p=lsb.git Upgrade to support LSB 4.1. LSB changes: - Bump Depends: - on libglib2.0-0 to >= 2.12.13; - on fontconfig to >= 2.6.0; - on libglib2.0-0 to >= 2.12.13; - on libatk1.0-0 to >= 1.10.3; - on libpango1.0-0 to >= 1.10.4; - on libgtk2.0-0 to >= 2.10.14; - Add Depends: - on libglu1; - on libcairo2 to >= 1.2.0; - on libxtst6; - on ghostscript-cups; - In lsb, bump lsb-printing from Suggests to Depends. - Add the lsb-security package. - Drop the now-obsolete lsb-qt4 package. Debian changes: - libgl1-mesa-glx is the first alternative for libgl1; - Make sure all packages have ${misc:Depends}. Closes: #586191 LP: #385606 LP: #386128 Signed-off-by: Didier Raboud --- diff --git a/debian/control b/debian/control index 9da6ea3..200094b 100644 --- a/debian/control +++ b/debian/control @@ -52,12 +52,12 @@ Depends: lsb-release, lsb-base, time Provides: lsb-core-noarch, ${provides} -Description: Linux Standard Base 3.2 core support package +Description: Linux Standard Base 4.1 core support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of the core of version 3.2 of + This package provides an implementation of the core of version 4.1 of the Linux Standard Base for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this package may @@ -72,16 +72,17 @@ Description: Linux Standard Base 3.2 core support package Package: lsb-graphics Architecture: any Depends: lsb-core, - xlibmesa3-gl | libgl1, + libgl1-mesa-glx | libgl1, + libglu1-mesa | libglu1, libx11-6 | xlibs, ${misc:Depends} Provides: lsb-graphics-noarch, ${provides} -Description: Linux Standard Base 3.2 graphics support package +Description: Linux Standard Base 4.1 graphics support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base graphics specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -100,12 +101,12 @@ Depends: lsb-core, ${misc:Depends} Provides: lsb-cxx-noarch, ${provides} -Description: Linux Standard Base 3.2 C++ support package +Description: Linux Standard Base 4.1 C++ support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base C++ (CXX) specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -120,14 +121,15 @@ Description: Linux Standard Base 3.2 C++ support package Package: lsb-desktop Architecture: any Depends: lsb-graphics, - fontconfig (>= 2.3.0), - libfontconfig1 (>= 2.3.0), + fontconfig (>= 2.6.0), + libfontconfig1 (>= 2.6.0), libpng12-0, libjpeg62, - libglib2.0-0 (>= 2.6.2), - libatk1.0-0 (>= 1.9.0), - libpango1.0-0 (>= 1.8.0), - libgtk2.0-0 (>= 2.6.2), + libglib2.0-0 (>= 2.12.13), + libatk1.0-0 (>= 1.10.3), + libpango1.0-0 (>= 1.10.4), + libgtk2.0-0 (>= 2.10.14), + libcairo2 (>= 1.2.0), libqt3-mt (>= 3.3.6), libqtcore4, libqtgui4, @@ -140,18 +142,19 @@ Depends: lsb-graphics, libxml2, libfreetype6, libxrender1, + libxtst6, libxft2, xdg-utils, libnss3-1d, ${misc:Depends} # libqt4-sql-sqlite is Not strictly needed by LSB, but the tests want a valid database handler Provides: lsb-desktop-noarch, lsb-qt4, lsb-qt4-noarch, ${provides} -Description: Linux Standard Base 3.2 Desktop support package +Description: Linux Standard Base 4.1 Desktop support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base Desktop specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -163,47 +166,20 @@ Description: Linux Standard Base 3.2 Desktop support package Standard Base, and should not be construed as a statement that Debian is LSB-compliant. -Package: lsb-qt4 -Architecture: any -Depends: lsb-desktop (>= 3.2), - ${misc:Depends} -Provides: lsb-qt4-noarch, - ${provides} -Description: Linux Standard Base 3.2 Qt4 support package - The Linux Standard Base (http://www.linuxbase.org/) is a standard - core system that third-party applications written for Linux can - depend upon. - . - This package provides an implementation of version 3.2 of the Linux - Standard Base Qt4 specification for Debian on the Intel x86, Intel - ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the - Linux kernel. Future revisions of the specification and this package - may support the LSB on additional architectures and kernels. - . - The intent of this package is to provide a best current practice way - of installing and running LSB packages on Debian GNU/Linux. Its - presence does not imply that Debian fully complies - with the Linux Standard Base, and should not be construed as a - statement that Debian is LSB-compliant. - . - The lsb-qt4 module appears to be deprecated upstream; this package is - provided for compatibility with LSB 3.1 and may be dropped in - subsequent releases. - Package: lsb-languages Architecture: any -Depends: lsb-core (>= 3.2), +Depends: lsb-core (>= 4.1~), python (>= 2.4), perl (>= 5.8.8), perl (<< 6), ${misc:Depends} Provides: lsb-languages-noarch, ${provides} -Description: Linux Standard Base 3.2 Runtime Languages package +Description: Linux Standard Base 4.1 Runtime Languages package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base Languages specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -217,17 +193,17 @@ Description: Linux Standard Base 3.2 Runtime Languages package Package: lsb-multimedia Architecture: any -Depends: lsb-core (>= 3.2), +Depends: lsb-core (>= 4.1~), libasound2, ${misc:Depends} Provides: lsb-multimedia-noarch, ${provides} -Description: Linux Standard Base 3.2 Multimedia package +Description: Linux Standard Base 4.1 Multimedia package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base Multimedia specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -241,19 +217,20 @@ Description: Linux Standard Base 3.2 Multimedia package Package: lsb-printing Architecture: any -Depends: lsb-core (>= 3.2), +Depends: lsb-core (>= 4.1~), libcups2, libcupsimage2, foomatic-filters, ghostscript, + ghostscript-cups, ${misc:Depends} Provides: lsb-printing-noarch, ${provides} -Description: Linux Standard Base 3.2 Printing package +Description: Linux Standard Base 4.1 Printing package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.2 of the Linux + This package provides an implementation of version 4.1 of the Linux Standard Base Printing specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -265,22 +242,47 @@ Description: Linux Standard Base 3.2 Printing package with the Linux Standard Base, and should not be construed as a statement that Debian is LSB-compliant. +Package: lsb-security +Architecture: any +Depends: lsb-core (>= 4.1~), + libnss3-1d, + libnspr4-0d, + ${misc:Depends} +Provides: lsb-security-noarch, + ${provides} +Description: Linux Standard Base 4.1 Security package + The Linux Standard Base (http://www.linuxbase.org/) is a standard + core system that third-party applications written for Linux can + depend upon. + . + This package provides an implementation of version 4.1 of the Linux + Standard Base Security specification for Debian on the Intel x86, + Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with + the Linux kernel. Future revisions of the specification and this + package may support the LSB on additional architectures and kernels. + . + The intent of this package is to provide a best current practice way + of installing and running LSB packages on Debian GNU/Linux. Its + presence does not imply that Debian fully complies + with the Linux Standard Base, and should not be construed as a + statement that Debian is LSB-compliant. + Package: lsb Architecture: all Depends: lsb-core, lsb-graphics, lsb-cxx, lsb-desktop, + lsb-printing, ${misc:Depends} -Suggests: lsb-printing, - lsb-multimedia, +Suggests: lsb-multimedia, lsb-languages -Description: Linux Standard Base 3.2 support package +Description: Linux Standard Base 4.1 support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of all modules of version 3.2 + This package provides an implementation of all modules of version 4.1 of the Linux Standard Base for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this package may @@ -297,7 +299,7 @@ Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} Priority: required -Description: Linux Standard Base 3.2 init script functionality +Description: Linux Standard Base 4.1 init script functionality The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. @@ -329,6 +331,7 @@ Description: Linux Standard Base version reporting utility Package: lsb-invalid-mta Architecture: all +Depends: ${misc:Depends} Suggests: lsb Provides: mail-transport-agent Conflicts: mail-transport-agent diff --git a/debian/lsb-invalid-mta.lintian-overrides b/debian/lsb-invalid-mta.lintian-overrides new file mode 100644 index 0000000..bd1b7cd --- /dev/null +++ b/debian/lsb-invalid-mta.lintian-overrides @@ -0,0 +1,2 @@ +# Dummy sendmail needs no manpage +binary-without-manpage usr/sbin/sendmail diff --git a/debian/lsb-qt4.lintian-overrides b/debian/lsb-qt4.lintian-overrides deleted file mode 100644 index 2e9065b..0000000 --- a/debian/lsb-qt4.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# LSB packages are empty on purpose -empty-binary-package diff --git a/debian/lsb-security.lintian-overrides b/debian/lsb-security.lintian-overrides new file mode 100644 index 0000000..2e9065b --- /dev/null +++ b/debian/lsb-security.lintian-overrides @@ -0,0 +1,2 @@ +# LSB packages are empty on purpose +empty-binary-package diff --git a/debian/rules b/debian/rules index d923da5..a465fc4 100755 --- a/debian/rules +++ b/debian/rules @@ -65,6 +65,7 @@ override_dh_gencontrol: @echo >> debian/lsb-multimedia.substvars "provides=lsb-multimedia-${lsbarch}" @echo >> debian/lsb-languages.substvars "provides=lsb-languages-${lsbarch}" @echo >> debian/lsb-printing.substvars "provides=lsb-printing-${lsbarch}" + @echo >> debian/lsb-security.substvars "provides=lsb-security-${lsbarch}" @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6-i386, lib32z1" || true @[ ${DEB_HOST_ARCH} = 'kfreebsd-amd64' ] && echo >> debian/lsb-core.substvars "depends=libc0.1-i386, lib32z1" || true dh_gencontrol diff --git a/lsb_release.py b/lsb_release.py index a274cf7..142f902 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -56,7 +56,7 @@ def lookup_codename(release, unknown=None): return RELEASE_CODENAME_LOOKUP.get(shortrelease, unknown) # LSB compliance packages... may grow eventually -PACKAGES = 'lsb-core lsb-cxx lsb-graphics lsb-desktop lsb-qt4 lsb-languages lsb-multimedia lsb-printing' +PACKAGES = 'lsb-core lsb-cxx lsb-graphics lsb-desktop lsb-languages lsb-multimedia lsb-printing lsb-security' modnamere = re.compile(r'lsb-(?P[a-z0-9]+)-(?P[^ ]+)(?: \(= (?P[0-9.]+)\))?') @@ -81,6 +81,33 @@ def valid_lsb_versions(version, module): return ['3.0', '3.1', '3.2'] else: return ['2.0', '3.0', '3.1', '3.2'] + elif version == '4.0': + if module == 'desktop': + return ['3.1', '3.2', '4.0'] + elif module == 'qt4': + return ['3.1'] + elif module in ('printing', 'languages', 'multimedia'): + return ['3.2', '4.0'] + elif module == 'security': + return ['4.0'] + elif module == 'cxx': + return ['3.0', '3.1', '3.2', '4.0'] + else: + return ['2.0', '3.0', '3.1', '3.2', '4.0'] + elif version == '4.1': + if module == 'desktop': + return ['3.1', '3.2', '4.0', '4.1'] + elif module == 'qt4': + return ['3.1'] + elif module in ('printing', 'languages', 'multimedia'): + return ['3.2', '4.0', '4.1'] + elif module == 'security': + return ['4.0', '4.1'] + elif module == 'cxx': + return ['3.0', '3.1', '3.2', '4.0', '4.1'] + else: + return ['2.0', '3.0', '3.1', '3.2', '4.0', '4.1'] + return [version]