[debian-edu-commits] debian-edu/ 01/01: Drop /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert because gtick (metronome) is the only program still using esound, which is scheduled for removal from Buster. Also remove the line containing ESPEAKER in /etc/desktop-profiles/debian-edu-config.listing. (Closes: #870874)
Holger Levsen
holger at layer-acht.org
Mon Aug 7 17:23:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-config.
commit d1043929e543cda07a01b0035f1f9b9c2f7fce8f
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Aug 7 13:23:16 2017 -0400
Drop /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert because gtick (metronome) is the only program still using esound, which is scheduled for removal from Buster. Also remove the line containing ESPEAKER in /etc/desktop-profiles/debian-edu-config.listing. (Closes: #870874)
---
Makefile | 1 -
cf/cf.ltsp | 5 --
debian/changelog | 5 ++
debian/debian-edu-config.lintian-overrides | 2 -
debian/debian-edu-config.postinst | 7 ++
debian/debian-edu-config.postrm | 10 +--
debian/debian-edu-config.prerm | 6 --
etc/desktop-profiles/debian-edu-config.listing | 3 -
.../tools/debian-edu-ltsp-audiodivert | 83 ----------------------
9 files changed, 17 insertions(+), 105 deletions(-)
diff --git a/Makefile b/Makefile
index 2ac7b08..7b83d16 100644
--- a/Makefile
+++ b/Makefile
@@ -393,7 +393,6 @@ install: install-testsuite
share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
share/debian-edu-config/tools/migrate-squid-to-squid3 \
share/debian-edu-config/tools/ldap-server-getcert \
- share/debian-edu-config/tools/debian-edu-ltsp-audiodivert \
share/debian-edu-config/tools/exim4-create-cert \
share/debian-edu-config/tools/exim4-create-environment \
share/debian-edu-config/ltspfs-mounter-kde \
diff --git a/cf/cf.ltsp b/cf/cf.ltsp
index 19484d2..e9cf0fe 100644
--- a/cf/cf.ltsp
+++ b/cf/cf.ltsp
@@ -127,9 +127,4 @@ editfiles:
AppendIfNoSuchLine "RPCGSSDOPTS=-n"
}
-shellcommands:
- debian.thirdpass.ltspserver::
- # Divert some binaries to get them working with Pulseaudio or
- # ESD on thin clients.
- "/usr/sbin/debian-edu-ltsp-audiodivert create"
diff --git a/debian/changelog b/debian/changelog
index 9591e0a..c5b84c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ debian-edu-config (1.931) UNRELEASED; urgency=medium
share/debian-edu-config/d-i/pre-pkgsel instead. Thanks to Michael Biebl
for the bug report and patch! (Closes: #866587)
* Bump Standards-Version to 4.0.1, change priority from extra to optional.
+ * Drop /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert
+ because gtick (metronome) is the only program still using esound, which
+ is scheduled for removal from Buster. Also remove the line containing
+ ESPEAKER in /etc/desktop-profiles/debian-edu-config.listing.
+ (Closes: #870874)
-- Holger Levsen <holger at debian.org> Sat, 05 Aug 2017 17:37:04 -0400
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index aeef4eb..680436b 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -4,8 +4,6 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/h
debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
debian-edu-config binary: command-with-path-in-maintainer-script postinst:86 /usr/bin/etckeeper
debian-edu-config binary: command-with-path-in-maintainer-script postinst:286 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postrm:18 /usr/sbin/debian-edu-ltsp-audiodivert
-debian-edu-config binary: command-with-path-in-maintainer-script prerm:18 /usr/sbin/debian-edu-ltsp-audiodivert
debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 9ba1406..2956682 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -192,6 +192,13 @@ if [ -h /etc/exim4/exim4.conf ] && [ -x /etc/init.d/exim4 ] ; then
fi
fi
+# cleanup from debian-edu-ltsp-audiodivert
+if dpkg --compare-versions "$2" le "1.931~" && if [ -f /usr/bin/gtick.ltsp ] ; then
+ rm /usr/bin/gtick
+ dpkg-divert --package debian-edu-config --rename --remove /usr/bin/gtick
+ rm /usr/bin/gtick.ltsp
+fi
+
# Make sure KDE screen unlocking work on diskless workstations
# (Skolelinux bug #1415).
ltsparch="$(ltsp-arch-debian-edu)"
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index 16783ed..0128423 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -12,11 +12,11 @@ case "$1" in
/etc/init.d/enable-nat stop || exit $?
fi
fi
-
- # Remove diverts before removing the package
- if [ remove = "$1" ] \
- && [ -x /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert ] ; then
- /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert remove
+ # cleanup from debian-edu-ltsp-audiodivert
+ if dpkg --compare-versions "$2" le "1.931~" && if [ -f /usr/bin/gtick.ltsp ] ; then
+ rm /usr/bin/gtick
+ dpkg-divert --package debian-edu-config --rename --remove /usr/bin/gtick
+ rm /usr/bin/gtick.ltsp
fi
;;
purge)
diff --git a/debian/debian-edu-config.prerm b/debian/debian-edu-config.prerm
index ba526f0..e4effb4 100644
--- a/debian/debian-edu-config.prerm
+++ b/debian/debian-edu-config.prerm
@@ -12,12 +12,6 @@ case "$1" in
/etc/init.d/enable-nat stop || exit $?
fi
fi
-
- # Remove diverts before removing the package
- if [ remove = "$1" ] \
- && [ -x /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert ] ; then
- /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert remove
- fi
if [ remove = "$1" ] && [ -e /usr/share/pam-configs/edu-nopwdchange ]; then
rm /usr/share/pam-configs/edu-nopwdchange
fi
diff --git a/etc/desktop-profiles/debian-edu-config.listing b/etc/desktop-profiles/debian-edu-config.listing
index 31df20a..e1b8cdd 100644
--- a/etc/desktop-profiles/debian-edu-config.listing
+++ b/etc/desktop-profiles/debian-edu-config.listing
@@ -15,8 +15,5 @@ edu-common;KDE;/usr/share/debian-edu/common;0;;Settings common to all debian-edu
# (assumption: libpam-ldap or nslcd is installed = in debian-edu network)
edu-net-kde3;KDE;/usr/share/debian-edu/networked-kde3;10;$([ -f /etc/pam_ldap.conf ] || [ -f /etc/nslcd.conf ]);For kde3-machines in debian-edu network
-# Settings for the thin clients, to enable esd sound
-edu-ltsp;KDE;/usr/share/debian-edu/thin-client;20;$([ "$LTSP_CLIENT" ] && [ "$ESPEAKER" ]);Settings common to all debian-edu LTSP clients
-
# eye candy and restrictions for the student desktops
edu-students;KDE;/usr/share/debian-edu/students;30;students;Settings for the students
diff --git a/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert b/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert
deleted file mode 100755
index 079d386..0000000
--- a/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# Divert some binaries that try to use /dev/dsp, which fail to work
-# with LTSP and need a wrapper to divert the audio to pulseaudio or
-# esd.
-
-set -e
-
-# FIXME Review program list and follow up on bug reports asking for
-# PulseAudio and ESpeaker support.
-programs="/usr/bin/gtick"
-divertowner=debian-edu-config
-
-create_diverts() {
- for cmd in $programs ; do
- if [ -x "$cmd" ] && [ ! -x "$cmd.ltsp" ] ; then
- cat <<EOF > "$cmd.ltsp"
-#!/bin/sh
-wrapper=""
-if [ "\$LTSP_CLIENT" ] ; then
- if [ "\$PULSE_SERVER" ] && [ -x /usr/bin/padsp ] ; then
- # PulseAudio using padsp from pulseaudio-utils
- wrapper=padsp
- elif [ "\$ESPEAKER" ] && [ -x /usr/bin/esddsp ] ; then
- # ESD using espdsp from esound-clients
- wrapper=espdsp
- fi
-fi
-exec \$wrapper "$cmd.distrib" "\$@"
-EOF
-
- chmod 755 "$cmd.ltsp"
-
- dpkg-divert --package $divertowner --rename --add "$cmd"
- basename=$(basename "$cmd")
- ln -s "$basename.ltsp" "$cmd"
- fi
- done
-}
-
-remove_diverts() {
- for cmd in $programs ; do
- if [ -f $cmd.ltsp ] ; then
- rm $cmd
- dpkg-divert --package $divertowner --rename --remove $cmd
- rm $cmd.ltsp
- fi
- done
-}
-
-usage() {
- cat <<EOF
-Usage: $0 < create | remove >
-
-Implement diverted binaries for selected binaries to make sure
-applications using OSS (/dev/dsp) work with Pulseaudio and ESD.
-
-create will add the diverted binaries, while remove will take away the
-diversions.
-
-Currently handled binaries are (active diverts are marked with *):
-EOF
- for cmd in $programs; do
- if [ -x "$cmd.distrib" ] ; then
- printf "%s(*) " "$cmd"
- else
- printf "%s " "$cmd"
- fi
- done
- echo
-}
-
-case "$1" in
- create)
- create_diverts
- ;;
- remove)
- remove_diverts
- ;;
- *)
- usage
- ;;
-esac
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list