uncommitted - android-platform-system-extras

Ready changes

Summary

Import uploads missing from VCS:

Diff

diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 8537efc..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.debhelper
-*.log
-*.substvars
-*~
-/android-libext4-utils-dev/
-/android-libext4-utils/
-/android-libf2fs-utils-dev/
-/android-libf2fs-utils/
-/android-sdk-ext4-utils/
-/debhelper-build-stamp
-/files
-/tmp/
diff --git a/debian/changelog b/debian/changelog
index d04bafb..12b362e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+android-platform-system-extras (10.0.0+r36+ds-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adapt to new libsquashfuse-dev. (Closes: #1026541)
+
+ -- Adrian Bunk <bunk@debian.org>  Wed, 18 Jan 2023 17:40:05 +0200
+
 android-platform-system-extras (10.0.0+r36+ds-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 132adc0..3f27ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 12),
                android-platform-system-core-headers (>= 1:10.0.0+r36-1~),
                dh-exec,
                libsquashfuse-dev,
+               pkg-config,
 Standards-Version: 4.2.1
 Rules-Requires-Root: no
 Homepage: https://android.googlesource.com/platform/system/extras
diff --git a/debian/rules b/debian/rules
index 0fbdeb1..52aa906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/dpkg/pkg-info.mk
 # Security Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -fPIC
-export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/android -DNDEBUG
+export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/android -DNDEBUG `pkg-config --cflags squashfuse`
 export OUT_DIR = debian/out
 
 lib%.so: debian/lib%.mk

Run locally

More details

Full run details