Patch queue: Maintenance

* Reorder patches
* Merge patches where appropriate
* Rename local patches

debian/patches/0004-doc-manpages.patch

@@ -1,39 +0,0 @@
-Description: FIXME
-Author: Michael Piefel <piefel@debian.org>
-Bug-Debian: https://bugs.debian.org/417511
-Last-Update: 2015-08-23
-
---- a/doc/file.man
-+++ b/doc/file.man
-@@ -57,7 +57,7 @@
- or non-printable).
- Exceptions are well-known file formats (core files, tar archives)
- that are known to contain binary data.
--When modifying magic files or the program itself, make sure to
-+When adding local definitions to /etc/magic, make sure to
- .Em "preserve these keywords" .
- Users depend on knowing that all the readable files in a directory
- have the word
-@@ -101,7 +101,8 @@
- has been applied by extension to data files.
- Any file with some invariant identifier at a small fixed
- offset into the file can usually be described in this way.
--The information identifying these files is read from the compiled
-+The information identifying these files is read from /etc/magic
-+and the compiled
- magic file
- .Pa __MAGIC__.mgc ,
- or the files in the directory
-@@ -459,12 +460,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.
--If your old
--.Nm
--command uses a magic file,
--keep the old magic file around for comparison purposes
--(rename it to
--.Pa __MAGIC__.orig ) .
- .Sh EXAMPLES
- .Bd -literal -offset indent
- $ file file.c file /dev/{wd0a,hda}

debian/patches/0002-file-make.patch

@@ -1,6 +1,8 @@
-Description: n/a
+Description: Don't include libs in build
 Author: Michael Piefel <piefel@debian.org>
-Last-Update: 2015-08-23
+Last-Update: 2015-09-18
+
+    (Reason for this is not at all clear -CB)
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in

debian/patches/0003-file-usage.patch

@@ -1,7 +1,7 @@
-Description: Adding POSIXLY_CORRECT reference in usage message
+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-08-23
+Last-Update: 2015-09-18
 
 --- a/src/file_opts.h
 +++ b/src/file_opts.h

debian/patches/0006-gzip.patch

@@ -1,6 +1,7 @@
-Description: Updating gzip mime (Closes: #688886).
+Description: Report gz as application/gzip
 Author: Daniel Baumann <mail@daniel-baumann.ch>
-Last-Update: 2015-08-23
+Bug-Debian: https://bugs.debian.org/688886
+Last-Update: 2015-09-18
 
 --- a/magic/Magdir/compress
 +++ b/magic/Magdir/compress

debian/patches/0001-file-localmagic.patch

@@ -1,11 +1,9 @@
-Description:
- No longer includes Localstuff in /usr/share/misc/magic, local definitions
- should go to /etc/magic.
+Description: Support local definitions in /etc/magic
 Author:
  Michael Piefel <piefel@debian.org>,
  Judit Foglszinger <fgrfgr@freenet.de>
 Forwarded: no
-Last-Update: 2015-08-23
+Last-Update: 2015-09-18
 
 --- a/magic/Header
 +++ b/magic/Header
@@ -58,3 +56,37 @@ Last-Update: 2015-08-23
  AM_CFLAGS = $(CFLAG_VISIBILITY) @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 \
+--- a/doc/file.man
++++ b/doc/file.man
+@@ -57,7 +57,7 @@
+ or non-printable).
+ Exceptions are well-known file formats (core files, tar archives)
+ that are known to contain binary data.
+-When modifying magic files or the program itself, make sure to
++When adding local definitions to /etc/magic, make sure to
+ .Em "preserve these keywords" .
+ Users depend on knowing that all the readable files in a directory
+ have the word
+@@ -101,7 +101,8 @@
+ has been applied by extension to data files.
+ Any file with some invariant identifier at a small fixed
+ offset into the file can usually be described in this way.
+-The information identifying these files is read from the compiled
++The information identifying these files is read from /etc/magic
++and the compiled
+ magic file
+ .Pa __MAGIC__.mgc ,
+ or the files in the directory
+@@ -460,12 +461,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.
+-If your old
+-.Nm
+-command uses a magic file,
+-keep the old magic file around for comparison purposes
+-(rename it to
+-.Pa __MAGIC__.orig ) .
+ .Sh EXAMPLES
+ .Bd -literal -offset indent
+ $ file file.c file /dev/{wd0a,hda}

debian/patches/series

@@ -1,6 +1,8 @@
-0001-file-localmagic.patch
-0002-file-make.patch
-0003-file-usage.patch
-0004-doc-manpages.patch
-0006-gzip.patch
+# cherry-picked commits. Keep in chronlogical order
 cherry-pick.FILE5_25-5-gba7b688.bump-more.patch
+
+# local modifications
+local.support-local-definitions-in-etc-magic.patch
+local.don-t-include-libs-in-build.patch
+local.mention-posixly-correct-dependent-behaviour-in-usage-message.patch
+local.report-gz-as-application-gzip.patch