Bug#825809: unclutter: diff for NMU version 8-21.1
Hello Axel, On Sun 01 Sep 2019 at 08:54PM +02, Axel Beckert wrote: > Sean Whitton wrote: >> 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. > > Yes, please remove it completely. It is incomplete and has unsolved > issues which might be even harder to fix properly afterwards if the > upload succeeds. Done, quite gladly. I decide whether to NMU based on activity in the bugs to be closed by the NMU, not on how active a maintainer is in general, since people who are active often don't have time for all of their packages. Anyway, I hope that no annoyance was generated. > I'll try to upload unclutter 8-22 (to experimental) before that NMU > passes throught, but for that, I need your feedback first: > > Please check the master branch under > https://salsa.debian.org/debian/unclutter and especially the commits I > made after applying your NMU patch minus the unnecessary NMU stuff: > > https://salsa.debian.org/debian/unclutter/commits/master > > Main points: > > * Make /etc/X11/Xsession.d/90unclutter a slave alternative, too. > * Rename /etc/default/unclutter to /etc/default/unclutter-classic. > * Make debian/unclutter.install executable. (Might have been lost when > you generated your patch as it clearly FTBFS else.) Yeah, nmudiffs can't record mode changes. It was executable in the source package I uploaded, though. > I'd appreciate if you could look over these changes and tell me if you > agree (as we both should agree on at least the list of slave > alternatives), have alternative suggestions or otherwise comments. I thought about the issue of the Xsession.d file and /etc/default/unclutter, and concluded that it could stay in src:unclutter only. My thought was that most contemporary users of unclutter-xfixes will probably expect to have to start the program themselves, e.g. in ~/.config/i3/config. I was certainly surprised when I first installed unclutter, rebooted for whatever reason and discovered it had started itself. Someone who *does* want to keep using the Xsession.d file with unclutter-xfixes can just install both unclutter and unclutter-xfixes. Without your additional changes on top of my patch, that will just work (I've tested it): the priority of the unclutter-xfixes link group is 20, such that if you have both packages installed unclutter-xfixes automatically occupied /usr/bin/unclutter (since someone who has installed unclutter-xfixes very likely wants to use that in preference to unclutter-classic) but the Xsession.d file still works. Does this make sense to you? I'm certainly not wedded to the idea, but I'd like to hear your opinion about it. > Open issues and why I haven't uploaded the current state to > experimental yet: > > * In the current setup, /etc/default/unclutter might need to be a > slave alternative, too. Not sure, though. Thoughts on this are > welcome! > > * /etc/default/unclutter and /etc/X11/Xsession.d/90unclutter could be > implementation-independent files, but then they need to be shipped > either by both packages (which causes a file conflict) or we create > some unclutter-common packages with just the common files between > both implementations. > > Looks like the least complex implementation to me, but is probably > also the one with the most coordination effort between the > maintainers of both packages. (I suggest to maintain such a package > together in git so that either maintainer can easily upload fixes.) If we decide want to go this route, I'd suggest that src:unclutter adds a new bin:unclutter-common. No need for a new source package. -- Sean Whitton signature.asc Description: PGP signature
Bug#825809: unclutter: diff for NMU version 8-21.1
Hi Sean, Sean Whitton wrote: > 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. Yes, please remove it completely. It is incomplete and has unsolved issues which might be even harder to fix properly afterwards if the upload succeeds. I'll try to upload unclutter 8-22 (to experimental) before that NMU passes throught, but for that, I need your feedback first: Please check the master branch under https://salsa.debian.org/debian/unclutter and especially the commits I made after applying your NMU patch minus the unnecessary NMU stuff: https://salsa.debian.org/debian/unclutter/commits/master Main points: * Make /etc/X11/Xsession.d/90unclutter a slave alternative, too. * Rename /etc/default/unclutter to /etc/default/unclutter-classic. * Make debian/unclutter.install executable. (Might have been lost when you generated your patch as it clearly FTBFS else.) I'd appreciate if you could look over these changes and tell me if you agree (as we both should agree on at least the list of slave alternatives), have alternative suggestions or otherwise comments. Open issues and why I haven't uploaded the current state to experimental yet: * In the current setup, /etc/default/unclutter might need to be a slave alternative, too. Not sure, though. Thoughts on this are welcome! * /etc/default/unclutter and /etc/X11/Xsession.d/90unclutter could be implementation-independent files, but then they need to be shipped either by both packages (which causes a file conflict) or we create some unclutter-common packages with just the common files between both implementations. Looks like the least complex implementation to me, but is probably also the one with the most coordination effort between the maintainers of both packages. (I suggest to maintain such a package together in git so that either maintainer can easily upload fixes.) Regards, Axel -- ,''`. | Axel Beckert , https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `-| 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Bug#825809: unclutter: diff for NMU version 8-21.1
Hi Sean, Sean Whitton wrote: > + > +override_dh_auto_install: > + Hmmm, I think that could be avoided. > +override_dh_installman: > + cp unclutter.man debian/tmp/unclutter-classic.man > + dh_installman debian/tmp/unclutter-classic.man Hmmm, this looks rather ugly to me. If we already use dh-exec, we should use it for that, too, IMHO. > diff -Nru unclutter-8/debian/unclutter.install > unclutter-8/debian/unclutter.install > --- unclutter-8/debian/unclutter.install 2017-12-30 11:53:06.0 > -0700 > +++ unclutter-8/debian/unclutter.install 2019-08-31 12:32:55.0 > -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 I think we'll have some issues if we don't include /etc/X11/Xsession.d/90unclutter in the alternatives, too: * Only either unclutter or unclutter-xfixes can ship this file. * It will operate on whatever is chosen with update-alternatives, but only if the package which contains it, is installed, too. * Installing this file with different names from both packages is no option as it would start both programs (and I don't think that's a good idea) if both are installed. Regards, Axel -- ,''`. | Axel Beckert , https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `-| 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Bug#825809: unclutter: diff for NMU version 8-21.1
Hi Sean, Sean Whitton wrote: > 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. Huh? I don't think an NMU is necessary nor appropriate here since I don't think that I am MIA. I'd rather prefer if you'd update https://salsa.debian.org/debian/unclutter instead, either in a feature branch or directly into the master branch (fine for me). Regards, Axel -- ,''`. | Axel Beckert , https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `-| 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Bug#825809: unclutter: diff for NMU version 8-21.1
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.0 -0700
+++ unclutter-8/debian/changelog 2019-08-31 12:32:55.0 -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 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.0 -0700
+++ unclutter-8/debian/control 2019-08-31 12:32:55.0 -0700
@@ -4,6 +4,7 @@
Maintainer: Axel Beckert
Uploaders: Ian Jackson
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.0 -0700
+++ unclutter-8/debian/rules 2019-08-31 12:32:55.0 -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.0 -0700
+++ unclutter-8/debian/unclutter.install 2019-08-31 12:32:55.0 -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.0 -0700
+++ unclutter-8/debian/unclutter.manpages 1969-12-31 17:00:00.0 -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.0 -0700
+++ unclutter-8/debian/unclutter.postinst 2019-08-31 12:32:55.0 -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.0 -0700
+++ unclutter-8/debian/unclutter.prerm 2019-08-31 12:32:55.0 -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
