Refresh patches

debian/patches/local.don-t-include-libs-in-build.patch

@@ -1,12 +1,12 @@
 Description: Don't include libs in build
 Author: Michael Piefel <piefel@debian.org>
-Last-Update: 2015-09-18
+Last-Update: 2016-06-27
 
     (Reason for this is not at all clear -CB)
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -482,7 +482,7 @@
+@@ -481,7 +481,7 @@
  
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)

debian/patches/local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch

@@ -1,18 +1,18 @@
 Description: Mention POSIXLY_CORRECT dependent behaviour in usage message
 Author: Daniel Baumann <mail@daniel-baumann.ch>
 Bug-Debian: https://bugs.debian.org/576679
-Last-Update: 2015-09-18
+Last-Update: 2016-06-27
 
 --- a/src/file_opts.h
 +++ b/src/file_opts.h
 @@ -36,8 +36,8 @@
- OPT('k', "keep-going", 0, "           don't stop at the first match\n")
- OPT('l', "list", 0, "                 list magic strength\n")
+ OPT('k', "keep-going", 0, 0, "           don't stop at the first match\n")
+ OPT('l', "list", 0, 0, "                 list magic strength\n")
  #ifdef S_IFLNK
--OPT('L', "dereference", 0, "          follow symlinks (default)\n")
--OPT('h', "no-dereference", 0, "       don't follow symlinks\n")
-+OPT('L', "dereference", 0, "          follow symlinks (default if POSIXLY_CORRECT is set)\n")
-+OPT('h', "no-dereference", 0, "       don't follow symlinks (default if POSIXLY_CORRECT is not set)\n")
+-OPT('L', "dereference", 0, 1, "          follow symlinks")
+-OPT('h', "no-dereference", 0, 2, "       don't follow symlinks")
++OPT('L', "dereference", 0, 1, "          follow symlinks (default if POSIXLY_CORRECT is set)")
++OPT('h', "no-dereference", 0, 2, "       don't follow symlinks (default if POSIXLY_CORRECT is not set)")
  #endif
- OPT('n', "no-buffer", 0, "            do not buffer output\n")
- OPT('N', "no-pad", 0, "               do not pad output\n")
+ OPT('n', "no-buffer", 0, 0, "            do not buffer output\n")
+ OPT('N', "no-pad", 0, 0, "               do not pad output\n")

debian/patches/local.support-local-definitions-in-etc-magic.patch

@@ -3,7 +3,7 @@ Author:
  Michael Piefel <piefel@debian.org>,
  Judit Foglszinger <fgrfgr@freenet.de>
 Forwarded: no
-Last-Update: 2015-09-18
+Last-Update: 2016-06-27
 
 --- a/magic/Header
 +++ b/magic/Header
@@ -25,7 +25,7 @@ Last-Update: 2015-09-18
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -450,7 +450,7 @@
+@@ -452,7 +452,7 @@
  #ifndef COMPILE_ONLY
  	map = apprentice_map(ms, fn);
  	if (map == NULL) {
@@ -47,10 +47,10 @@ Last-Update: 2015-09-18
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -341,7 +341,7 @@
+@@ -340,7 +340,7 @@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
+ nodist_include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
@@ -77,7 +77,7 @@ Last-Update: 2015-09-18
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -460,12 +461,6 @@
+@@ -469,12 +470,6 @@
  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.