Bug#771607: unblock: brltty/5.2~20141018-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
unblock brltty/5.2~20141018-3
unblock espeakup/1:0.71-19
Hello,
As it seems that Jessie will install the gnome desktop by default, I
would like to upload the attached changes. The idea is that the most
accessible desktop we have in Debian is MATE, so the attached changes
make MATE the default desktop instead of gnome when either braille or
software speech was used during installation, while still allowing
normal preseed to override it. Do debian-boot and debian-release agree
with this?
Samuel
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.17.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
commit 7f87d43be214c27efcf9db80f2e803a3dbad51d1
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 1 00:35:26 2014 +0100
brltty-udeb.sh: Preseed installing MATE desktop by default when brltty is used in d-i
diff --git a/debian/brltty-udeb.postinst b/debian/brltty-udeb.postinst
new file mode 100644
index 0000000..5e65678
--- /dev/null
+++ b/debian/brltty-udeb.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -n "$(debconf-get tasksel/desktop)" ] || debconf-set-selections /usr/share/brltty-udeb/mate-preseed.cfg
+exit 0
diff --git a/debian/changelog b/debian/changelog
index 53f192b..c72c61b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+brltty (5.2~20141018-3) UNRELEASED; urgency=medium
+
+ * brltty-udeb.sh: Preseed installing MATE desktop by default when brltty is
+ used in d-i.
+
+ -- Samuel Thibault <sthibault@debian.org> Sat, 22 Nov 2014 01:24:45 +0100
+
brltty (5.2~20141018-2) unstable; urgency=medium
* patches/git-a7123d7: Fix brlapi output with the NoScreen screen driver.
diff --git a/debian/control b/debian/control
index 2fc2a81..ddcd343 100644
--- a/debian/control
+++ b/debian/control
@@ -202,9 +202,10 @@ Package: brltty-udeb
Architecture: any
Package-Type: udeb
Section: debian-installer
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, preseed-common
Description: Access software for a blind person using a braille display
This is a small version of brltty, optimized for use on install media.
+XB-Installer-Menu-Item: 1050
Package: brltty-x11
Architecture: any
diff --git a/debian/mate-preseed.cfg b/debian/mate-preseed.cfg
new file mode 100644
index 0000000..87113cb
--- /dev/null
+++ b/debian/mate-preseed.cfg
@@ -0,0 +1 @@
+tasksel tasksel/desktop multiselect mate
diff --git a/debian/rules b/debian/rules
index 591a6ff..b702459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,6 +240,8 @@ brltty-udeb: build-udeb
chmod +x debian/$@/lib/udev/brltty.sh
cp debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh
chmod +x debian/$@/lib/brltty/brltty.sh
+ mkdir -p debian/$@/usr/share/brltty-udeb
+ cp debian/mate-preseed.cfg debian/$@/usr/share/brltty-udeb/mate-preseed.cfg
dh_strip -p$@
dh_fixperms -p$@
dh_installdeb -p$@
@@ -247,7 +249,7 @@ brltty-udeb: build-udeb
dh_gencontrol -p$@
# Check that we didn't accidentally link against something outside of
# d-i world
- grep Depends: debian/brltty-udeb/DEBIAN/control | perl -ne 'map {unless (/-udeb/) {print $$_; exit 1}} split /,/'
+ grep Depends: debian/brltty-udeb/DEBIAN/control | perl -ne 'map {unless (/-udeb/ or /^ ?preseed-common$$/) {print $$_; exit 1}} split /,/'
dh_builddeb -p$@
.PHONY: brltty brltty-udeb build build-indep build-arch build-brltty build-udeb clean binary-indep binary-arch binary
commit 42985d7db76cf4ae4f3b193be549bdb855044ce3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 1 00:35:18 2014 +0100
espeakup-udeb.sh: Preseed installing MATE desktop by default when espeakup is used in d-i
diff --git a/debian/changelog b/debian/changelog
index 33a39f0..03d9f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+espeakup (1:0.71-19) UNRELEASED; urgency=medium
+
+ * espeakup-udeb.sh: Preseed installing MATE desktop by default when espeakup
+ is used in d-i.
+
+ -- Samuel Thibault <sthibault@debian.org> Sun, 30 Nov 2014 23:23:28 +0100
+
espeakup (1:0.71-18) unstable; urgency=medium
* synth.c: Fix spelling capital keystrokes (Closes: #770753)
diff --git a/debian/control b/debian/control
index 5bc3a28..b8e4c45 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: espeakup-udeb
Section: debian-installer
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, espeak-data-udeb (>= ${espeak:Version}~), espeak-data-udeb (<< ${espeak:Version}A), libkmod2-udeb (>= 17-1~) [linux-any], alsa-utils-udeb [linux-any], libnss-files-udeb
+Depends: ${shlibs:Depends}, ${misc:Depends}, espeak-data-udeb (>= ${espeak:Version}~), espeak-data-udeb (<< ${espeak:Version}A), libkmod2-udeb (>= 17-1~) [linux-any], alsa-utils-udeb [linux-any], libnss-files-udeb, preseed-common
Description: Configure the speech synthesizer voice
This is a statically linked version of espeakup, optimized for use on
installation media.
diff --git a/debian/espeakup-udeb.install b/debian/espeakup-udeb.install
index 47fc967..e39d715 100644
--- a/debian/espeakup-udeb.install
+++ b/debian/espeakup-udeb.install
@@ -1,2 +1,3 @@
espeakup-udeb/espeakup /usr/bin
debian/espeakup.default /usr/share/espeakup-udeb
+debian/mate-preseed.cfg /usr/share/espeakup-udeb
diff --git a/debian/espeakup-udeb.postinst b/debian/espeakup-udeb.postinst
index 5f03a79..9dd73c5 100644
--- a/debian/espeakup-udeb.postinst
+++ b/debian/espeakup-udeb.postinst
@@ -1,4 +1,5 @@
#!/bin/sh
. /usr/share/debconf/confmodule
+[ -n "$(debconf-get tasksel/desktop)" ] || debconf-set-selections /usr/share/espeakup-udeb/mate-preseed.cfg
db_get debian-installer/locale
/usr/lib/espeakup/espeakup.restart "$RET"
diff --git a/debian/mate-preseed.cfg b/debian/mate-preseed.cfg
new file mode 100644
index 0000000..87113cb
--- /dev/null
+++ b/debian/mate-preseed.cfg
@@ -0,0 +1 @@
+tasksel tasksel/desktop multiselect mate
Reply to: