SOURCES: file-debian.patch - update for 4.26 - remove src/Makefile.in patching

[sls]

Author: sls                          Date: Sat Aug 30 16:01:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for 4.26
- remove src/Makefile.in patching

---- Files affected:
SOURCES:
   file-debian.patch (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SOURCES/file-debian.patch
diff -u SOURCES/file-debian.patch:1.21 SOURCES/file-debian.patch:1.22
--- SOURCES/file-debian.patch:1.21	Sat Jul 19 22:41:44 2008
+++ SOURCES/file-debian.patch	Sat Aug 30 18:01:51 2008
@@ -69,25 +69,9 @@
  
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in	2008-07-02 15:24:28.000000000 +0000
-+++ file/src/Makefile.in	2008-07-15 13:52:00.000000000 +0000
-@@ -197,7 +197,7 @@ top_srcdir = @top_srcdir@
- MAGIC = $(pkgdatadir)/magic
- lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
--AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
-+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-## 324-magic-add-snes.dpatch by Josh Triplett <josh at freedesktop.org>
-##
-## DP: New magic for SNES SPC700 sound files (Closes: #410847).
-
+ AM_CFLAGS = @WARNINGS@
+ 
+ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
 --- file-4.21.orig/magic/Magdir/audio	2007-12-23 17:32:42.000000000 +0000
 +++ file-4.21/magic/Magdir/audio	2007-12-23 17:33:57.000000000 +0000
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-debian.patch?r1=1.21&r2=1.22&f=u