Cherry-pick upstream commit FILE5_18-4-g966ca13, FILE5_18-6-g0b62876 "Improve (Palm) library detection"

... and the fix "remove extra line"

debian/patches/cherry-pick.FILE5_18-4-g966ca13.improve-palm-library-detection.patch

@@ -0,0 +1,22 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Fri Mar 28 19:11:40 2014 +0000
+Upstream-Commit: 966ca13cd9ad80c163643bdf9e7497976f36aafd
+Description:
+    Improve library detection, (Christoph Biedl)
+
+--- a/magic/Magdir/palm
++++ b/magic/Magdir/palm
+@@ -141,7 +141,12 @@
+ >>(0x4E.L+1)	byte		x		%02d)
+ 
+ # Palm OS .prc file types
+-60		string		libr		Palm OS dynamic library data
++60		string		libr
++# flags, only bit 0 or bit 6
++# http://en.wikipedia.org/wiki/PRC_%28Palm_OS%29
++# http://web.mit.edu/tytso/www/pilot/prc-format.html
++>0x20		beshort&0xffbe	0
++>>0		string		>\0		Palm OS dynamic library data "%s"
+ >0		string		>\0		"%s"
+ 60		string		ptch		Palm OS operating system patch data
+ >0		string		>\0		"%s"

debian/patches/cherry-pick.FILE5_18-6-g0b62876.remove-extra-line.patch

@@ -0,0 +1,24 @@
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Sun Mar 30 21:40:08 2014 +0000
+Commit: 0b628762b05e1ba024166067aad704b8e66753cb
+Description:
+    remove extra line (Christoph Biedl)
+
+--- a/magic/Magdir/palm
++++ b/magic/Magdir/palm
+@@ -1,6 +1,6 @@
+ 
+ #------------------------------------------------------------------------------
+-# $File: palm,v 1.11 2013/12/31 19:18:02 christos Exp $
++# $File: palm,v 1.12 2014/03/28 19:11:40 christos Exp $
+ # palm:	 file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
+ #
+ # Brian Lalor <blalor@hcirisc.cs.binghamton.edu>
+@@ -147,7 +147,6 @@
+ # http://web.mit.edu/tytso/www/pilot/prc-format.html
+ >0x20		beshort&0xffbe	0
+ >>0		string		>\0		Palm OS dynamic library data "%s"
+->0		string		>\0		"%s"
+ 60		string		ptch		Palm OS operating system patch data
+ >0		string		>\0		"%s"
+ 

debian/patches/series

@@ -13,3 +13,5 @@ extra.fix-8bit-in-cdf.patch
 revert.beb312b.add-fmtcheck.patch
 cherry-pick.FILE5_18-2-g1ecdd15.fix-targa-detection.patch
 cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch
+cherry-pick.FILE5_18-4-g966ca13.improve-palm-library-detection.patch
+cherry-pick.FILE5_18-6-g0b62876.remove-extra-line.patch