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

[Jordi Mallach]

    Date: Saturday, July 10, 2004 @ 17:04:49
  Author: jordi
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian

Modified: changelog control dirs patches/90_debian_alsaconf.dpatch rules

Fix the alsaconf bug and a few more that were starting to rot.


-----------------------------------+
 changelog                         |   16 ++++++++++++++++
 control                           |    1 -
 dirs                              |    1 -
 patches/90_debian_alsaconf.dpatch |    4 ++--
 rules                             |   17 ++++++++---------
 5 files changed, 26 insertions(+), 13 deletions(-)


Index: debian/alsa-utils/debian/changelog
diff -u debian/alsa-utils/debian/changelog:1.30 debian/alsa-utils/debian/changelog:1.31
--- debian/alsa-utils/debian/changelog:1.30	Wed Jun  9 17:52:56 2004
+++ debian/alsa-utils/debian/changelog	Sat Jul 10 17:04:49 2004
@@ -1,3 +1,19 @@
+alsa-utils (1.0.5-2) unstable; urgency=low
+
+  * Jordi Mallach:
+    - debian/patches/90_debian_alsaconf.dpatch: update config file
+      location (closes: #256698). Thanks, Fabio Massimo Di Nitto.
+    - debian/control: don't suggest alsadriver, which isn't provided
+      by anything anymore (closes: #258606).
+    - debian/rules:
+      + apply patch from Mikael Magnusson to apply patches before
+        configure, to assure alsaconf.in gets the patches applied
+        on time. Thanks! (closes: #257753).
+      + don't set sysconfdir to /etc/alsa/0.9 anymore.
+    - debian/dirs: remove etc/alsa/0.9 (closes: #254360).
+
+ -- Jordi Mallach <jordi@debian.org>  Sun, 11 Jul 2004 00:36:25 +0200
+
 alsa-utils (1.0.5-1) unstable; urgency=low
 
   * New upstream release.
Index: debian/alsa-utils/debian/control
diff -u debian/alsa-utils/debian/control:1.11 debian/alsa-utils/debian/control:1.12
--- debian/alsa-utils/debian/control:1.11	Wed Jun  9 17:52:56 2004
+++ debian/alsa-utils/debian/control	Sat Jul 10 17:04:49 2004
@@ -8,7 +8,6 @@
 
 Package: alsa-utils
 Architecture: any
-Suggests: alsadriver
 Depends: ${shlibs:Depends}, dialog | whiptail, modutils (>= 2.3.5-1) | module-init-tools, alsa-base (>= 1.0.4), pciutils (>= 1:2.1.11-4)
 Provides: audio-mixer, alsautils, alsaconf
 Conflicts: alsautils (<< 0.5), alsa-utils-0.5, alsaconf, alsa-base-0.4, alsaconf-0.4
Index: debian/alsa-utils/debian/dirs
diff -u debian/alsa-utils/debian/dirs:1.2 debian/alsa-utils/debian/dirs:1.3
--- debian/alsa-utils/debian/dirs:1.2	Thu Feb 26 16:30:33 2004
+++ debian/alsa-utils/debian/dirs	Sat Jul 10 17:04:49 2004
@@ -1,4 +1,3 @@
-etc/alsa/0.9
 usr/share/alsa-base
 usr/sbin
 var/lib/alsa
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.3 debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.4
--- debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.3	Tue Apr 13 13:45:38 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch	Sat Jul 10 17:04:49 2004
@@ -1,9 +1,10 @@
 #!/bin/sh -e
-## 80_debian_alsaconf.dpatch by David B Harris <dbharris@debian.org>
+## 90_debian_alsaconf.dpatch by Jordi Mallach <jordi@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Set Debian-specific GID and permissions for ALSA devices.
 ## DP: Use hardcoded paths for lspci and lsmod
+## DP: Write the configuration in the correct location.
 
 
 if [ $# -ne 1 ]; then
@@ -58,7 +59,7 @@
    cfgfile="/etc/modprobe.conf"
  elif [ "$distribution" = "debian" ]; then
 -  cfgfile="/etc/alsa/modutils/0.9"
-+  cfgfile="/etc/alsa/modutils/1.0"
++  cfgfile="/etc/modutils/alsa-base"
  elif [ -e /etc/modules.conf ]; then
    cfgfile="/etc/modules.conf"
  elif [ -e /etc/conf.modules ]; then
Index: debian/alsa-utils/debian/rules
diff -u debian/alsa-utils/debian/rules:1.1 debian/alsa-utils/debian/rules:1.2
--- debian/alsa-utils/debian/rules:1.1	Sun Feb  8 16:14:34 2004
+++ debian/alsa-utils/debian/rules	Sat Jul 10 17:04:49 2004
@@ -16,7 +16,7 @@
 endif
 
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 
@@ -28,29 +28,28 @@
 		    --mandir=\$${prefix}/share/man \
 		    --infodir=\$${prefix}/share/info \
 		    --host=$(DEB_HOST_GNU_TYPE) \
-		    --build=$(DEB_BUILD_GNU_TYPE) \
-		    --sysconfdir=/etc/alsa/0.9/
+		    --build=$(DEB_BUILD_GNU_TYPE)
 
 	touch configure-stamp
 
-build: patch-stamp configure-stamp build-stamp
-build-stamp: 
+build: configure-stamp build-stamp
+build-stamp:
 	$(MAKE) CFLAGS='$(CFLAGS)'
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_clean
-	
+
 	-$(MAKE) distclean
 	-rm -f version
-	
+
 	-rm -f configure-stamp build-stamp
 	-rm -f config.cache config.log config.status Makefile.conf
 	-rm -f config.sub config.guess
 
 	-rm -f aplay/arecord
-	
+
 
 install: DH_OPTIONS=
 install: build
@@ -61,7 +60,7 @@
 
 
 binary-indep:
-binary-arch: patch-stamp build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdirs