diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rw-r--r-- | debian/control | 21 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/upstream/0001-host-variable.patch | 42 | ||||
| -rw-r--r-- | debian/patches/upstream/0002-versioned-sort.patch | 12 |
6 files changed, 22 insertions, 77 deletions
diff --git a/debian/changelog b/debian/changelog index 745b02d..b6d92e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +open-infrastructure-compute-tools (20240829-1) sid; urgency=medium + + * Uploading to sid. + * Merging upstream version 20240829. + * Removing patches, included upstream. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 29 Aug 2024 18:22:33 +0200 + +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 <helmut@subdivi.de> (Closes: #1063455). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> 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 <daniel.baumann@progress-linux.org> 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 <software@lists.open-infrastructure.net> Source: https://get.open-infrastructure.net/software/compute-tools Files: * -Copyright: 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net> +Copyright: 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> 2016 Simon Spoehel <simon.spoehel@open-infrastructure.net> License: GPL-3+ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e76f4e8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -upstream/0001-host-variable.patch -upstream/0002-versioned-sort.patch diff --git a/debian/patches/upstream/0001-host-variable.patch b/debian/patches/upstream/0001-host-variable.patch deleted file mode 100644 index 53e9e6d..0000000 --- a/debian/patches/upstream/0001-host-variable.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Description: Adding host variable for preseed files. - -diff -Naurp open-infrastructure-compute-tools.orig/share/build-scripts/debconf open-infrastructure-compute-tools/share/build-scripts/debconf ---- open-infrastructure-compute-tools.orig/share/build-scripts/debconf -+++ open-infrastructure-compute-tools/share/build-scripts/debconf -@@ -123,6 +123,8 @@ then - exit 1 - fi - -+HOST="$(echo ${NAME} | cut -d. -f1)" -+ - Mount () - { - # Mounting rw bind mounts -@@ -686,6 +688,7 @@ EOF - - sed -e "s|@FILE@|${FILE}|g" \ - -e "s|@NAME@|${NAME}|g" \ -+ -e "s|@HOST@|${HOST}|g" \ - -e "s|@IPV4_ADDRESS1@|${IPV4_ADDRESS1}|g" \ - -e "s|@IPV4_ADDRESS1_PART1@|${IPV4_ADDRESS1_PART1}|g" \ - -e "s|@IPV4_ADDRESS1_PART2@|${IPV4_ADDRESS1_PART2}|g" \ -@@ -1185,6 +1188,7 @@ trap 'Umount' EXIT HUP INT QUIT TERM - umask 0022 - - export NAME -+export HOST - - Debconf - -diff -Naurp open-infrastructure-compute-tools.orig/share/build-scripts/debconf.d/0002-preseed-debconf open-infrastructure-compute-tools/share/build-scripts/debconf.d/0002-preseed-debconf ---- open-infrastructure-compute-tools.orig/share/build-scripts/debconf.d/0002-preseed-debconf -+++ open-infrastructure-compute-tools/share/build-scripts/debconf.d/0002-preseed-debconf -@@ -93,6 +93,7 @@ do - fi - - sed -e "s|@NAME@|${NAME}|g" \ -+ -e "s|@HOST@|${HOST}|g" \ - -e "s|@IPV4_ADDRESS1@|${IPV4_ADDRESS1}|g" \ - -e "s|@IPV4_ADDRESS1_PART1@|${IPV4_ADDRESS1_PART1}|g" \ - -e "s|@IPV4_ADDRESS1_PART2@|${IPV4_ADDRESS1_PART2}|g" \ diff --git a/debian/patches/upstream/0002-versioned-sort.patch b/debian/patches/upstream/0002-versioned-sort.patch deleted file mode 100644 index 1f76b90..0000000 --- a/debian/patches/upstream/0002-versioned-sort.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp open-infrastructure-compute-tools.orig/libexec/container/list open-infrastructure-compute-tools/libexec/container/list ---- open-infrastructure-compute-tools.orig/libexec/container/list 2023-02-14 21:43:48.782723940 +0100 -+++ open-infrastructure-compute-tools/libexec/container/list 2023-04-16 08:04:02.277215515 +0200 -@@ -327,7 +327,7 @@ esac - - if ls "${MACHINES}"/* > /dev/null 2>&1 - then -- CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 \( -type d -or -type l \) -and -not -name 'lost+found' -printf '%P\n' | sort)" -+ CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 \( -type d -or -type l \) -and -not -name 'lost+found' -printf '%P\n' | sort -V)" - fi - - for CONTAINER in ${CONTAINERS} |