[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils/debian/patches (1 file)

[Thomas Hood]

    Date: Tuesday, September 7, 2004 @ 00:59:14
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian/patches

Modified: 91_debian_alsaconf_noclear.dpatch

Change noclear patch


-----------------------------------+
 91_debian_alsaconf_noclear.dpatch |   50 ++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 8 deletions(-)


Index: debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch
diff -u debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.1 debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.2
--- debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.1	Mon Sep  6 06:28:51 2004
+++ debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch	Tue Sep  7 00:59:14 2004
@@ -24,16 +24,63 @@
 
 @DPATCH@
 diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 12:45:25.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 12:45:59.000000000 +0200
-@@ -67,6 +60,11 @@
-     exit 1
+--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-07 08:54:07.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-07 08:58:43.000000000 +0200
+@@ -317,10 +317,20 @@
+ " 17 60 || acex 0
  }
  
-+clear() {
-+	# Run the real clear command here if you prefer to hide error messages
-+	echo
++clearscreen() {
++    # Do a clear here if you prefer
++    echo
 +}
 +
- OPTS=`getopt -o lmLhp:Pu:g:d:rs: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound -n alsaconf -- "$@"` || exit 1
- eval set -- "$OPTS"
+ # Exit function
+ acex() {
+   cleanup
+-  clear
++  if [ "$1" = 0 ] ; then
++      clearscreen
++  else
++      # Don't clear error messages
++      echo
++  fi
+   exit $1
+ }
+ 
+@@ -549,7 +559,7 @@
+     $DIALOG --yesno "
+ Configuring $CARD_DRIVER
+ Do you want to modify ${addcfg}?" 8 50 || acex 0
+-    clear
++    clearscreen
+ 
+     # Copy conf.modules and make changes.
+     ACB="# --- BEGIN: Generated by ALSACONF, do not edit. ---"
+@@ -631,7 +641,7 @@
+     fi
+ 
+     farewell "OK, driver $CARD_DRIVER is configured."
+-    clear
++    clearscreen
+     if [ "$distribution" = "gentoo" ]; then
+       echo Running modules-update...
+       modules-update
+@@ -658,7 +668,7 @@
+           and look if you can hear test sound.
+ " 13 65 
+       then
+-          clear
++          clearscreen
+ 	  echo
+ 	  aplay $TESTSOUND
+       fi
+@@ -667,7 +677,7 @@
+ 	echo "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
+ 	$sbindir/alsactl store
+     fi
+-    clear
++    clearscreen
+     cat <<END
+ ===============================================================================
+