Authors:
 Michael Piefel <piefel@debian.org>,
 Judit Foglszinger <fgrfgr@freenet.de>
Description:
 No longer includes Localstuff in /usr/share/misc/magic, local definitions
 should go to /etc/magic.

diff -Naurp file.orig/magic/Header file/magic/Header
--- file.orig/magic/Header	2011-09-08 17:23:06.845387845 +0200
+++ file/magic/Header	2011-09-08 17:33:03.984889688 +0200
@@ -1,5 +1,6 @@
 # Magic data for file(1) command.
-# Format is described in magic(files), where:
-# files is 5 on V7 and BSD, 4 on SV, and ?? on SVID.
+# Format is described in in magic(5).
 # Don't edit this file, edit /etc/magic or send your magic improvements
-# to the maintainers, at file@mx.gw.com
+# to the upstream maintainers, at file@mx.gw.com
+# or send your suggested inclusions
+# as a wishlist bug against file (using the reportbug utility).
diff -Naurp file.orig/magic/magic.local file/magic/magic.local
--- file.orig/magic/magic.local	1970-01-01 01:00:00.000000000 +0100
+++ file/magic/magic.local	2011-09-08 17:38:44.420889203 +0200
@@ -0,0 +1,3 @@
+# Magic local data for file(1) command.
+# Insert here your local magic data. Format is described in magic(5).
+
diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
--- file.orig/src/Makefile.am	2011-09-08 17:23:06.884893668 +0200
+++ file/src/Makefile.am	2011-09-08 17:33:03.988392256 +0200
@@ -4,7 +4,7 @@ include_HEADERS = magic.h
 
 bin_PROGRAMS = file
 
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 AM_CFLAGS = @WARNINGS@
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
--- file.orig/src/Makefile.in	2011-09-08 17:23:06.884893668 +0200
+++ file/src/Makefile.in	2011-09-08 17:33:03.988392256 +0200
@@ -243,7 +243,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 = @WARNINGS@
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \