diff options
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/copyright | 8 | ||||
| -rwxr-xr-x | debian/open-infrastructure-system-boot.postinst | 7 | ||||
| -rwxr-xr-x | debian/open-infrastructure-system-boot.postrm | 7 | ||||
| -rwxr-xr-x | debian/rules | 11 |
6 files changed, 43 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index bbab31c..3d1477c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +open-infrastructure-system-tools (20190301-lts1-3) sid; urgency=medium + + * Uploading to sid. + * Adding changelog entries for 20190301-lts1-2.1. + * Updating to debhelper version 13. + * Updating to standards version 4.6.2. + * Replacing which with command in maintainer scripts. + * Updating packaging copyright for 2023. + * Using https where approriate in copyright file. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 30 Jan 2023 17:44:04 +0100 + +open-infrastructure-system-tools (20190301-lts1-2.1) sid; urgency=medium + + * Non-maintainer upload. + * No source change upload to rebuild with debhelper 13.10. + + -- Michael Biebl <biebl@debian.org> Sat, 15 Oct 2022 12:33:37 +0200 + open-infrastructure-system-tools (20190301-lts1-2) sid; urgency=medium * Uploading to sid. diff --git a/debian/control b/debian/control index bfc1430..9c785ef 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,13 @@ Priority: optional Maintainer: Daniel Baumann <daniel.baumann@progress-linux.org> Build-Depends: asciidoc, - debhelper-compat (= 12), + debhelper-compat (= 13), docbook-xml, docbook-xsl, libxml2-utils, xsltproc, Rules-Requires-Root: no -Standards-Version: 4.5.0 +Standards-Version: 4.7.0 Homepage: https://open-infrastructure.net/software/system-tools Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-system-tools Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-system-tools @@ -61,8 +61,10 @@ Suggests: gpgv, Conflicts: live-build, + open-infrastructure-system-images, Replaces: live-build, + open-infrastructure-system-images, Provides: system-build, Description: Build Debian-based system images @@ -100,15 +102,3 @@ Provides: Description: Configure Debian-based system images system-config provides the system integration for configuring a read-only root filesystem such as a live system. - -Package: open-infrastructure-system-images -Section: admin -Architecture: all -Depends: - open-infrastructure-system-build (>= 20161115), - ${misc:Depends}, -Provides: - system-images, -Description: Debian-based system images - system-images contains the configuration directories for system-build to - build live system images. diff --git a/debian/copyright b/debian/copyright index 43cf504..27322b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,12 +4,12 @@ Upstream-Contact: Open Infrastructure <software@lists.open-infrastructure.net> Source: https://get.open-infrastructure.net/software/system-tools Files: * -Copyright: 2006-2020 Daniel Baumann <mail@daniel-baumann.ch> +Copyright: 2006-2024 Daniel Baumann <mail@daniel-baumann.ch> License: GPL-3+ Files: system-boot/* -Copyright: 2006-2020 Daniel Baumann <mail@daniel-baumann.ch> - 2005-2008 Canonical Ltd. <http://www.cannonical.com/> +Copyright: 2006-2024 Daniel Baumann <mail@daniel-baumann.ch> + 2005-2008 Canonical Ltd. 2008 Chris Lamb <chris@debian.org> 2006-2007 Marco Amadori <marco.amadori@gmail.com> License: GPL-3+ @@ -26,7 +26,7 @@ License: GPL-3+ 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, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file. diff --git a/debian/open-infrastructure-system-boot.postinst b/debian/open-infrastructure-system-boot.postinst index 35b9e86..3ff8751 100755 --- a/debian/open-infrastructure-system-boot.postinst +++ b/debian/open-infrastructure-system-boot.postinst @@ -6,9 +6,12 @@ case "${1}" in configure) mkdir -p /etc/live/boot - if [ -x "$(which update-initramfs 2>/dev/null)" ] && [ -e /etc/initramfs-tools/initramfs.conf ] + if command -v update-initramfs > /dev/null 2>&1 then - update-initramfs -u + if [ -e /etc/initramfs-tools/initramfs.conf ] + then + update-initramfs -u + fi fi ;; diff --git a/debian/open-infrastructure-system-boot.postrm b/debian/open-infrastructure-system-boot.postrm index 5c7cdf7..a8b2d76 100755 --- a/debian/open-infrastructure-system-boot.postrm +++ b/debian/open-infrastructure-system-boot.postrm @@ -7,9 +7,12 @@ case "${1}" in rmdir --ignore-fail-on-non-empty /etc/live/boot > /dev/null 2>&1 || true rmdir --ignore-fail-on-non-empty /etc/live > /dev/null 2>&1 || true - if [ -x "$(which update-initramfs 2>/dev/null)" ] && [ -e /etc/initramfs-tools/initramfs.conf ] + if command -v update-initramfs > /dev/null 2>&1 then - update-initramfs -u + if [ -e /etc/initramfs-tools/initramfs.conf ] + then + update-initramfs -u + fi fi ;; diff --git a/debian/rules b/debian/rules index 40bb80f..f54b4e3 100755 --- a/debian/rules +++ b/debian/rules @@ -33,9 +33,10 @@ override_dh_auto_install: rm -rf debian/*/usr/share/doc/live-build - rm -f debian/open-infrastructure-system-images/usr/share/doc/system-images/CHANGELOG.txt - rm -f debian/open-infrastructure-system-images/usr/share/doc/system-images/LICENSE.txt - mv debian/open-infrastructure-system-images/usr/share/doc/system-images debian/open-infrastructure-system-images/usr/share/doc/open-infrastructure-system-images + # moving system-images into system-build + mv debian/open-infrastructure-system-images/usr/share/system-images debian/open-infrastructure-system-build/usr/share + mkdir -p debian/open-infrastructure-system-build/usr/share/man/man7 + mv debian/open-infrastructure-system-images/usr/share/man/man7/* debian/open-infrastructure-system-build/usr/share/man/man7 override_dh_compress: dh_compress -Xusr/share/doc/open-infrastructure-system-config/examples -Xusr/share/system-images @@ -67,6 +68,6 @@ override_dh_link: for DIRECTORY in debian/*/usr/share/system-images/*; \ do \ IMAGE="$$(basename $${DIRECTORY})"; \ - rm -rf debian/open-infrastructure-system-images/usr/share/system-images/$${IMAGE}/config/bootloaders; \ - cp -a system-images/share/images/$${IMAGE}/config/bootloaders debian/open-infrastructure-system-images/usr/share/system-images/$${IMAGE}/config/bootloaders; \ + rm -rf debian/open-infrastructure-system-build/usr/share/system-images/$${IMAGE}/config/bootloaders; \ + cp -a system-images/share/images/$${IMAGE}/config/bootloaders debian/open-infrastructure-system-build/usr/share/system-images/$${IMAGE}/config/bootloaders; \ done |