[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils/debian/patches (3 files)

[Thomas Hood]

    Date: Monday, September 6, 2004 @ 14:23:18
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian/patches

   Added: 90_debian_alsaconf_idmode.dpatch
Modified: 00list 90_debian_alsaconf.dpatch

Split out change of alsa_gid and alsa_mode into separate patch 90_debian_alsaconf_idmode


----------------------------------+
 00list                           |    1 +
 90_debian_alsaconf.dpatch        |   11 +----------
 90_debian_alsaconf_idmode.dpatch |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 10 deletions(-)


Index: debian/alsa-utils/debian/patches/00list
diff -u debian/alsa-utils/debian/patches/00list:1.6 debian/alsa-utils/debian/patches/00list:1.7
--- debian/alsa-utils/debian/patches/00list:1.6	Mon Sep  6 14:11:53 2004
+++ debian/alsa-utils/debian/patches/00list	Mon Sep  6 14:23:18 2004
@@ -1,5 +1,6 @@
 10_move_asound_state_to_var
 20_alsaconf_lspci
 90_debian_alsaconf
+90_debian_alsaconf_idmode
 90_debian_alsaconf_cfgfile
 91_debian_alsaconf_noclear
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.6 debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.7
--- debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.6	Mon Sep  6 14:11:53 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch	Mon Sep  6 14:23:18 2004
@@ -27,8 +27,8 @@
 
 @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 22:06:06.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:07:16.000000000 +0200
+--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:14:13.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:14:53.000000000 +0200
 @@ -40,13 +40,6 @@
    distribution="unknown"
  fi
@@ -43,17 +43,6 @@
  usage() {
      echo "ALSA configurator version $version"
      echo "usage: alsaconf [options]"
-@@ -79,8 +72,8 @@
- use_modinfo_db=0
- do_logging=0
- alsa_uid=0
--alsa_gid=0
--alsa_mode=0666
-+alsa_gid=29
-+alsa_mode=0660
- legacy_probe_card=""
- LOGFILE="/tmp/alsaconf.log"
- TESTSOUND="@TESTSOUND@"
 @@ -506,7 +499,7 @@
  /^[<literal space><literal tab>]*PCI: /{
  	gsub(/0x/, "");
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch
diff -u /dev/null debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch:1.1
--- /dev/null	Mon Sep  6 14:23:19 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_idmode.dpatch	Mon Sep  6 14:23:18 2004
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+## 90_debian_alsaconf_idmode.dpatch by  <jdthood@yahoo.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@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 22:15:36.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:16:09.000000000 +0200
+@@ -72,8 +72,8 @@
+ use_modinfo_db=0
+ do_logging=0
+ alsa_uid=0
+-alsa_gid=0
+-alsa_mode=0666
++alsa_gid=29
++alsa_mode=0660
+ legacy_probe_card=""
+ LOGFILE="/tmp/alsaconf.log"
+ TESTSOUND="@TESTSOUND@"