Processed: Re: Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2018-02-14 Thread Debian Bug Tracking System 
Processing control commands:

> tags -1 + pending
Bug #884606 [release.debian.org] stretch-pu: package espeakup/1:0.80-5+b2
Added tag(s) pending.

-- 
884606: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884606
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2018-02-14 Thread Adam D. Barratt 
Control: tags -1 + pending

On Sat, 2018-02-10 at 14:05 +0100, Samuel Thibault wrote:
> Julien Cristau, on sam. 10 févr. 2018 10:55:09 +0100, wrote:
> > Control: tag -1 confirmed
> > 
> > On Thu, Dec 21, 2017 at 15:44:56 +0100, Samuel Thibault wrote:
> > 
> > > Samuel Thibault, on jeu. 21 déc. 2017 15:42:13 +0100, wrote:
> > > > Cyril Brulebois, on jeu. 21 déc. 2017 15:37:00 +0100, wrote:
> > > > > I don't think that's an issue with cherry-picking the
> > > > > relevant commit,
> > > > > since it doesn't seem to contain any indications the default
> > > > > voice is
> > > > > getting set to English?
> > > > 
> > > > IIRC I had issues without it, so it was on purpose, and just
> > > > missed
> > > > documenting it.
> > > 
> > > Here is the fixed patch.
> > 
> > If kibi's happy, I'm happy.  Go ahead and upload.
> 
> Uploaded, thanks!
> 

Flagged for acceptance.

Regards,

Adam

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2018-02-10 Thread Samuel Thibault 
Julien Cristau, on sam. 10 févr. 2018 10:55:09 +0100, wrote:
> Control: tag -1 confirmed
> 
> On Thu, Dec 21, 2017 at 15:44:56 +0100, Samuel Thibault wrote:
> 
> > Samuel Thibault, on jeu. 21 déc. 2017 15:42:13 +0100, wrote:
> > > Cyril Brulebois, on jeu. 21 déc. 2017 15:37:00 +0100, wrote:
> > > > I don't think that's an issue with cherry-picking the relevant commit,
> > > > since it doesn't seem to contain any indications the default voice is
> > > > getting set to English?
> > > 
> > > IIRC I had issues without it, so it was on purpose, and just missed
> > > documenting it.
> > 
> > Here is the fixed patch.
> 
> If kibi's happy, I'm happy.  Go ahead and upload.

Uploaded, thanks!

Samuel

Processed: Re: Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2018-02-10 Thread Debian Bug Tracking System 
Processing control commands:

> tag -1 confirmed
Bug #884606 [release.debian.org] stretch-pu: package espeakup/1:0.80-5+b2
Added tag(s) confirmed.

-- 
884606: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884606
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2018-02-10 Thread Julien Cristau 
Control: tag -1 confirmed

On Thu, Dec 21, 2017 at 15:44:56 +0100, Samuel Thibault wrote:

> Samuel Thibault, on jeu. 21 déc. 2017 15:42:13 +0100, wrote:
> > Cyril Brulebois, on jeu. 21 déc. 2017 15:37:00 +0100, wrote:
> > > I don't think that's an issue with cherry-picking the relevant commit,
> > > since it doesn't seem to contain any indications the default voice is
> > > getting set to English?
> > 
> > IIRC I had issues without it, so it was on purpose, and just missed
> > documenting it.
> 
> Here is the fixed patch.

If kibi's happy, I'm happy.  Go ahead and upload.

Cheers,
Julien

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2017-12-21 Thread Samuel Thibault 
Samuel Thibault, on jeu. 21 déc. 2017 15:42:13 +0100, wrote:
> Cyril Brulebois, on jeu. 21 déc. 2017 15:37:00 +0100, wrote:
> > I don't think that's an issue with cherry-picking the relevant commit,
> > since it doesn't seem to contain any indications the default voice is
> > getting set to English?
> 
> IIRC I had issues without it, so it was on purpose, and just missed
> documenting it.

Here is the fixed patch.
diff --git a/debian/changelog b/debian/changelog
index a908870..0c1d5a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+espeakup (1:0.80-5+deb9u1) stretch; urgency=medium
+
+  * debian/espeakup-udeb.start: Fix case where card 0 does not have an id or
+where cards have non-contiguous indexes. Also make sure we load the
+english language by default.
+  * debian/espeakup-udeb.finish-install: Use card id in installed system
+to avoid issues with card detection ordering.
+
+ -- Samuel Thibault   Sun, 17 Dec 2017 16:35:19 +0100
+
 espeakup (1:0.80-5) unstable; urgency=medium
 
   * Use canonical anonscm vcs URL.
diff --git a/debian/espeakup-udeb.finish-install 
b/debian/espeakup-udeb.finish-install
index 00e7e84..17c9182 100644
--- a/debian/espeakup-udeb.finish-install
+++ b/debian/espeakup-udeb.finish-install
@@ -12,4 +12,4 @@ apt-install espeakup alsa-utils || true
 
 cp /usr/share/espeakup-udeb/espeakup.default /target/etc/default/espeakup
 sed -i -e "s/^VOICE=.*/VOICE=$VOICE/" /target/etc/default/espeakup
-[ -z "$ALSA_CARD" ] || sed -i -e "s/^# ALSA_CARD=.*/ALSA_CARD=\"$ALSA_CARD\"/" 
/target/etc/default/espeakup
+[ -z "$ALSA_CARD" ] || sed -i -e "s/^# ALSA_CARD=.*/ALSA_CARD=\"`cat 
/sys/class/sound/card$ALSA_CARD/id`\"/" /target/etc/default/espeakup
diff --git a/debian/espeakup-udeb.start b/debian/espeakup-udeb.start
index d187d77..2f5db6a 100644
--- a/debian/espeakup-udeb.start
+++ b/debian/espeakup-udeb.start
@@ -1,7 +1,15 @@
+BASE=/sys/class/sound
+
+strip () {
+   cardid=${1#$BASE/card}
+   echo ${cardid%/id}
+}
+
 if lsmod | grep -q speakup_soft; then
# Give drivers some time to detect boards :/
sleep 2
-   N=$(ls /sys/class/sound/card*/id | wc -l)
+   IDS=$(echo $BASE/card*/id)
+   N=$(echo $IDS | wc -w)
case $N in
0)
echo No sound card detected, can not do software speech 
synthesis... Press enter to continue anyway.
@@ -9,17 +17,18 @@ if lsmod | grep -q speakup_soft; then
;;
1)
# Just one card, can not be wrong
-   echo 0 > /var/run/espeakup.card
-   /usr/bin/espeakup > /var/log/espeakup.log 2>&1
+   echo $(strip $IDS) > /var/run/espeakup.card
+   /usr/bin/espeakup -V en > /var/log/espeakup.log 2>&1
;;
*)
# Several cards, make the user choose
CARD=none
while [ "$CARD" = none ]
do
-   for i in $( seq 0 $(($N-1)) )
+   for ID in $IDS
do
-   ALSA_CARD=$(cat 
/sys/class/sound/card$i/id) /usr/bin/espeakup >> /var/log/espeakup.log 2>&1
+   i=$(strip $ID)
+   ALSA_CARD=$(cat 
/sys/class/sound/card$i/id) /usr/bin/espeakup -V en >> /var/log/espeakup.log 
2>&1
while ! [ -r /var/run/espeakup.pid ]
do
sleep 0.1
@@ -41,6 +50,6 @@ if lsmod | grep -q speakup_soft; then
done
done
echo "$CARD" > /var/run/espeakup.card
-   ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
/usr/bin/espeakup >> /var/log/espeakup.log 2>&1
+   ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
/usr/bin/espeakup -V en >> /var/log/espeakup.log 2>&1
esac
 fi

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2017-12-21 Thread Samuel Thibault 
Cyril Brulebois, on jeu. 21 déc. 2017 15:37:00 +0100, wrote:
> I don't think that's an issue with cherry-picking the relevant commit,
> since it doesn't seem to contain any indications the default voice is
> getting set to English?

IIRC I had issues without it, so it was on purpose, and just missed
documenting it.

Samuel

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2017-12-21 Thread Cyril Brulebois 
Hi,

Samuel Thibault  (2017-12-17):
> Several blind users have reported that the Debian Installer speech
> synthesis was not working on their computer, thus making it unusable
> for them. It happens that this is due to odd numbering of sound cards
> by ALSA on those computers. We have fixed this in buster, it has been
> successfully tested on the reported systems, so I propose to include the
> fix in Stretch too, I have attached the diff. I'm also Cc-ing Kibi for
> his opinion on this.

Yeah, I've noticed the fix for buster, and I'm fine with fixing this for
stretch as well, but see below.

> +espeakup (1:0.80-5+deb9u1) stretch; urgency=medium
> +
> +  * debian/espeakup-udeb.start: Fix case where card 0 does not have an id or
> +where cards have non-contiguous indexes.
> +  * debian/espeakup-udeb.finish-install: Use card id in installed system
> +to avoid issues with card detection ordering.

No mention of “-V en” addition.

> - echo 0 > /var/run/espeakup.card
> - /usr/bin/espeakup > /var/log/espeakup.log 2>&1
> + echo $(strip $IDS) > /var/run/espeakup.card
> + /usr/bin/espeakup -V en > /var/log/espeakup.log 2>&1

but it gets added here…

> - ALSA_CARD=$(cat 
> /sys/class/sound/card$i/id) /usr/bin/espeakup >> /var/log/espeakup.log 2>&1
> + i=$(strip $ID)
> + ALSA_CARD=$(cat 
> /sys/class/sound/card$i/id) /usr/bin/espeakup -V en >> /var/log/espeakup.log 
> 2>&1

and here…

> - ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
> /usr/bin/espeakup >> /var/log/espeakup.log 2>&1
> + ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
> /usr/bin/espeakup -V en >> /var/log/espeakup.log 2>&1

and here?

I don't think that's an issue with cherry-picking the relevant commit,
since it doesn't seem to contain any indications the default voice is
getting set to English?
| commit eb7ae621d1db300e1159f48e149e11d85d372106
| Author: Samuel Thibault 
| Date:   Tue Nov 14 01:10:11 2017 +0100
| 
| Fix sound board selection
| 
|   * debian/espeakup-udeb.start: Fix case where card 0 does not have an id 
or
| where cards have non-contiguous indexes.
|   * debian/espeakup-udeb.finish-install: Use card id in installed system
| to avoid issues with card detection ordering.


Not a blocker for me (from a d-i point of view), but from a release team
point of view, I think that needs documenting (or stripping, if that
wasn't intended or if it isn't actually needed for this p-u request).


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#884606: stretch-pu: package espeakup/1:0.80-5+b2

2017-12-17 Thread Samuel Thibault 
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: k...@debian.org

Hello,

Several blind users have reported that the Debian Installer speech
synthesis was not working on their computer, thus making it unusable
for them. It happens that this is due to odd numbering of sound cards
by ALSA on those computers. We have fixed this in buster, it has been
successfully tested on the reported systems, so I propose to include the
fix in Stretch too, I have attached the diff. I'm also Cc-ing Kibi for
his opinion on this.

Samuel

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 
'testing-debug'), (500, 'stable-debug'), (500, 'oldoldstable'), (500, 
'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 
'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.14.0 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), 
LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index a908870..7a19a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+espeakup (1:0.80-5+deb9u1) stretch; urgency=medium
+
+  * debian/espeakup-udeb.start: Fix case where card 0 does not have an id or
+where cards have non-contiguous indexes.
+  * debian/espeakup-udeb.finish-install: Use card id in installed system
+to avoid issues with card detection ordering.
+
+ -- Samuel Thibault   Sun, 17 Dec 2017 16:35:19 +0100
+
 espeakup (1:0.80-5) unstable; urgency=medium
 
   * Use canonical anonscm vcs URL.
diff --git a/debian/espeakup-udeb.finish-install 
b/debian/espeakup-udeb.finish-install
index 00e7e84..17c9182 100644
--- a/debian/espeakup-udeb.finish-install
+++ b/debian/espeakup-udeb.finish-install
@@ -12,4 +12,4 @@ apt-install espeakup alsa-utils || true
 
 cp /usr/share/espeakup-udeb/espeakup.default /target/etc/default/espeakup
 sed -i -e "s/^VOICE=.*/VOICE=$VOICE/" /target/etc/default/espeakup
-[ -z "$ALSA_CARD" ] || sed -i -e "s/^# ALSA_CARD=.*/ALSA_CARD=\"$ALSA_CARD\"/" 
/target/etc/default/espeakup
+[ -z "$ALSA_CARD" ] || sed -i -e "s/^# ALSA_CARD=.*/ALSA_CARD=\"`cat 
/sys/class/sound/card$ALSA_CARD/id`\"/" /target/etc/default/espeakup
diff --git a/debian/espeakup-udeb.start b/debian/espeakup-udeb.start
index d187d77..2f5db6a 100644
--- a/debian/espeakup-udeb.start
+++ b/debian/espeakup-udeb.start
@@ -1,7 +1,15 @@
+BASE=/sys/class/sound
+
+strip () {
+   cardid=${1#$BASE/card}
+   echo ${cardid%/id}
+}
+
 if lsmod | grep -q speakup_soft; then
# Give drivers some time to detect boards :/
sleep 2
-   N=$(ls /sys/class/sound/card*/id | wc -l)
+   IDS=$(echo $BASE/card*/id)
+   N=$(echo $IDS | wc -w)
case $N in
0)
echo No sound card detected, can not do software speech 
synthesis... Press enter to continue anyway.
@@ -9,17 +17,18 @@ if lsmod | grep -q speakup_soft; then
;;
1)
# Just one card, can not be wrong
-   echo 0 > /var/run/espeakup.card
-   /usr/bin/espeakup > /var/log/espeakup.log 2>&1
+   echo $(strip $IDS) > /var/run/espeakup.card
+   /usr/bin/espeakup -V en > /var/log/espeakup.log 2>&1
;;
*)
# Several cards, make the user choose
CARD=none
while [ "$CARD" = none ]
do
-   for i in $( seq 0 $(($N-1)) )
+   for ID in $IDS
do
-   ALSA_CARD=$(cat 
/sys/class/sound/card$i/id) /usr/bin/espeakup >> /var/log/espeakup.log 2>&1
+   i=$(strip $ID)
+   ALSA_CARD=$(cat 
/sys/class/sound/card$i/id) /usr/bin/espeakup -V en >> /var/log/espeakup.log 
2>&1
while ! [ -r /var/run/espeakup.pid ]
do
sleep 0.1
@@ -41,6 +50,6 @@ if lsmod | grep -q speakup_soft; then
done
done
echo "$CARD" > /var/run/espeakup.card
-   ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
/usr/bin/espeakup >> /var/log/espeakup.log 2>&1
+   ALSA_CARD=$(cat /sys/class/sound/card$CARD/id) 
/usr/bin/espeakup -V en >> /var/log/espeakup.log 2>&1
esac
 fi