Browse Source

Patch queue: Replace python magic strength patch with cherry-picked upstream commit

Christoph Biedl 8 years ago
parent
commit
98204e5053

+ 0 - 15
debian/patches/amend.FILE5_24-26-ge92eb5c.python-mime.patch

@@ -1,15 +0,0 @@
-Subject: Fix strength of Python script detection. Closes: #698569, #798796
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: Sun Sep 13 12:06:50 2015 +0200
-
---- a/magic/Magdir/python
-+++ b/magic/Magdir/python
-@@ -26,7 +26,7 @@
- 0	belong		0xee0c0d0a	python 3.4 byte-compiled
- 
- 0	search/1/w	#!\ /usr/bin/python	Python script text executable
--!:strength + 10
-+!:strength + 13
- !:mime text/x-python
- 0	search/1/w	#!\ /usr/local/bin/python	Python script text executable
- !:strength + 10

+ 28 - 0
debian/patches/cherry-pick.FILE5_25-5-gba7b688.bump-more.patch

@@ -0,0 +1,28 @@
+Subject: bump more
+Origin: FILE5_25-5-gba7b688
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Wed Sep 16 22:19:54 2015 +0000
+
+--- a/magic/Magdir/python
++++ b/magic/Magdir/python
+@@ -26,16 +26,16 @@
+ 0	belong		0xee0c0d0a	python 3.4 byte-compiled
+ 
+ 0	search/1/w	#!\ /usr/bin/python	Python script text executable
+-!:strength + 10
++!:strength + 15
+ !:mime text/x-python
+ 0	search/1/w	#!\ /usr/local/bin/python	Python script text executable
+-!:strength + 10
++!:strength + 15
+ !:mime text/x-python
+ 0	search/1	#!/usr/bin/env\ python	Python script text executable
+-!:strength + 10
++!:strength + 15
+ !:mime text/x-python
+ 0	search/10	#!\ /usr/bin/env\ python	Python script text executable
+-!:strength + 10
++!:strength + 15
+ !:mime text/x-python
+ 
+ 

+ 1 - 1
debian/patches/series

@@ -3,4 +3,4 @@
 0003-file-usage.patch
 0004-doc-manpages.patch
 0006-gzip.patch
-amend.FILE5_24-26-ge92eb5c.python-mime.patch
+cherry-pick.FILE5_25-5-gba7b688.bump-more.patch