Please merge xmobar 0.36-2 (universe) from Debian unstable (main)

[Hans Joachim Desserud]

Comment #5 and #6 features suggested debdiffs for a merge with the latest Debian package, maintaining the existing delta.

Please excuse me, this report has been converted from a sync request originally.

Changelog entries since current hirsute version 0.33-1ubuntu1:

xmobar (0.36-2) unstable; urgency=medium

  * Move maintenance under DHG
    + Move myself to Uploaders
    + Point Vcs-* to the DHG_packages repository
  * Enable ALSA support; thanks to William Wilhelm
    + B-D on libghc-alsa-core-dev and libghc-alsa-mixer-dev

 -- Apollon Oikonomopoulos <email address hidden> Thu, 29 Oct 2020 11:20:33 +0200

xmobar (0.36-1) unstable; urgency=medium

  * New upstream version 0.36
  * d/copyright: bump years
  * d/rules: replace with_conduit w/ with_weather

 -- Apollon Oikonomopoulos <email address hidden> Wed, 28 Oct 2020 13:41:25 +0200

[Launchpad Janitor (janitor)]

Status changed to 'Confirmed' because the bug affects multiple users.

[Balint Reczey (rbalint)]

The Ubuntu delta adds a 5 second sleep, which is still not present in Debian:
diff -Nru xmobar-0.33/debian/changelog xmobar-0.33/debian/changelog
--- xmobar-0.33/debian/changelog 2020-03-19 21:40:33.000000000 +0100
+++ xmobar-0.33/debian/changelog 2020-10-12 05:38:08.000000000 +0200
@@ -1,3 +1,15 @@
+xmobar (0.33-1ubuntu1) groovy; urgency=medium
+
+ * d/tests/xmobar: wait a little longer for X server to be ready.
+
+ -- Michael Hudson-Doyle <email address hidden> Mon, 12 Oct 2020 16:38:08 +1300
+
+xmobar (0.33-1build1) groovy; urgency=medium
+
+ * No-change rebuild against libffi8ubuntu1
+
+ -- Steve Langasek <email address hidden> Thu, 27 Aug 2020 00:15:49 +0000
+
 xmobar (0.33-1) unstable; urgency=medium

   * New upstream version
diff -Nru xmobar-0.33/debian/control xmobar-0.33/debian/control
--- xmobar-0.33/debian/control 2020-03-19 21:39:52.000000000 +0100
+++ xmobar-0.33/debian/control 2020-08-27 02:15:49.000000000 +0200
@@ -1,7 +1,8 @@
 Source: xmobar
 Section: x11
 Priority: optional
-Maintainer: Apollon Oikonomopoulos <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Apollon Oikonomopoulos <email address hidden>
 Uploaders: Aggelos Avgerinos <email address hidden>,
 Standards-Version: 4.5.0
 Build-Depends: debhelper-compat (=12),
diff -Nru xmobar-0.33/debian/tests/xmobar xmobar-0.33/debian/tests/xmobar
--- xmobar-0.33/debian/tests/xmobar 2019-01-14 21:27:04.000000000 +0100
+++ xmobar-0.33/debian/tests/xmobar 2020-10-12 05:25:23.000000000 +0200
@@ -15,6 +15,8 @@
 done
 echo

+sleep 5
+
 xmobar /usr/share/doc/xmobar/examples/xmobar.config &
 xmobar_pid=$!

As I see without the test the arm64 autopkgtest was constantly failing:

https://autopkgtest.ubuntu.com/packages/x/xmobar/groovy/arm64

Have you verified that the autopkgtest passes now on arm64?

[Balint Reczey (rbalint)]

If the sleep is still need this would better be a merge. (Or if the underlying problem can be fixed then a proper fix and a sync.)

[Hans Joachim Desserud (hjd)]

Sorry, I seem to have misread the patch when checking if this was syncable. This should indeed be a merge! If no one else picks it up, I can convert this issue to a merge request and attach suggested debdiffs in a couple of days.

To further elaborate the test suite starts with this little section
```
for i in $(seq 1 30); do
 echo "."
 xprop -root >/dev/null 2>&1 && break
 if [ $i -eq 30 ]; then
  echo "Failed!"
  exit 1
 fi
 sleep 1
done
echo
```
which I figured had been added instead of the 5 seconds sleep. I now see that this was in place all along and the 5 seconds are IN ADDTION. My bad.

[Hans Joachim Desserud (hjd)]

After the comments above, to keep things on the safe side: here's a proposed merge which will keep the Ubuntu delta.

debian2ubuntu - diff between the current Debian package and with the delta added
ubuntu2ubuntu - diff between the old Ubuntu package and the new one

[Hans Joachim Desserud (hjd)]

I suppose I could run this in a PPA to verify it still builds and tests are passing, especially arm64 as I don't have hardware for that. Though in the past I've only built PPAs based on bzr repos, so I'm not quite sure how to proceed with a source package...

[William Wilhelm (willat8)]

I used your debian2ubuntu.diff above and the Debian 0.36-2 source package to do the PPA build. Builds succeeded on all the existing architectures https://launchpad.net/~willat8/+archive/ubuntu/ubuntu-desktop/+packages

[William Wilhelm (willat8)]

That being said Debian has a successful arm64 build without the extra sleep 5 https://packages.debian.org/sid/xmobar.

[William Wilhelm (willat8)]

My mistake I thought the tests were run during the build.

Can someone with the rights check the autopkgtests against my PPA?

Something like https://autopkgtest.ubuntu.com/request.cgi/?release=groovy&arch=arm64&package=xmobar&ppa=willat8%2Fubuntu-desktop&trigger=xmobar%2F0.36-2ubuntu1ppa2 according to https://wiki.ubuntu.com/ProposedMigration#Testing_against_a_PPA

[Balint Reczey (rbalint)]

I've uploaded the merged package to Hirsute, please keep an eye on it and help it in migration.
Upstreaming the 5s delay of fixing the autopkgtest by other means in Debian would be nice, Debian's CI is also failing on ppc64el.

[Launchpad Janitor (janitor)]

This bug was fixed in the package xmobar - 0.36-2ubuntu1

---------------
xmobar (0.36-2ubuntu1) hirsute; urgency=medium

  * Merge newer version from Debian (LP: #1902343)
  * Remaining changes:
    d/tests/xmobar: wait a little longer for X server to be ready.

xmobar (0.36-2) unstable; urgency=medium

  * Move maintenance under DHG
    + Move myself to Uploaders
    + Point Vcs-* to the DHG_packages repository
  * Enable ALSA support; thanks to William Wilhelm
    + B-D on libghc-alsa-core-dev and libghc-alsa-mixer-dev

xmobar (0.36-1) unstable; urgency=medium

  * New upstream version 0.36
  * d/copyright: bump years
  * d/rules: replace with_conduit w/ with_weather
 xmobar (0.33-1ubuntu1) groovy; urgency=medium

  * d/tests/xmobar: wait a little longer for X server to be ready.

 -- Hans Joachim Desserud <email address hidden> Tue, 10 Nov 2020 17:54:51 +0100