From 65eedce6095822e21447fd8a276799f1bbc0d021 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 7 Nov 2011 14:13:11 +0100 Subject: [PATCH] drop XF86Audio{LowerVolume,Mute,RaiseVolume} scripts [Closes: issue626] they don't work on recent hardware reliably anymore and would require a rewrite anyway... --- debian/rules | 5 +---- manpages/grml-scripts.1 | 6 ------ usr_bin/XF86AudioLowerVolume | 26 -------------------------- usr_bin/XF86AudioMute | 36 ------------------------------------ usr_bin/XF86AudioRaiseVolume | 26 -------------------------- 5 files changed, 1 insertion(+), 98 deletions(-) delete mode 100755 usr_bin/XF86AudioLowerVolume delete mode 100755 usr_bin/XF86AudioMute delete mode 100755 usr_bin/XF86AudioRaiseVolume diff --git a/debian/rules b/debian/rules index 844f5ee..a7b972d 100755 --- a/debian/rules +++ b/debian/rules @@ -92,10 +92,7 @@ binary-arch: build install /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/soundtest.1.gz \ /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/unblacklist.1.gz \ /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/vmware-detect.1.gz \ - /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/wm-ng.1.gz \ - /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/XF86AudioLowerVolume.1.gz \ - /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/XF86AudioMute.1.gz \ - /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/XF86AudioRaiseVolume.1.gz + /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/wm-ng.1.gz dh_strip dh_compress mkdir -p $(CURDIR)/debian/grml-scripts/usr/share/lintian/overrides/ diff --git a/manpages/grml-scripts.1 b/manpages/grml-scripts.1 index 9e904d5..3e08a0e 100644 --- a/manpages/grml-scripts.1 +++ b/manpages/grml-scripts.1 @@ -61,12 +61,6 @@ Symlink to notifyd.py Listen for incoming messages on a specific port and print them via specific handlers (per default via libnotify). .SS soundtest Legacy wrapper for speaker-test. -.SS XF86AudioLowerVolume -Lower audio volume. -.SS XF86AudioMute -Mute and - if run again - restore audio settings. -.SS XF86AudioRaiseVolume -Raise audio volume. .SH "ADMIN SCRIPTS" diff --git a/usr_bin/XF86AudioLowerVolume b/usr_bin/XF86AudioLowerVolume deleted file mode 100755 index 3ba0972..0000000 --- a/usr_bin/XF86AudioLowerVolume +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Filename: XF86AudioLowerVolume -# Purpose: lower audio volume -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -. /etc/grml/lsb-functions - -aumix -v -5 ; RC=$? - -if ! [ "$RC" = 0 ] ; then - eend "Error running 'aumix -v -5'" ; eend 1 -fi - -VOLUME=$(aumix -q | awk -F, '/vol/ {print $2}') - -if [ -n "$DISPLAY" ] ; then - einfo "Lowered audio volume to${VOLUME}" ; eend $? - osd_cat -b percentage -P $VOLUME -d 2 -c orange -A center -p middle -else - einfo "Lowered audio volume to${VOLUME}" ; eend $? -fi - -## END OF FILE ################################################################# diff --git a/usr_bin/XF86AudioMute b/usr_bin/XF86AudioMute deleted file mode 100755 index a68cbef..0000000 --- a/usr_bin/XF86AudioMute +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Filename: XF86AudioMute -# Purpose: mute and restore audio settings -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -. /etc/grml/lsb-functions - -UNMUT="Sound unmuted" -MUT="Sound muted" - -if [ -f ~/.aumixtmp ] ; then - amixer set PCM unmute &>/dev/null ; RC=$? - if [ -n "$DISPLAY" ] ; then - einfo "$UNMUT" ; eend $? - echo "$UNMUT" | \ - osd_cat --delay=2 -c orange -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" - else - einfo "$UNMUT" ; eend $RC - fi - rm -f ~/.aumixtmp -else - touch ~/.aumixtmp - amixer set PCM mute &>/dev/null ; RC=$? - if [ -n "$DISPLAY" ] ; then - einfo "$MUT" ; eend $RC - echo "$MUT" | \ - osd_cat --delay=2 -c orange -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" - else - einfo "$MUT" ; eend $RC - fi -fi - -## END OF FILE ################################################################# diff --git a/usr_bin/XF86AudioRaiseVolume b/usr_bin/XF86AudioRaiseVolume deleted file mode 100755 index 1eacab6..0000000 --- a/usr_bin/XF86AudioRaiseVolume +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Filename: XF86AudioRaiseVolume -# Purpose: raise audio volume -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -. /etc/grml/lsb-functions - -aumix -v +5 ; RC=$? - -if ! [ "$RC" = 0 ] ; then - eend "Error running 'aumix -v +5'" ; eend 1 -fi - -VOLUME=$(aumix -q | awk -F, '/vol/ {print $2}') - -if [ -n "$DISPLAY" ] ; then - einfo "Raised audio volume to${VOLUME}" ; eend $? - osd_cat -b percentage -P $VOLUME -d 2 -c orange -A center -p middle -else - einfo "Raised audio volume to${VOLUME}" ; eend $RC -fi - -## END OF FILE ################################################################# -- 2.1.4