[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian/patches (2 files)

[David B Harris]

    Date: Tuesday, March 2, 2004 @ 15:24:12
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian/patches

Modified: 04_make_minus_j_fix.dpatch 99_debian_makefile_depmod.dpatch

Revert debian/patches/ portion of last commit; those changes were from me testing dpatch


----------------------------------+
 04_make_minus_j_fix.dpatch       |   10 +++++-----
 99_debian_makefile_depmod.dpatch |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


Index: debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch
diff -u debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.9 debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.10
--- debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.9	Tue Mar  2 15:22:31 2004
+++ debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch	Tue Mar  2 15:24:12 2004
@@ -22,10 +22,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/dbharris/source/debian/alsa-driver/Rules.make alsa-driver/Rules.make
---- /home/dbharris/source/debian/alsa-driver/Rules.make	2004-03-01 13:28:58.000000000 -0500
-+++ alsa-driver/Rules.make	2004-03-01 13:29:17.000000000 -0500
-@@ -270,7 +270,7 @@
+
+--- alsa-driver/Rules.make~	25 Dec 2003 03:02:30 -0000	1.12
++++ alsa-driver/Rules.make	30 Dec 2003 08:00:56 -0000
+@@ -264,7 +264,7 @@
  	genksyms_smp_prefix := 
  endif
  
@@ -34,7 +34,7 @@
  	@if [ ! -r $(MODINCL)/$(MODPREFIX)$*.stamp -o $(MODINCL)/$(MODPREFIX)$*.stamp -ot $< ]; then \
  		if [ ! -f $(CONFIG_SND_KERNELDIR)/include/linux/modules/$*.stamp ]; then \
  		echo '$(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \
-@@ -291,7 +291,8 @@
+@@ -285,7 +285,8 @@
  endif # export-objs 
  
  define update-sndvers
@@ -44,7 +44,7 @@
  	  echo "#define _LINUX_SNDVERSIONS_H"; \
  	  echo "#include <linux/modsetver.h>"; \
  	  cd $(TOPDIR)/include/modules; \
-@@ -299,14 +300,14 @@
+@@ -293,14 +294,14 @@
  	    if [ -f $$f ]; then echo "#include \"modules/$${f}\""; fi; \
  	  done; \
  	  echo "#endif"; \
Index: debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch
diff -u debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.7 debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.8
--- debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.7	Tue Mar  2 15:22:31 2004
+++ debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch	Tue Mar  2 15:24:12 2004
@@ -22,9 +22,9 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/dbharris/source/debian/alsa-driver/Makefile alsa-driver/Makefile
---- /home/dbharris/source/debian/alsa-driver/Makefile	2004-02-29 19:19:11.000000000 -0500
-+++ alsa-driver/Makefile	2004-03-01 12:32:54.000000000 -0500
+
+--- alsa-driver/Makefile~	25 Dec 2003 03:02:30 -0000	1.12
++++ alsa-driver/Makefile	30 Dec 2003 09:24:16 -0000
 @@ -144,20 +144,20 @@
  	rm -f $(DESTDIR)$(moddir)/snd*.*o $(DESTDIR)$(moddir)/persist.o $(DESTDIR)$(moddir)/isapnp.o
  endif