Merging debian version 1.5.0-1.

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

4 files changed, 11 insertions, 95 deletions

diff --git a/debian/changelog b/debian/changelog
index 35eb3f4..4b7b2b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mmdebstrap (1.5.0-1) unstable; urgency=medium
+
+  * New upstream version 1.5.0
+     - add --format=ext4
+  * debian/mmdebstrap.tmpfiles: prevent files in the chroot with a too old
+    mtime from being cleaned up
+
+ -- Johannes Schauer Marin Rodrigues <josch@debian.org>  Tue, 14 May 2024 08:06:25 +0200
+
 mmdebstrap (1.4.3-6~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/mmdebstrap.tmpfiles b/debian/mmdebstrap.tmpfiles
new file mode 100644
index 0000000..9b9f8b4
--- /dev/null
+++ b/debian/mmdebstrap.tmpfiles
@@ -0,0 +1,2 @@
+# prevent files in the chroot with a too old mtime from being cleaned up
+x /tmp/mmdebstrap.*
diff --git a/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch b/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch
deleted file mode 100644
index ec32f84..0000000
--- a/debian/patches/0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From d883fa13bbb9ac78cc3e16511fc7359314ae256d Mon Sep 17 00:00:00 2001
-From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
-Date: Mon, 26 Feb 2024 14:52:43 +0100
-Subject: [PATCH] hooks/maybe-merged-usr: prepare for the time when
- usr-is-merged exists only as a virtual package
-
----
- hooks/maybe-merged-usr/essential00.sh |  4 ++++
- hooks/maybe-merged-usr/extract00.sh   | 20 +++++++++++++++-----
- hooks/maybe-merged-usr/setup00.sh     | 20 +++++++++++++++-----
- 3 files changed, 34 insertions(+), 10 deletions(-)
-
-diff --git a/hooks/maybe-merged-usr/essential00.sh b/hooks/maybe-merged-usr/essential00.sh
-index a23f2f7..656057e 100755
---- a/hooks/maybe-merged-usr/essential00.sh
-+++ b/hooks/maybe-merged-usr/essential00.sh
-@@ -15,6 +15,10 @@ case "$ver" in
- 		echo "usr-is-merged package from src:usrmerge installed -- not running merged-usr essential hook" >&2
- 		exit 0
- 		;;
-+	'not-installed  ')
-+		echo "usr-is-merged was not installed in a previous hook -- not running merged-usr essential hook" >&2
-+		exit 0
-+		;;
- 	*)
- 		echo "unexpected situation for package usr-is-merged: $ver" >&2
- 		exit 1
-diff --git a/hooks/maybe-merged-usr/extract00.sh b/hooks/maybe-merged-usr/extract00.sh
-index dc88450..00bb037 100755
---- a/hooks/maybe-merged-usr/extract00.sh
-+++ b/hooks/maybe-merged-usr/extract00.sh
-@@ -4,12 +4,22 @@ set -eu
- 
- env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-get update --error-on=any
- 
--# if the usr-is-merged package cannot be installed with apt, do nothing
--if ! env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then
--	echo "no package called usr-is-merged found -- not running merged-usr extract hook" >&2
--	exit 0
-+if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then
-+	# if apt-cache exited successfully, then usr-is-merged exists either as
-+	# a real or virtual package
-+	if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged 2>/dev/null | grep -q "Package: usr-is-merged"; then
-+		echo "usr-is-merged found -- running merged-usr extract hook" >&2
-+	else
-+		# The usr-is-merged must be virtual, so assume that nothing
-+		# has to be done. This is the case with Debian Trixie or later
-+		# or with Ubuntu Lunar or later
-+		echo "usr-is-merged found but not real -- not running merged-usr extract hook" >&2
-+		exit 0
-+	fi
- else
--	echo "package usr-is-merged found -- running merged-usr extract hook" >&2
-+	# if the usr-is-merged package cannot be installed with apt, do nothing
-+	echo "no package providing usr-is-merged found -- not running merged-usr extract hook" >&2
-+	exit 0
- fi
- 
- # resolve the script path using several methods in order:
-diff --git a/hooks/maybe-merged-usr/setup00.sh b/hooks/maybe-merged-usr/setup00.sh
-index a6bd712..6568af2 100755
---- a/hooks/maybe-merged-usr/setup00.sh
-+++ b/hooks/maybe-merged-usr/setup00.sh
-@@ -4,12 +4,22 @@ set -eu
- 
- env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-get update --error-on=any
- 
--# if the usr-is-merged package cannot be installed with apt, do nothing
--if ! env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then
--	echo "no package called usr-is-merged found -- not running merged-usr setup hook" >&2
--	exit 0
-+if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged > /dev/null 2>&1; then
-+	# if apt-cache exited successfully, then usr-is-merged exists either as
-+	# a real or virtual package
-+	if env --chdir="$1" APT_CONFIG="$MMDEBSTRAP_APT_CONFIG" apt-cache show --no-all-versions usr-is-merged 2>/dev/null | grep -q "Package: usr-is-merged"; then
-+		echo "usr-is-merged found -- running merged-usr setup hook" >&2
-+	else
-+		# The usr-is-merged must be virtual, so assume that nothing
-+		# has to be done. This is the case with Debian Trixie or later
-+		# or with Ubuntu Lunar or later
-+		echo "usr-is-merged found but not real -- not running merged-usr setup hook" >&2
-+		exit 0
-+	fi
- else
--	echo "package usr-is-merged found -- running merged-usr setup hook" >&2
-+	# if the usr-is-merged package cannot be installed with apt, do nothing
-+	echo "no package providing usr-is-merged found -- not running merged-usr setup hook" >&2
-+	exit 0
- fi
- 
- # resolve the script path using several methods in order:
--- 
-2.39.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index af95d70..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-hooks-maybe-merged-usr-prepare-for-the-time-when-usr.patch