Import Debian version 1:5.14-1

debian/patches/0001-file-localmagic.patch

@@ -5,9 +5,10 @@ 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
-+++ file/magic/Header
+Index: file-5.14/magic/Header
+===================================================================
+--- file-5.14.orig/magic/Header	2010-12-15 03:06:49.000000000 +0000
++++ file-5.14/magic/Header	2013-05-06 17:41:20.000000000 +0000
 @@ -1,5 +1,6 @@
  # Magic data for file(1) command.
 -# Format is described in magic(files), where:
@@ -18,17 +19,19 @@ diff -Naurp file.orig/magic/Header file/magic/Header
 +# 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
-+++ file/magic/magic.local
+Index: file-5.14/magic/magic.local
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ file-5.14/magic/magic.local	2013-05-06 17:41:20.000000000 +0000
 @@ -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/apprentice.c file/src/apprentice.c
---- file.orig/src/apprentice.c
-+++ file/src/apprentice.c
-@@ -419,7 +419,7 @@ apprentice_1(struct magic_set *ms, const
+Index: file-5.14/src/apprentice.c
+===================================================================
+--- file-5.14.orig/src/apprentice.c	2013-03-21 17:45:14.000000000 +0000
++++ file-5.14/src/apprentice.c	2013-05-06 17:41:20.000000000 +0000
+@@ -419,7 +419,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
@@ -37,10 +40,11 @@ diff -Naurp file.orig/src/apprentice.c file/src/apprentice.c
  			file_magwarn(ms, "using regular magic file `%s'", fn);
  		map = apprentice_load(ms, fn, action);
  		if (map == NULL)
-diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
---- file.orig/src/Makefile.am
-+++ file/src/Makefile.am
-@@ -4,7 +4,7 @@ include_HEADERS = magic.h
+Index: file-5.14/src/Makefile.am
+===================================================================
+--- file-5.14.orig/src/Makefile.am	2013-03-21 17:45:14.000000000 +0000
++++ file-5.14/src/Makefile.am	2013-05-06 17:41:20.000000000 +0000
+@@ -4,7 +4,7 @@
  
  bin_PROGRAMS = file
  
@@ -49,10 +53,11 @@ diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
  AM_CFLAGS = $(CFLAG_VISIBILITY) @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
-+++ file/src/Makefile.in
-@@ -247,7 +247,7 @@ top_srcdir = @top_srcdir@
+Index: file-5.14/src/Makefile.in
+===================================================================
+--- file-5.14.orig/src/Makefile.in	2013-03-21 17:51:39.000000000 +0000
++++ file-5.14/src/Makefile.in	2013-05-06 17:41:20.000000000 +0000
+@@ -282,7 +282,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h

debian/patches/0002-file-make.patch

@@ -1,12 +1,13 @@
 Author: Michael Piefel <piefel@debian.org>
 Description: n/a
 
-diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in
-+++ file/src/Makefile.in
-@@ -368,7 +368,7 @@ clean-binPROGRAMS:
+Index: file-5.14/src/Makefile.in
+===================================================================
+--- file-5.14.orig/src/Makefile.in	2013-05-06 17:49:52.000000000 +0000
++++ file-5.14/src/Makefile.in	2013-05-06 17:49:52.000000000 +0000
+@@ -418,7 +418,7 @@
  	rm -f $$list
- file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
+ file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
 +	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD)

debian/patches/0004-doc-manpages.patch

@@ -23,7 +23,7 @@ diff -Naurp file.orig/doc/file.man file/doc/file.man
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -415,12 +416,6 @@ will be distributed periodically.
+@@ -434,12 +435,6 @@ will be distributed periodically.
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.

debian/patches/0005-python3.3.patch

@@ -1,16 +0,0 @@
-Author: Jakub Wilk <jwilk@debian.org>
-Description:
- Make file recognize byte-compiled files generated by Python 3.3
- (Closes: #697110).
-
-diff -Naurp file.orig/magic/Magdir/python file/magic/Magdir/python
---- file.orig/magic/Magdir/python
-+++ file/magic/Magdir/python
-@@ -22,6 +22,7 @@
- 0	belong		0x3b0c0d0a	python 3.0 byte-compiled
- 0	belong		0x4f0c0d0a	python 3.1 byte-compiled
- 0	belong		0x6c0c0d0a	python 3.2 byte-compiled
-+0	belong		0x9e0c0d0a	python 3.3 byte-compiled
- 
- 0	search/1/w	#!\ /usr/bin/python	Python script text executable
- !:mime text/x-python

debian/patches/0009-ms-html-help.patch

@@ -4,7 +4,7 @@ Description: Updating MS Windows HtmlHelp Data magics (Closes: #653911).
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 --- file.orig/magic/Magdir/msdos
 +++ file/magic/Magdir/msdos
-@@ -720,7 +720,7 @@
+@@ -712,7 +712,7 @@
  0	ulequad	0x3a000000024e4c	MS Advisor help file
  
  # HtmlHelp files (.chm)

debian/patches/0011-btrfs.patch

@@ -4,7 +4,7 @@ Description: Adding updated magics for BTRFS (Closes: #663454).
 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
 --- file.orig/magic/Magdir/filesystems	2013-03-13 16:54:43.588452886 +0100
 +++ file/magic/Magdir/filesystems	2013-03-13 17:15:59.659044842 +0100
-@@ -1883,12 +1883,21 @@
+@@ -1894,12 +1894,21 @@
  >>0x10060        string          >\0             lockproto %s)
  
  # BTRFS

debian/patches/series

@@ -2,7 +2,6 @@
 0002-file-make.patch
 0003-file-usage.patch
 0004-doc-manpages.patch
-0005-python3.3.patch
 0006-gzip.patch
 0007-c64-tap.patch
 0008-aol-art.patch