Checkbox

Merge lp:~bladernr/checkbox/1078837-update-alsa_info into lp:checkbox

  1. 1078837-update-alsa_info
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1825
Merged at revision: 1825
Proposed branch: lp:~bladernr/checkbox/1078837-update-alsa_info
Merge into: lp:checkbox
Diff against target: 135 lines (+23/-10)
2 files modified
debian/changelog (+3/-1)
scripts/alsa_info (+20/-9)
To merge this branch: bzr merge lp:~bladernr/checkbox/1078837-update-alsa_info
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+134503@code.launchpad.net

Description of the change

Simple update of alsa_info script to the latest version from alsa.org.

Also, updated changelog using dch -m. lets see if THAT avoids conflicts.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Heh, the maintainer line was still modified, but I see no conflicts so hopefully it's safe to approve this and let Tarmac handle things. +1 on updating alsa_info, the changes seem pretty minimal anyway. Thanks!

review: Approve
Revision history for this message
Jeff Lane  (bladernr) wrote :

ah HAH! dch -t seems to do the job without changing the maintainer line at all.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-13 14:36:37 +0000
+++ debian/changelog 2012-11-15 16:29:25 +0000
@@ -145,8 +145,10 @@
145 less than minvol, not when equal to either. (LP: #1077008)145 less than minvol, not when equal to either. (LP: #1077008)
146 * Added root user requirement to all jobs using removable storage test 146 * Added root user requirement to all jobs using removable storage test
147 (LP: #1014813)147 (LP: #1014813)
148 * scripts/alsa_info - updated script to latest version available
149 (LP: #1078837)
148150
149 -- Jeff Lane <jeff@ubuntu.com> Wed, 07 Nov 2012 17:33:46 -0500151 -- Jeff Lane <jeff@ubuntu.com> Thu, 15 Nov 2012 10:50:03 -0500
150152
151checkbox (0.14.6) quantal; urgency=low153checkbox (0.14.6) quantal; urgency=low
152154
153155
=== modified file 'scripts/alsa_info'
--- scripts/alsa_info 2012-06-01 20:15:44 +0000
+++ scripts/alsa_info 2012-11-15 16:29:25 +0000
@@ -1,6 +1,6 @@
1#!/bin/bash1#!/bin/bash
22
3SCRIPT_VERSION=0.4.603SCRIPT_VERSION=0.4.61
4CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"4CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
55
6#################################################################################6#################################################################################
@@ -111,7 +111,7 @@
111111
112withaplay() {112withaplay() {
113 echo "!!Aplay/Arecord output" >> $FILE113 echo "!!Aplay/Arecord output" >> $FILE
114 echo "!!------------" >> $FILE114 echo "!!--------------------" >> $FILE
115 echo "" >> $FILE115 echo "" >> $FILE
116 echo "APLAY" >> $FILE116 echo "APLAY" >> $FILE
117 echo "" >> $FILE 117 echo "" >> $FILE
@@ -149,7 +149,7 @@
149149
150withalsactl() {150withalsactl() {
151 echo "!!Alsactl output" >> $FILE151 echo "!!Alsactl output" >> $FILE
152 echo "!!-------------" >> $FILE152 echo "!!--------------" >> $FILE
153 echo "" >> $FILE153 echo "" >> $FILE
154 exe=""154 exe=""
155 if [ -x /usr/sbin/alsactl ]; then155 if [ -x /usr/sbin/alsactl ]; then
@@ -244,7 +244,7 @@
244244
245withdmesg() {245withdmesg() {
246 echo "!!ALSA/HDA dmesg" >> $FILE246 echo "!!ALSA/HDA dmesg" >> $FILE
247 echo "!!------------------" >> $FILE247 echo "!!--------------" >> $FILE
248 echo "" >> $FILE248 echo "" >> $FILE
249 dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE249 dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
250 echo "" >> $FILE250 echo "" >> $FILE
@@ -416,6 +416,7 @@
416PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)416PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
417ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)417ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
418JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)418JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
419ROARINST=$(which roard 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
419DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)420DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
420421
421#Check for DMI data422#Check for DMI data
@@ -424,10 +425,12 @@
424 DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)425 DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
425 DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)426 DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
426 DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)427 DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)
428 DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null)
427elif [ -x $DMIDECODE ]; then429elif [ -x $DMIDECODE ]; then
428 DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)430 DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
429 DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)431 DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
430 DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)432 DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)
433 DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null)
431fi434fi
432435
433cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp436cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
@@ -469,6 +472,7 @@
469echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE472echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE
470echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE473echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
471echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE474echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE
475echo "Firmware Version: $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE
472echo "" >> $FILE476echo "" >> $FILE
473echo "" >> $FILE477echo "" >> $FILE
474echo "!!Kernel Information" >> $FILE478echo "!!Kernel Information" >> $FILE
@@ -526,7 +530,14 @@
526echo " Running - $JACKRUNNING" >> $FILE530echo " Running - $JACKRUNNING" >> $FILE
527echo "" >> $FILE531echo "" >> $FILE
528fi532fi
529if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" ]];then533if [[ -n $ROARINST ]];then
534[[ `pgrep '^(.*/)?roard$'` ]] && ROARRUNNING="Yes" || ROARRUNNING="No"
535echo "RoarAudio:" >> $FILE
536echo " Installed - Yes ($ROARINST)" >> $FILE
537echo " Running - $ROARRUNNING" >> $FILE
538echo "" >> $FILE
539fi
540if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" && -z "$ROARINST" ]];then
530echo "No sound servers found." >> $FILE541echo "No sound servers found." >> $FILE
531echo "" >> $FILE542echo "" >> $FILE
532fi543fi
@@ -544,7 +555,7 @@
544echo "" >> $FILE555echo "" >> $FILE
545echo "" >> $FILE556echo "" >> $FILE
546echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE557echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE
547echo "!!--------------------------------------------------------" >> $FILE558echo "!!-------------------------------------------------------" >> $FILE
548echo "" >> $FILE559echo "" >> $FILE
549lspci -vvn |grep -A1 040[1-3] >> $FILE560lspci -vvn |grep -A1 040[1-3] >> $FILE
550echo "" >> $FILE561echo "" >> $FILE
@@ -563,7 +574,7 @@
563if [ -d "$SYSFS" ]574if [ -d "$SYSFS" ]
564then575then
565echo "!!Loaded sound module options" >> $FILE576echo "!!Loaded sound module options" >> $FILE
566echo "!!--------------------------" >> $FILE577echo "!!---------------------------" >> $FILE
567echo "" >> $FILE578echo "" >> $FILE
568for mod in `cat /proc/asound/modules|awk {'print $2'}`;do579for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
569echo "!!Module: $mod" >> $FILE580echo "!!Module: $mod" >> $FILE
@@ -591,7 +602,7 @@
591if [ -s "$TEMPDIR/alsa-ac97.tmp" ]602if [ -s "$TEMPDIR/alsa-ac97.tmp" ]
592then603then
593 echo "!!AC97 Codec information" >> $FILE604 echo "!!AC97 Codec information" >> $FILE
594 echo "!!---------------------------" >> $FILE605 echo "!!----------------------" >> $FILE
595 echo "--startcollapse--" >> $FILE606 echo "--startcollapse--" >> $FILE
596 echo "" >> $FILE607 echo "" >> $FILE
597 cat $TEMPDIR/alsa-ac97.tmp >> $FILE608 cat $TEMPDIR/alsa-ac97.tmp >> $FILE
@@ -605,7 +616,7 @@
605if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]616if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]
606then617then
607 echo "!!USB Mixer information" >> $FILE618 echo "!!USB Mixer information" >> $FILE
608 echo "!!---------------------------" >> $FILE619 echo "!!---------------------" >> $FILE
609 echo "--startcollapse--" >> $FILE620 echo "--startcollapse--" >> $FILE
610 echo "" >> $FILE621 echo "" >> $FILE
611 cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE622 cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE

Subscribers

People subscribed via source and target branches