debian/append2simg.mk

@@ -4,7 +4,7 @@ SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
 CFLAGS += -Ilibsparse/include -fpermissive
 LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
            -Wl,-rpath-link=. \
-           -lz -L. -lsparse
+           -L. -lsparse
 
 build: $(SOURCES)
 	$(CXX) $^ -o libsparse/$(NAME) $(CFLAGS) $(LDFLAGS)

debian/control

@@ -8,15 +8,15 @@ Uploaders: Hans-Christoph Steiner <hans@eds.org>,
            Umang Parmar <umangjparmar@gmail.com>
 Build-Depends: android-libunwind-dev (>= 8.1.0+r23~) [amd64 i386 armel armhf arm64 mips mipsel mips64el],
                bash-completion,
-               libusb-1.0-0-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el],
+               libusb-1.0-0-dev [amd64 i386 armel armhf arm64],
                debhelper (>= 11~),
                dh-exec,
                dpkg-dev (>= 1.17.14),
                libsafe-iop-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el],
                android-libboringssl-dev [amd64 i386 armel armhf arm64],
-               pandoc [amd64 i386 armel armhf arm64 mips mipsel mips64el],
+               pandoc [amd64 i386 armel armhf arm64],
                zlib1g-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el],
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Homepage: https://android.googlesource.com/platform/system/core
 Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-system-core.git
 Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-system-core

debian/libadb.mk

@@ -38,7 +38,7 @@ CPPFLAGS += -I/usr/include/android -Iadb -Iinclude -Ibase/include \
 LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \
            -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
            -L/usr/lib/$(DEB_HOST_MULTIARCH)/android -lcrypto \
-           -lpthread -L. -lbase -lcutils -lcrypto_utils -lusb-1.0
+           -lpthread -latomic -L. -lbase -lcutils -lcrypto_utils -lusb-1.0
 
 build: $(SOURCES)
 	$(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)

debian/libcrypto_utils.mk

@@ -4,7 +4,7 @@ SOURCES := $(foreach source, $(SOURCES), libcrypto_utils/$(source))
 CPPFLAGS += -Ilibcrypto_utils/include -Iinclude -I/usr/include/android
 LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \
 	-Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
-	-lpthread -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+	-L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
 	-lcrypto
 
 build: $(SOURCES)

debian/rules

@@ -49,6 +49,9 @@ endif
 lib%.so: debian/lib%.mk
 	dh_auto_build --buildsystem=makefile -- -f $<
 
+debian/%.1: debian/%.1.md
+	pandoc -s -o $@ $<
+
 libadb.so: debian/libadb.mk libcutils.so libbase.so libcrypto_utils.so
 	dh_auto_build --buildsystem=makefile -- -f $<
 
@@ -67,10 +70,10 @@ libutils.so: debian/libutils.mk liblog.so libcutils.so libbacktrace.so
 libziparchive: debian/libziparchive.mk libutils.so liblog.so libbase.so
 	dh_auto_build --buildsystem=makefile -- -f $<
 
-adb: debian/adb.mk libadb.so libcutils.so libbase.so
+adb: debian/adb.mk libadb.so libcutils.so libbase.so debian/adb.1
 	dh_auto_build --buildsystem=makefile -- -f $<
 
-fastboot: debian/fastboot.mk libziparchive.so libsparse.so libbase.so libcutils.so libadb.so
+fastboot: debian/fastboot.mk libziparchive.so libsparse.so libbase.so libcutils.so libadb.so debian/fastboot.1
 	dh_auto_build --buildsystem=makefile -- -f $<
 
 simg2img: debian/simg2img.mk libsparse.so
@@ -89,8 +92,6 @@ append2simg: debian/append2simg.mk libsparse.so
 	dh $@ --with bash-completion
 
 override_dh_auto_build: $(COMPONENTS)
-	pandoc -s -o debian/adb.1 debian/adb.1.md
-	pandoc -s -o debian/fastboot.1 debian/fastboot.1.md
 
 override_dh_auto_clean:
 	dh_auto_clean

debian/simg2img.mk

@@ -4,7 +4,7 @@ SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
 CFLAGS += -Ilibsparse/include -fpermissive
 LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
            -Wl,-rpath-link=. \
-           -lz -L. -lsparse
+           -L. -lsparse
 
 build: $(SOURCES)
 	$(CXX) $^ -o libsparse/$(NAME) $(CFLAGS) $(LDFLAGS)

debian/simg2simg.mk

@@ -4,7 +4,7 @@ SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
 CFLAGS += -Ilibsparse/include -fpermissive
 LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
            -Wl,-rpath-link=. \
-           -lz -L. -lsparse
+           -L. -lsparse
 
 build: $(SOURCES)
 	$(CXX) $^ -o libsparse/$(NAME) $(CFLAGS) $(LDFLAGS)