Control: reassign -1 mksh
Control: tag -1 patch
Control: subscribe -1

The attached patch fixes mksh on merged /usr systems.

-- 
ciao,
Marco
diff --git a/debian/changelog b/debian/changelog
index cc10857..e8182d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mksh (52-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Create the /usr/bin/ksh compatibility link in postinst instead that as
+    an update-alternatives slave link, to support merged /usr systems.
+    (Closes: #807185)
+
+ -- Marco d'Itri <m...@linux.it>  Wed, 06 Jan 2016 05:41:25 +0100
+
 mksh (52-1) unstable; urgency=medium
 
   * Remove parallel=* from DEB_BUILD_OPTIONS for the reproducible people
diff --git a/debian/mksh.postinst b/debian/mksh.postinst
index 8f4b9a6..34a37a8 100644
--- a/debian/mksh.postinst
+++ b/debian/mksh.postinst
@@ -33,13 +33,14 @@ fi
 case $1 in
 configure)
 	update-alternatives --install /bin/ksh ksh /bin/mksh 12 \
-	    --slave /usr/bin/ksh usr.bin.ksh /bin/mksh \
 	    --slave /usr/share/man/man1/ksh.1.gz ksh.1.gz \
 	    /usr/share/man/man1/mksh.1.gz
 	update-alternatives --install /bin/ksh ksh /bin/mksh-static 11 \
-	    --slave /usr/bin/ksh usr.bin.ksh /bin/mksh-static \
 	    --slave /usr/share/man/man1/ksh.1.gz ksh.1.gz \
 	    /usr/share/man/man1/mksh.1.gz
+	if [ ! -e /usr/bin/ksh -a ! -L /usr/bin/ksh ]; then
+	    ln -s /bin/ksh /usr/bin/ksh
+	fi
 	add-shell /bin/mksh
 	add-shell /bin/mksh-static
 	;;
diff --git a/debian/mksh.prerm b/debian/mksh.prerm
index f79f7ef..af321fa 100644
--- a/debian/mksh.prerm
+++ b/debian/mksh.prerm
@@ -21,6 +21,10 @@ case $1 in
 remove|deconfigure)
 	update-alternatives --remove ksh /bin/mksh
 	update-alternatives --remove ksh /bin/mksh-static
+	# remove the compatibility link if it is broken
+	if [ -L /usr/bin/ksh -a ! -e /usr/bin/ksh ]; then
+	    rm /usr/bin/ksh
+	fi
 	remove-shell /bin/mksh
 	remove-shell /bin/mksh-static
 	;;

Attachment: signature.asc
Description: PGP signature

Reply via email to