Control: tags 913639 + patch Control: tags 913639 + pending Control: retitle -1 use alternatives system to permit other unclutter implementations
Dear maintainer, I've prepared an NMU for unclutter (versioned as 8-21.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. The content of this NMU is what I believe to be the least disruptive way to get unclutter-xfixes into Debian for those that want it. In #825809, the maintainers of src:unclutter have expressed their general support for making unclutter-xfixes available. If the maintainers of src:unclutter later want to do drop classic unclutter and transition all users over to unclutter-xfixes, this NMU will not make doing that any harder. Regards. -- Sean Whitton
diff -Nru unclutter-8/debian/changelog unclutter-8/debian/changelog
--- unclutter-8/debian/changelog 2018-01-01 23:41:13.000000000 -0700
+++ unclutter-8/debian/changelog 2019-08-31 12:32:55.000000000 -0700
@@ -1,3 +1,15 @@
+unclutter (8-21.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename /usr/bin/unclutter to /usr/bin/unclutter-classic.
+ - Add dh-exec build-dep.
+ * Also install unclutter.man as unclutter-classic.man.
+ * Call update-alternatives in prerm and postinst to register
+ /usr/bin/unclutter-classic as an alternative for /usr/bin/unclutter,
+ with the manpage as a slave link (Closes: #913639).
+
+ -- Sean Whitton <spwhit...@spwhitton.name> Sat, 31 Aug 2019 12:32:55 -0700
+
unclutter (8-21) unstable; urgency=medium
* Update Vcs-* headers for the switch to salsa.debian.org.
diff -Nru unclutter-8/debian/control unclutter-8/debian/control
--- unclutter-8/debian/control 2018-01-01 23:11:27.000000000 -0700
+++ unclutter-8/debian/control 2019-08-31 12:32:55.000000000 -0700
@@ -4,6 +4,7 @@
Maintainer: Axel Beckert <a...@debian.org>
Uploaders: Ian Jackson <ijack...@chiark.greenend.org.uk>
Build-Depends: debhelper (>= 11~),
+ dh-exec,
libx11-dev
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/debian/unclutter
diff -Nru unclutter-8/debian/rules unclutter-8/debian/rules
--- unclutter-8/debian/rules 2018-01-01 21:36:40.000000000 -0700
+++ unclutter-8/debian/rules 2019-08-31 12:32:55.000000000 -0700
@@ -7,3 +7,9 @@
override_dh_installchangelogs:
dh_installchangelogs patchlevel.h
+
+override_dh_auto_install:
+
+override_dh_installman:
+ cp unclutter.man debian/tmp/unclutter-classic.man
+ dh_installman debian/tmp/unclutter-classic.man
diff -Nru unclutter-8/debian/unclutter.install unclutter-8/debian/unclutter.install
--- unclutter-8/debian/unclutter.install 2017-12-30 11:53:06.000000000 -0700
+++ unclutter-8/debian/unclutter.install 2019-08-31 12:32:55.000000000 -0700
@@ -1,2 +1,4 @@
-debian/local/90unclutter /etc/X11/Xsession.d
-unclutter /usr/bin
+#!/usr/bin/dh-exec
+
+debian/local/90unclutter => /etc/X11/Xsession.d/90unclutter
+unclutter => /usr/bin/unclutter-classic
diff -Nru unclutter-8/debian/unclutter.manpages unclutter-8/debian/unclutter.manpages
--- unclutter-8/debian/unclutter.manpages 2017-12-30 11:53:06.000000000 -0700
+++ unclutter-8/debian/unclutter.manpages 1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-unclutter.man
diff -Nru unclutter-8/debian/unclutter.postinst unclutter-8/debian/unclutter.postinst
--- unclutter-8/debian/unclutter.postinst 2017-12-30 11:53:06.000000000 -0700
+++ unclutter-8/debian/unclutter.postinst 2019-08-31 12:32:55.000000000 -0700
@@ -4,6 +4,13 @@
. /usr/share/debconf/confmodule
+unclutter_update_alternatives () {
+ update-alternatives --install /usr/bin/unclutter \
+ unclutter /usr/bin/unclutter-classic 10 \
+ --slave /usr/share/man/man1/unclutter.1.gz \
+ unclutter.1.gz /usr/share/man/man1/unclutter-classic.1.gz
+}
+
case "${1}" in
configure)
db_get unclutter/autostart
@@ -30,10 +37,12 @@
sed -i -e "s|^ *START_UNCLUTTER=.*$|START_UNCLUTTER=${START_UNCLUTTER}|" /etc/default/unclutter
fi
+
+ unclutter_update_alternatives
;;
abort-upgrade|abort-remove|abort-deconfigure)
-
+ unclutter_update_alternatives
;;
*)
diff -Nru unclutter-8/debian/unclutter.prerm unclutter-8/debian/unclutter.prerm
--- unclutter-8/debian/unclutter.prerm 1969-12-31 17:00:00.000000000 -0700
+++ unclutter-8/debian/unclutter.prerm 2019-08-31 12:32:55.000000000 -0700
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ remove)
+ update-alternatives --remove unclutter /usr/bin/unclutter-classic
+ ;;
+
+ purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
signature.asc
Description: PGP signature
