[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#796608: espeakup: diff for NMU version 1:0.71-27.1



Hi!

* Samuel Thibault <sthibault@debian.org> [160703 21:21]:
> It however doesn't seem to be working properly: when I upgraded a
> testbox from Jessie, espeakup didn't start at reboot, I had to run
> 
> systemctl enable espeakup
> 
> for espeakup to start up automatically at boot, so please remove your
> upload for now until we fix the issue (otherwise everybody needing
> espeakup will get an unusable box).

Right, thanks for testing!

I indeed did forget to build with 'dh --with systemd'; added and
checked that it now enables the service by default. (See new debdiff
below).

There's another minor thing I've noticed: espeakup takes a
relatively long time to write it's pidfile after forking. I see that
this is actually a Debian change, but the changelog doesn't explain
much about the reasoning behind it. Could you maybe elaborate on
that?



diff -Nru espeakup-0.71/debian/changelog espeakup-0.71/debian/changelog
--- espeakup-0.71/debian/changelog	2016-05-19 21:08:31.000000000 +0200
+++ espeakup-0.71/debian/changelog	2016-07-03 20:53:44.000000000 +0200
@@ -1,3 +1,10 @@
+espeakup (1:0.71-27.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install espeakup.service. (Closes: #796608)
+
+ -- Christian Hofstaedtler <zeha@debian.org>  Sun, 03 Jul 2016 20:52:49 +0200
+
 espeakup (1:0.71-27) unstable; urgency=high
 
   [ Samuel Thibault ]
diff -Nru espeakup-0.71/debian/control espeakup-0.71/debian/control
--- espeakup-0.71/debian/control	2016-05-19 21:00:28.000000000 +0200
+++ espeakup-0.71/debian/control	2016-07-03 21:38:25.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Accessibility Team <debian-accessibility@lists.debian.org>
 Uploaders: Samuel Thibault <sthibault@debian.org>
-Build-Depends: debhelper (>= 9), libespeak-dev (>= 1.46.02), libsonic-dev (>= 0.1.17-1.1), portaudio19-dev (>= 19+svn20111121), libjack-dev (>= 1:0.121.0+svn4538-2), libasound2-dev, po-debconf
+Build-Depends: debhelper (>= 9), dh-systemd, libespeak-dev (>= 1.46.02), libsonic-dev (>= 0.1.17-1.1), portaudio19-dev (>= 19+svn20111121), libjack-dev (>= 1:0.121.0+svn4538-2), libasound2-dev, po-debconf
 Standards-Version: 3.9.7
 Vcs-Git: git://git.debian.org/git/pkg-a11y/espeakup
 Vcs-Browser: http://git.debian.org/?p=pkg-a11y/espeakup.git
diff -Nru espeakup-0.71/debian/espeakup.service espeakup-0.71/debian/espeakup.service
--- espeakup-0.71/debian/espeakup.service	1970-01-01 01:00:00.000000000 +0100
+++ espeakup-0.71/debian/espeakup.service	2016-07-03 20:52:40.000000000 +0200
@@ -0,0 +1,17 @@
+[Unit]
+Description=Software speech output for Speakup
+Documentation=man:espeakup(8)
+Wants=systemd-udev-settle.service
+After=systemd-udev-settle.service sound.target
+
+[Service]
+Type=forking
+PIDFile=/run/espeakup.pid
+Environment=VOICE=
+EnvironmentFile=-/etc/default/espeakup
+ExecStart=/usr/bin/espeakup -V ${VOICE}
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=sound.target
diff -Nru espeakup-0.71/debian/rules espeakup-0.71/debian/rules
--- espeakup-0.71/debian/rules	2016-05-19 21:00:28.000000000 +0200
+++ espeakup-0.71/debian/rules	2016-07-03 21:38:15.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with systemd
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 UDEB_CFLAGS ?= $(CFLAGS) -Os

-- 
 ,''`.  Christian Hofstaedtler <zeha@debian.org>
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-


Reply to: