[apktool] 02/08: Drop LittleEndianDataInputStream.patch

Markus Koschany apo-guest at moszumanska.debian.org
Thu Mar 24 20:01:09 UTC 2016


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

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

commit 01323a14bb439d7bb809233f82a8529a81c3c6c3
Author: Markus Koschany <apo at debian.org>
Date:   Mon Mar 7 22:09:50 2016 +0100

    Drop LittleEndianDataInputStream.patch
---
 debian/patches/LittleEndianDataInputStream.patch | 60 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 61 deletions(-)

diff --git a/debian/patches/LittleEndianDataInputStream.patch b/debian/patches/LittleEndianDataInputStream.patch
deleted file mode 100644
index f66c078..0000000
--- a/debian/patches/LittleEndianDataInputStream.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 16 Feb 2016 18:43:06 +0100
-Subject: LittleEndianDataInputStream
-
----
- .../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..5f854c2 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.google.common.io.LittleEndianDataInputStream;
- 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 = new ExtDataInput((InputStream) new LittleEndianDataInputStream(arscStream));
-         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..889dbc8 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.google.common.io.LittleEndianDataInputStream;
- 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((InputStream) new LittleEndianDataInputStream(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 6e7abc4..0f1d6c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_system_aapt.patch
 build.patch
-LittleEndianDataInputStream.patch

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



More information about the pkg-java-commits mailing list