Merging debian version 3.6-4.

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

16 files changed, 79 insertions, 19 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..2c8afeb
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+/files
diff --git a/debian/changelog b/debian/changelog
index 2ab4bbe..fb78dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+parted (3.6-4) unstable; urgency=medium
+
+  [ Colin Watson ]
+  * Remove dh_strip --ddeb-migration options, only needed for upgrades from
+    before 3.2-11 (2015, before oldoldstable).
+  * Build-depend on pkgconf rather than pkg-config.
+  * Drop debian/libparted-fs-resize0t64.maintscript; the new documentation
+    symlink doesn't need to be switched from a directory any more.
+
+  [ Helmut Grohne ]
+  * Move files to /usr and mitigate loss (DEP17) (Closes: #1067772)
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 26 Mar 2024 16:54:23 +0000
+
 parted (3.6-3.1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 68f8504..225b0b9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  gettext,
  texinfo,
  libblkid-dev,
- pkg-config,
+ pkgconf,
  check <!nocheck>,
  autoconf,
  automake,
diff --git a/debian/libparted-dev.links b/debian/libparted-dev.links
index 4111660..b812def 100644
--- a/debian/libparted-dev.links
+++ b/debian/libparted-dev.links
@@ -1,2 +1,2 @@
-lib/${DEB_HOST_MULTIARCH}/libparted.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libparted.so
-lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so
+usr/lib/${DEB_HOST_MULTIARCH}/libparted.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libparted.so
+usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so
diff --git a/debian/libparted-fs-resize0-udeb.install b/debian/libparted-fs-resize0-udeb.install
index b14f84a..85fccb3 100644
--- a/debian/libparted-fs-resize0-udeb.install
+++ b/debian/libparted-fs-resize0-udeb.install
@@ -1 +1 @@
-lib/libparted-fs-resize.so.*
+usr/lib/libparted-fs-resize.so.*
diff --git a/debian/libparted-fs-resize0.install b/debian/libparted-fs-resize0.install
index 5101a40..44670bc 100644
--- a/debian/libparted-fs-resize0.install
+++ b/debian/libparted-fs-resize0.install
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so.* lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so.*
diff --git a/debian/libparted-fs-resize0.maintscript b/debian/libparted-fs-resize0.maintscript
deleted file mode 100644
index 33226c0..0000000
--- a/debian/libparted-fs-resize0.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/libparted-fs-resize0 libparted2 3.5-2~
diff --git a/debian/libparted-fs-resize0.postinst b/debian/libparted-fs-resize0.postinst
new file mode 100644
index 0000000..cc7ae3e
--- /dev/null
+++ b/debian/libparted-fs-resize0.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = configure; then
+	for f in libparted-fs-resize.so.0 libparted-fs-resize.so.0.0.5; do
+		dpkg-divert --no-rename --package libparted-fs-resize0 --divert "/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/$f"
+	done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff --git a/debian/libparted-fs-resize0.preinst b/debian/libparted-fs-resize0.preinst
new file mode 100644
index 0000000..034962b
--- /dev/null
+++ b/debian/libparted-fs-resize0.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = upgrade || test "$1" = install; then
+	for f in libparted-fs-resize.so.0 libparted-fs-resize.so.0.0.5; do
+		dpkg-divert --no-rename --package libparted-fs-resize0 --divert "/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/$f"
+	done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff --git a/debian/libparted2-udeb.install b/debian/libparted2-udeb.install
index 343306d..f50993c 100644
--- a/debian/libparted2-udeb.install
+++ b/debian/libparted2-udeb.install
@@ -1 +1 @@
-lib/libparted.so.*
+usr/lib/libparted.so.*
diff --git a/debian/libparted2.install b/debian/libparted2.install
index c104532..1e07f61 100644
--- a/debian/libparted2.install
+++ b/debian/libparted2.install
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libparted.so.* lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libparted.so.*
diff --git a/debian/libparted2.postinst b/debian/libparted2.postinst
new file mode 100644
index 0000000..68a2d19
--- /dev/null
+++ b/debian/libparted2.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = configure; then
+	for f in libparted.so.2 libparted.so.2.0.5; do
+		dpkg-divert --no-rename --package libparted2 --divert "/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/$f"
+	done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff --git a/debian/libparted2.preinst b/debian/libparted2.preinst
new file mode 100644
index 0000000..d1ed6ad
--- /dev/null
+++ b/debian/libparted2.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = upgrade || test "$1" = install; then
+	for f in libparted.so.2 libparted.so.2.0.5; do
+		dpkg-divert --no-rename --package libparted2 --divert "/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/$f"
+	done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff --git a/debian/parted-udeb.install b/debian/parted-udeb.install
index e1ae85e..236670a 100644
--- a/debian/parted-udeb.install
+++ b/debian/parted-udeb.install
@@ -1 +1 @@
-sbin
+usr/sbin
diff --git a/debian/parted.install b/debian/parted.install
index 88efc46..cbf6df3 100644
--- a/debian/parted.install
+++ b/debian/parted.install
@@ -1,3 +1,3 @@
-sbin
+usr/sbin
 usr/share/man/man8/parted.8
 usr/share/man/man8/partprobe.8
diff --git a/debian/rules b/debian/rules
index de1fd95..1b875dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 
-CONFFLAGS := --sbindir=/sbin --enable-mtrace --enable-shared
+CONFFLAGS := --sbindir=/usr/sbin --enable-mtrace --enable-shared
 CONFFLAGS += --disable-gcc-warnings
 
 # Enable device-mapper only on Linux
@@ -26,7 +26,7 @@ endif
 CONFFLAGS_UDEB := $(CONFFLAGS)
 
 # Options specific to the udeb build.
-CONFFLAGS_UDEB += ac_cv_header_execinfo_h=no --libdir=/lib
+CONFFLAGS_UDEB += ac_cv_header_execinfo_h=no --libdir=/usr/lib
 CONFFLAGS_UDEB += --disable-static --without-readline
 
 %:
@@ -62,7 +62,7 @@ override_dh_auto_install:
 	$(MAKE) -C build-udeb/libparted install DESTDIR=$(CURDIR)/debian/tmp-udeb
 	$(MAKE) -C build-udeb/parted install DESTDIR=$(CURDIR)/debian/tmp-udeb
 	rm -f debian/tmp/usr/lib/*/*.la
-	rm -f debian/tmp-udeb/lib/*.la debian/tmp-udeb/lib/*.so
+	rm -f debian/tmp-udeb/usr/lib/*.la debian/tmp-udeb/usr/lib/*.so
 
 override_dh_install:
 	dh_install -Nparted-udeb -Nlibparted2-udeb -Nlibparted-fs-resize0-udeb
@@ -75,12 +75,6 @@ override_dh_installdocs-indep:
 	dh_installdocs -pparted-doc --doc-main-package=libparted2
 	dh_installdocs --remaining-packages
 
-override_dh_strip:
-	dh_strip -plibparted2 --ddeb-migration='libparted2-dbg (<< 3.2-11~)'
-	dh_strip -plibparted-fs-resize0 \
-		--ddeb-migration='libparted-fs-resize0-dbg (<< 3.2-11~)'
-	dh_strip -Nlibparted2 -Nlibparted-fs-resize0
-
 override_dh_makeshlibs:
 	dh_makeshlibs -plibparted2 --add-udeb=libparted2-udeb -- -c4
 	dh_makeshlibs -plibparted-fs-resize0 --add-udeb=libparted-fs-resize0-udeb -- -c4