[apktool] 07/08: Drop mindprod-non-military.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository apktool.

commit 9394d1e06f2b6ec9262b9654926c187cdc60d00a
Author: Markus Koschany <apo at debian.org>
Date:   Tue Feb 16 12:46:34 2016 +0100

    Drop mindprod-non-military.patch
---
 debian/patches/mindprod-non-military.patch | 63 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 64 deletions(-)

diff --git a/debian/patches/mindprod-non-military.patch b/debian/patches/mindprod-non-military.patch
deleted file mode 100644
index edeb4ad..0000000
--- a/debian/patches/mindprod-non-military.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sat, 13 Feb 2016 16:06:02 +0100
-Subject: mindprod non military
-
-Remove non-free mindprod.com code.
-
-Forwarded: not-needed
----
- .../src/main/java/brut/androlib/res/decoder/ARSCDecoder.java        | 4 ++--
- .../src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
-index bb8fbf5..1ee1d77 100644
---- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
-+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
-@@ -23,7 +23,7 @@ import brut.androlib.res.data.value.*;
- import brut.util.Duo;
- import brut.androlib.res.data.ResTable;
- import brut.util.ExtDataInput;
--import com.mindprod.ledatastream.LEDataInputStream;
-+//import com.mindprod.ledatastream.LEDataInputStream;
- import java.io.*;
- import java.math.BigInteger;
- import java.util.*;
-@@ -61,7 +61,7 @@ public class ARSCDecoder {
-             mCountIn = null;
-             mFlagsOffsets = null;
-         }
--        mIn = new ExtDataInput(new LEDataInputStream(arscStream));
-+        mIn = null;
-         mResTable = resTable;
-         mKeepBroken = keepBroken;
-     }
-diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
-index 1c768a9..5318f52 100644
---- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
-+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
-@@ -20,7 +20,7 @@ import android.util.TypedValue;
- import brut.androlib.AndrolibException;
- import brut.androlib.res.xml.ResXmlEncoders;
- import brut.util.ExtDataInput;
--import com.mindprod.ledatastream.LEDataInputStream;
-+//import com.mindprod.ledatastream.LEDataInputStream;
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.Reader;
-@@ -69,7 +69,7 @@ public class AXmlResourceParser implements XmlResourceParser {
-     public void open(InputStream stream) {
-         close();
-         if (stream != null) {
--            m_reader = new ExtDataInput(new LEDataInputStream(stream));
-+            //m_reader = new ExtDataInput(new LEDataInputStream(stream));
-         }
-     }
- 
-@@ -994,4 +994,4 @@ public class AXmlResourceParser implements XmlResourceParser {
-             CHUNK_XML_END_NAMESPACE = 0x00100101,
-             CHUNK_XML_START_TAG = 0x00100102, CHUNK_XML_END_TAG = 0x00100103,
-             CHUNK_XML_TEXT = 0x00100104, CHUNK_XML_LAST = 0x00100104;
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 7a5c060..0f1d6c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_system_aapt.patch
 build.patch
-mindprod-non-military.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apktool.git