diff -Nru xfsdump-3.1.9/debian/changelog xfsdump-3.1.9+nmu1/debian/changelog --- xfsdump-3.1.9/debian/changelog 2020-01-31 17:30:58.000000000 +0000 +++ xfsdump-3.1.9+nmu1/debian/changelog 2020-06-19 01:01:18.000000000 +0000 @@ -1,3 +1,13 @@ +xfsdump (3.1.9+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Create and remove symlinks in postinst/preinst rather than including them + in the package to support merged user systems. Based on a patch from + Goffredo Baroncelli but adjusted to avoid the need for modifying upstream + non-debian files. ( Closes: 953537 ) + + -- Peter Michael Green Fri, 19 Jun 2020 01:01:18 +0000 + xfsdump (3.1.9) unstable; urgency=low * New upstream release diff -Nru xfsdump-3.1.9/debian/rules xfsdump-3.1.9+nmu1/debian/rules --- xfsdump-3.1.9/debian/rules 2020-01-31 17:30:58.000000000 +0000 +++ xfsdump-3.1.9+nmu1/debian/rules 2020-06-19 01:01:18.000000000 +0000 @@ -44,6 +44,9 @@ -rm -rf $(dirme) $(pkgme) $(MAKE) -C . install $(pkgme) $(MAKE) dist + #remove the symlinks in /usr/sbin, the postinst will create them + #if appropriate for the users system + rm -f debian/xfsdump/usr/sbin/xfsdump debian/xfsdump/usr/sbin/xfsrestore dh_installdocs dh_installchangelogs dh_strip diff -Nru xfsdump-3.1.9/debian/xfsdump.postinst xfsdump-3.1.9+nmu1/debian/xfsdump.postinst --- xfsdump-3.1.9/debian/xfsdump.postinst 1970-01-01 00:00:00.000000000 +0000 +++ xfsdump-3.1.9+nmu1/debian/xfsdump.postinst 2020-06-19 00:59:32.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = 'configure' ]; then + for file in xfsdump xfsrestore; do + if [ ! -e /usr/sbin/$file ]; then + ln -s /sbin/$file /usr/sbin/$file + fi + done +fi + +#DEBHELPER# diff -Nru xfsdump-3.1.9/debian/xfsdump.preinst xfsdump-3.1.9+nmu1/debian/xfsdump.preinst --- xfsdump-3.1.9/debian/xfsdump.preinst 1970-01-01 00:00:00.000000000 +0000 +++ xfsdump-3.1.9+nmu1/debian/xfsdump.preinst 2020-06-19 01:01:18.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = 'remove' ]; then + for file in xfsdump xfsrestore; do + if [ -L /usr/sbin/$file ]; then + rm /usr/sbin/$file + fi + done +fi + +#DEBHELPER#