From 784c7d3060e54fdc6fedf4a79e4289d68111f6b6 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 18 Feb 2025 22:53:52 -0600 Subject: [PATCH] Make the package completely Lintian-clean except for no-dep5-copyright. --- debian/changelog | 11 ++++++----- debian/control | 2 ++ debian/copyright | 2 +- debian/livecd-rootfs.lintian-overrides | 10 ++++++++++ debian/source/lintian-overrides | 5 +++++ live-build/auto/config | 2 +- live-build/lb_binary_layered | 2 +- .../hooks/05-prepare-image.binary | 0 live-build/ubuntu-server/hooks/04-kernel-bits.binary | 0 live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary | 0 .../ubuntu/hooks/040-hyperv-desktop-images.binary | 0 .../usr/lib/systemd/system/udisks2-inhibit.service | 1 + 12 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 debian/livecd-rootfs.lintian-overrides create mode 100644 debian/source/lintian-overrides mode change 100644 => 100755 live-build/ubuntu-core-installer/hooks/05-prepare-image.binary mode change 100644 => 100755 live-build/ubuntu-server/hooks/04-kernel-bits.binary mode change 100644 => 100755 live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary mode change 100644 => 100755 live-build/ubuntu/hooks/040-hyperv-desktop-images.binary diff --git a/debian/changelog b/debian/changelog index 6ac12397..632d210e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ livecd-rootfs (25.04.18) UNRELEASED; urgency=medium * Move from http://ppa.launchpad.net to https://ppa.launchpadcontent.net when specifying EXTRA_PPAS. * Update debhelper compat to 13, no changes needed. + * Make the package completely Lintian-clean except for no-dep5-copyright. -- Michael Hudson-Doyle Mon, 17 Feb 2025 11:12:00 +1300 @@ -569,7 +570,7 @@ livecd-rootfs (24.04.43) noble; urgency=medium grub updates in cloud images (LP: #2054103) -- Philip Roche Fri, 23 Feb 2024 13:54:57 +0000 - + livecd-rootfs (24.04.42) noble; urgency=medium [ Sean Davis ] @@ -695,8 +696,8 @@ livecd-rootfs (24.04.27) noble; urgency=medium livecd-rootfs (24.04.26) noble; urgency=medium [ Steve Langasek ] - * Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across - all flavors using new-style layered squashfs, removing need for + * Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across + all flavors using new-style layered squashfs, removing need for kernel commandline options in debian-cd. [ dann frazier ] @@ -828,7 +829,7 @@ livecd-rootfs (24.04.10) noble; urgency=medium * Set C.UTF-8 locale in /etc/default/locale for all images; originally intended to be landed in the cosmic cycle.. * Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd' - throughout, not 'ubuntustudio'. + throughout, not 'ubuntustudio'. -- Steve Langasek Fri, 08 Dec 2023 15:07:41 -0800 @@ -907,7 +908,7 @@ livecd-rootfs (24.04.2) noble; urgency=medium instead of /boot/vmlinuz. (LP: #2038957) -- Philip Roche Thu, 26 Oct 2023 17:56:00 +0100 - + livecd-rootfs (24.04.1) noble; urgency=medium [ Steve Langasek ] diff --git a/debian/control b/debian/control index 97763769..c6462b24 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Build-Depends: debhelper-compat (= 13) Maintainer: Ubuntu Developers Standards-Version: 3.9.6 Vcs-Git: https://git.launchpad.net/livecd-rootfs -b ubuntu/master +Vcs-Browser: https://git.launchpad.net/livecd-rootfs +Rules-Requires-Root: no Package: livecd-rootfs Architecture: any diff --git a/debian/copyright b/debian/copyright index 3d267162..a3eb8c2a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ 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 with -your Ubuntu system, in /usr/share/common-licenses/GPL, or with the +your Ubuntu system, in /usr/share/common-licenses/GPL-2, or with the livecd-rootfs source package as the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/debian/livecd-rootfs.lintian-overrides b/debian/livecd-rootfs.lintian-overrides new file mode 100644 index 00000000..f2a7611d --- /dev/null +++ b/debian/livecd-rootfs.lintian-overrides @@ -0,0 +1,10 @@ +# This is expected and okay +livecd-rootfs: service-file-is-not-a-file [usr/share/livecd-rootfs/*.service] +livecd-rootfs: uses-dpkg-database-directly [usr/share/livecd-rootfs/live-build/lb_chroot_layered] +livecd-rootfs: package-contains-no-arch-dependent-files + +# Developer documentation in an already-expected spot +livecd-rootfs: package-contains-documentation-outside-usr-share-doc [usr/share/livecd-rootfs/live-build/ubuntu-cpc/README.cpc.md] + +# This is going to occur quite a bit; we're making a livefs +livecd-rootfs: repeated-path-segment * [*] diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 00000000..416ec895 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,5 @@ +# This is expected and okay +livecd-rootfs source: absolute-symbolic-link-target-in-source * [live-build/*] + +# The description indicates that it's not required in debhelper >= 13, which we have +livecd-rootfs source: override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:*] diff --git a/live-build/auto/config b/live-build/auto/config index e7a267e9..5535b3e5 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash set -e case $ARCH:$SUBARCH in diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered index e64ecaee..5b945297 100755 --- a/live-build/lb_binary_layered +++ b/live-build/lb_binary_layered @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ## live-build(7) - System Build Scripts ## Copyright (C) 2006-2012 Daniel Baumann diff --git a/live-build/ubuntu-core-installer/hooks/05-prepare-image.binary b/live-build/ubuntu-core-installer/hooks/05-prepare-image.binary old mode 100644 new mode 100755 diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary old mode 100644 new mode 100755 diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary old mode 100644 new mode 100755 diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary old mode 100644 new mode 100755 diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service index 6a699487..f8261a65 100644 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service +++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service @@ -1,5 +1,6 @@ [Unit] Description=inhibit disk automounting +Documentation=man:udevadm Before=udisks2.service [Service]