Browse Source

Replace smali detection with version cherry-pick upstream

Christoph Biedl 1 year ago
parent
commit
a472de4568
2 changed files with 5 additions and 5 deletions
  1. 4 4
      debian/patches/upstream.detect-smali.patch
  2. 1 1
      debian/patches/series

+ 4 - 4
debian/patches/upstream.detect-smali.patch

@@ -1,7 +1,7 @@
-Subject: Detect smali files
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2022-12-30
-Forwarded: https://mailman.astron.com/pipermail/file/2022-December/001049.html
+Subject: Detect .smali files (FC Stegerman)
+Origin: FILE5_44-17-g4c8ee2e7 <https://github.com/file/file/commit/FILE5_44-17-g4c8ee2e7>
+Upstream-Author: Christos Zoulas <christos@zoulas.com>
+Date: Thu Jan 12 00:09:46 2023 +0000
 
 --- a/magic/Magdir/android
 +++ b/magic/Magdir/android

+ 1 - 1
debian/patches/series

@@ -2,11 +2,11 @@
 
 # cherry-picked commits. Keep in upstream's chronological order
 1672518248.FILE5_44-9-gdc71304b.pyzip-improvements-fc-stegerman.patch
+1673482186.FILE5_44-17-g4c8ee2e7.detect-smali-files-fc-stegerman.patch
 
 # patches that should go upstream
 upstream.disable.att3b.patch
 upstream.mute-debug-warning.patch
-upstream.detect-smali.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch