Adding debian version 20240829-1.debian/20240829-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 8 insertions, 71 deletions

diff --git a/debian/changelog b/debian/changelog
index 93e5774..b6d92e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2bee32d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream/0001-host-variable.patch
-upstream/0002-versioned-sort.patch
-upstream/0003-usr-move.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}
diff --git a/debian/patches/upstream/0003-usr-move.patch b/debian/patches/upstream/0003-usr-move.patch
deleted file mode 100644
index 6278efe..0000000
--- a/debian/patches/upstream/0003-usr-move.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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)
-