[alsa-devel] [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules

[Elimar Riesebieter]

* Elimar Riesebieter <riesebie at lxtec.de> [2013-05-30 15:28 +0200]:

> * Elimar Riesebieter <riesebie at lxtec.de> [2013-05-30 15:08 +0200]:
> 
> > Hi all,
> > 
> > [0] tells:
> > alsactl: remove 90-alsa-restore.rules from the tar ball
> > 
> > but it still ships 90-alsa-restore.rules.in and installs the file as
> > 90-alsa-restore.rules
> > 
> > [0] http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1
> > 
> [...]
> > -90-alsa-restore.rules: 90-alsa-restore.rules.in
> >  	$(edit)
>    ^^^^^^^^
> Should be removed as well

Forgot two backslashes...

Signed-off-by: Elimar Riesebieter <riesebie at lxtec.de>
---
 alsactl/90-alsa-restore.rules.in |    8 --------
 alsactl/Makefile.am              |   11 ++---------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
deleted file mode 100644
index 88e12e0..0000000
--- a/alsactl/90-alsa-restore.rules.in
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go"
-GOTO="alsa_restore_end"
-
-LABEL="alsa_restore_go"
-TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}"
-TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}"
-
-LABEL="alsa_restore_end"
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index bac84eb..b933ce9 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c
 alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\"
 noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
 
-udevrules_DATA = \
-	90-alsa-restore.rules
 
 if HAVE_SYSTEMD
 
@@ -49,20 +47,15 @@ alsa-restore.service: alsa-restore.service.in
 alsa-store.service: alsa-store.service.in
 	$(edit)
 
-90-alsa-restore.rules: 90-alsa-restore.rules.in
-	$(edit)
-
 EXTRA_DIST += \
 	alsa-state.service.in \
 	alsa-restore.service.in \
-	alsa-store.service.in \
-	90-alsa-restore.rules.in
+	alsa-store.service.in
 
 CLEANFILES = \
 	alsa-state.service \
 	alsa-restore.service \
-	alsa-store.service \
-	90-alsa-restore.rules
+	alsa-store.service
 
 %.7: %.xml
 	xmlto man $?