From e2da492814405b0830fb4eaf951776380a260e4f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 5 Jun 2024 06:46:50 +0200 Subject: Adding debian version 20221223-6. Signed-off-by: Daniel Baumann --- debian/changelog | 12 ++++++++++++ debian/control | 21 +-------------------- debian/copyright | 2 +- debian/patches/series | 1 + debian/patches/upstream/0003-usr-move.patch | 14 ++++++++++++++ 5 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 debian/patches/upstream/0003-usr-move.patch diff --git a/debian/changelog b/debian/changelog index 745b02d..93e5774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +open-infrastructure-compute-tools (20221223-6) sid; urgency=medium + + * Uploading to sid. + * Removing pre-bookworm transitional package. + * Minimizing debhelper build-depends for trixie. + * Updating copyright for 2024. + * Updating to standards-version 4.7.0. + * Adding patch to install systemd unit files in /usr, thanks to Helmut + Grohne (Closes: #1063455). + + -- Daniel Baumann Wed, 05 Jun 2024 06:26:28 +0200 + open-infrastructure-compute-tools (20221223-5) experimental; urgency=medium * Uploading to experimental. diff --git a/debian/control b/debian/control index 9571879..748db06 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,10 @@ Section: admin Priority: optional Maintainer: Daniel Baumann Build-Depends: - debhelper (>= 13.1~), debhelper-compat (= 13), python3-docutils, Rules-Requires-Root: no -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://open-infrastructure.net/software/compute-tools Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-compute-tools Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-compute-tools @@ -31,10 +30,6 @@ Suggests: irker, plzip, python3-nwdiag | python-nwdiag, -Breaks: - open-infrastructure-container-tools (<< 20221223-2~), -Replaces: - open-infrastructure-container-tools, Enhances: systemd-container, Description: manage systemd-nspawn containers @@ -44,17 +39,3 @@ Description: manage systemd-nspawn containers . compute-tools provides the system integration for managing containers using systemd-nspawn. - -Package: open-infrastructure-container-tools -Section: oldlibs -Priority: extra -Architecture: all -Depends: - open-infrastructure-compute-tools, - ${misc:Depends}, -Description: manage systemd-nspawn containers (transitional package) - Package to ease upgrading from older open-infrastructure-container-tools package - to the new open-infrastructure-compute-tools package. - . - This package can be purged at anytime once the open-infrastructure-compute-tools - package has been installed. diff --git a/debian/copyright b/debian/copyright index f2de5e3..dc8d68e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Open Infrastructure Source: https://get.open-infrastructure.net/software/compute-tools Files: * -Copyright: 2014-2022 Daniel Baumann +Copyright: 2014-2024 Daniel Baumann 2016 Simon Spoehel License: GPL-3+ diff --git a/debian/patches/series b/debian/patches/series index e76f4e8..2bee32d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ upstream/0001-host-variable.patch upstream/0002-versioned-sort.patch +upstream/0003-usr-move.patch diff --git a/debian/patches/upstream/0003-usr-move.patch b/debian/patches/upstream/0003-usr-move.patch new file mode 100644 index 0000000..6278efe --- /dev/null +++ b/debian/patches/upstream/0003-usr-move.patch @@ -0,0 +1,14 @@ +diff -Naurp open-infrastructure-compute-tools.orig/Makefile open-infrastructure-compute-tools/Makefile +--- open-infrastructure-compute-tools.orig/Makefile ++++ open-infrastructure-compute-tools/Makefile +@@ -142,8 +142,8 @@ install: build + ln -sf stop $(DESTDIR)/usr/libexec/$(PROGRAM)/t + ln -sf update $(DESTDIR)/usr/libexec/$(PROGRAM)/u + +- mkdir -p $(DESTDIR)/lib/systemd/system +- cp -r share/systemd/* $(DESTDIR)/lib/systemd/system ++ mkdir -p $(DESTDIR)/usr/lib/systemd/system ++ cp -r share/systemd/* $(DESTDIR)/usr/lib/systemd/system + + mkdir -p $(DESTDIR)/var/log/$(SOFTWARE) + -- cgit v1.2.3