diff --git a/debian/patches/aapt_typo.diff b/debian/patches/aapt_typo.diff deleted file mode 100644 index 58c3942b..00000000 --- a/debian/patches/aapt_typo.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix a typo -Author: Kai-Chung Yan (殷啟聰) -Last-Update: 2016-01-10 ---- a/tools/aapt/StringPool.cpp -+++ b/tools/aapt/StringPool.cpp -@@ -51,7 +51,7 @@ - void printStringPool(const ResStringPool* pool) - { - if (pool->getError() == NO_INIT) { -- printf("String pool is unitialized.\n"); -+ printf("String pool is uninitialized.\n"); - return; - } else if (pool->getError() != NO_ERROR) { - printf("String pool is corrupt/invalid.\n"); diff --git a/debian/patches/escape-apostrophe b/debian/patches/escape-apostrophe deleted file mode 100644 index cd577947..00000000 --- a/debian/patches/escape-apostrophe +++ /dev/null @@ -1,25 +0,0 @@ -Description: Apostrophe needs to be escaped using "\". -Author: Umang Parmar -Forwarded: no -Last-Update: 2018-07-03 - ---- a/core/res/res/values/strings.xml -+++ b/core/res/res/values/strings.xml -@@ -366,7 +366,7 @@ - - The admin app can\'t be used. Your device will now be -- erased.\n\nIf you have questions, contact your organization's admin. -+ erased.\n\nIf you have questions, contact your organization\'s admin. - - - Me -@@ -710,7 +710,7 @@ - Fingerprint gestures - - Can capture gestures performed on -- the device's fingerprint sensor. -+ the device\'s fingerprint sensor. - - - diff --git a/debian/patches/fix-import b/debian/patches/fix-import deleted file mode 100644 index b9df72c1..00000000 --- a/debian/patches/fix-import +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix import path -Author: Umang Parmar -Forwarded: no -Last-Update: 2018-06-30 - ---- a/tools/aapt2/ResourcesInternal.proto -+++ b/tools/aapt2/ResourcesInternal.proto -@@ -19,7 +19,7 @@ syntax = "proto2"; - option java_package = "android.aapt.pb.internal"; - option optimize_for = LITE_RUNTIME; - --import "frameworks/base/tools/aapt2/Resources.proto"; -+import "Resources.proto"; - - package aapt.pb.internal; - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 08b979e6..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -aapt_typo.diff -fix-import -escape-apostrophe diff --git a/debian/source/format b/debian/source/format index 46ebe026..89ae9db8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (native)