Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package android-platform-system-core. Version 21-4 fixed #769646 (although the changelog didn't say so) but regressed, introducing #770328; version 21-5 fixed #770328. I hoped this would also fix #769251, a FTBFS in src:android-platform-build, but the maintainer says changes are going to be needed in src:android-platform-frameworks-native for that one. unblock android-platform-system-core/21-5 -- System Information: Debian Release: jessie/sid APT prefers proposed-updates APT policy: (500, 'proposed-updates'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diffstat for android-platform-system-core-21 android-platform-system-core-21 android-libcutils-dev.links | 1 + android-libcutils.install | 2 +- android-libcutils.links | 1 + android-libcutils.lintian-overrides | 8 ++++++++ android-liblog-dev.links | 1 + android-liblog.install | 2 +- android-liblog.links | 1 + android-liblog.lintian-overrides | 8 ++++++++ android-libzipfile-dev.links | 1 + android-libzipfile.install | 2 +- android-libzipfile.links | 1 + android-libzipfile.lintian-overrides | 8 ++++++++ changelog | 16 ++++++++++++++++ control | 10 ++++++++-- patches/libandroidcutils_makefile_pkgconfig | 4 ++-- patches/libandroidlog_makefile_pkgconfig | 4 ++-- patches/libandroidzipfile_makefile_pkgconfig | 4 ++-- 17 files changed, 63 insertions(+), 11 deletions(-) diff -Nru android-platform-system-core-21/debian/android-libcutils-dev.links android-platform-system-core-21/debian/android-libcutils-dev.links --- android-platform-system-core-21/debian/android-libcutils-dev.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libcutils-dev.links 2014-11-18 11:08:08.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/libcutils.so.0.21.0 usr/lib/android/libcutils.so diff -Nru android-platform-system-core-21/debian/android-libcutils.install android-platform-system-core-21/debian/android-libcutils.install --- android-platform-system-core-21/debian/android-libcutils.install 2014-10-22 16:16:43.000000000 +0100 +++ android-platform-system-core-21/debian/android-libcutils.install 2014-11-18 11:05:13.000000000 +0000 @@ -1 +1 @@ -libcutils/libcutils.so usr/lib/android/ +libcutils/libcutils.so.0.21.0 usr/lib/android/ diff -Nru android-platform-system-core-21/debian/android-libcutils.links android-platform-system-core-21/debian/android-libcutils.links --- android-platform-system-core-21/debian/android-libcutils.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libcutils.links 2014-11-18 11:09:33.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/libcutils.so.0.21.0 usr/lib/android/libcutils.so.0 diff -Nru android-platform-system-core-21/debian/android-libcutils.lintian-overrides android-platform-system-core-21/debian/android-libcutils.lintian-overrides --- android-platform-system-core-21/debian/android-libcutils.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libcutils.lintian-overrides 2014-11-18 12:00:10.000000000 +0000 @@ -0,0 +1,8 @@ +# These shlibs are stuck into /usr/lib/android because they are only meant to +# be used with Android utilities and they need to be built as one big package, +# so that everything is on the exact same version. They are registered as +# shlibs so that dh_shlibsdeps will automatically dependency generation. +# These libraries should never be used by other projects since they have no +# upstream standalone releases or versioning. +android-libcutils: postinst-has-useless-call-to-ldconfig +android-libcutils: postrm-has-useless-call-to-ldconfig diff -Nru android-platform-system-core-21/debian/android-liblog-dev.links android-platform-system-core-21/debian/android-liblog-dev.links --- android-platform-system-core-21/debian/android-liblog-dev.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-liblog-dev.links 2014-11-18 11:08:45.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/liblog.so.0.21.0 usr/lib/android/liblog.so diff -Nru android-platform-system-core-21/debian/android-liblog.install android-platform-system-core-21/debian/android-liblog.install --- android-platform-system-core-21/debian/android-liblog.install 2014-10-22 16:16:43.000000000 +0100 +++ android-platform-system-core-21/debian/android-liblog.install 2014-11-18 11:05:13.000000000 +0000 @@ -1 +1 @@ -liblog/liblog.so usr/lib/android/ +liblog/liblog.so.0.21.0 usr/lib/android/ diff -Nru android-platform-system-core-21/debian/android-liblog.links android-platform-system-core-21/debian/android-liblog.links --- android-platform-system-core-21/debian/android-liblog.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-liblog.links 2014-11-18 11:09:38.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/liblog.so.0.21.0 usr/lib/android/liblog.so.0 diff -Nru android-platform-system-core-21/debian/android-liblog.lintian-overrides android-platform-system-core-21/debian/android-liblog.lintian-overrides --- android-platform-system-core-21/debian/android-liblog.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-liblog.lintian-overrides 2014-11-18 11:59:44.000000000 +0000 @@ -0,0 +1,8 @@ +# These shlibs are stuck into /usr/lib/android because they are only meant to +# be used with Android utilities and they need to be built as one big package, +# so that everything is on the exact same version. They are registered as +# shlibs so that dh_shlibsdeps will automatically dependency generation. +# These libraries should never be used by other projects since they have no +# upstream standalone releases or versioning. +android-liblog: postinst-has-useless-call-to-ldconfig +android-liblog: postrm-has-useless-call-to-ldconfig diff -Nru android-platform-system-core-21/debian/android-libzipfile-dev.links android-platform-system-core-21/debian/android-libzipfile-dev.links --- android-platform-system-core-21/debian/android-libzipfile-dev.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libzipfile-dev.links 2014-11-18 11:08:53.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/libzipfile.so.0.21.0 usr/lib/android/libzipfile.so diff -Nru android-platform-system-core-21/debian/android-libzipfile.install android-platform-system-core-21/debian/android-libzipfile.install --- android-platform-system-core-21/debian/android-libzipfile.install 2014-10-22 16:16:43.000000000 +0100 +++ android-platform-system-core-21/debian/android-libzipfile.install 2014-11-18 11:05:13.000000000 +0000 @@ -1 +1 @@ -libzipfile/libzipfile.so usr/lib/android/ +libzipfile/libzipfile.so.0.21.0 usr/lib/android/ diff -Nru android-platform-system-core-21/debian/android-libzipfile.links android-platform-system-core-21/debian/android-libzipfile.links --- android-platform-system-core-21/debian/android-libzipfile.links 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libzipfile.links 2014-11-18 11:09:44.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/android/libzipfile.so.0.21.0 usr/lib/android/libzipfile.so.0 diff -Nru android-platform-system-core-21/debian/android-libzipfile.lintian-overrides android-platform-system-core-21/debian/android-libzipfile.lintian-overrides --- android-platform-system-core-21/debian/android-libzipfile.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ android-platform-system-core-21/debian/android-libzipfile.lintian-overrides 2014-11-18 12:00:41.000000000 +0000 @@ -0,0 +1,8 @@ +# These shlibs are stuck into /usr/lib/android because they are only meant to +# be used with Android utilities and they need to be built as one big package, +# so that everything is on the exact same version. They are registered as +# shlibs so that dh_shlibsdeps will automatically dependency generation. +# These libraries should never be used by other projects since they have no +# upstream standalone releases or versioning. +android-libzipfile: postinst-has-useless-call-to-ldconfig +android-libzipfile: postrm-has-useless-call-to-ldconfig diff -Nru android-platform-system-core-21/debian/changelog android-platform-system-core-21/debian/changelog --- android-platform-system-core-21/debian/changelog 2014-10-22 22:41:56.000000000 +0100 +++ android-platform-system-core-21/debian/changelog 2014-11-25 12:00:04.000000000 +0000 @@ -1,3 +1,19 @@ +android-platform-system-core (21-5) unstable; urgency=low + + [Simon McVittie] + * For each library where libwhatever.so moved from android-libwhatever + to android-libwhatever-dev, the -dev Breaks/Replaces the runtime library + (Closes: #770328) + + -- Hans-Christoph Steiner <h...@eds.org> Tue, 25 Nov 2014 12:43:50 +0100 + +android-platform-system-core (21-4) unstable; urgency=low + + * add versions to shared library names so dh can do auto dep detection + * dh_shlibdeps misses libcutils dep on liblog, so force manually + + -- Hans-Christoph Steiner <h...@eds.org> Tue, 18 Nov 2014 13:05:59 +0100 + android-platform-system-core (21-3) unstable; urgency=low * fix build to work on linux-any diff -Nru android-platform-system-core-21/debian/control android-platform-system-core-21/debian/control --- android-platform-system-core-21/debian/control 2014-10-22 22:41:56.000000000 +0100 +++ android-platform-system-core-21/debian/control 2014-11-25 11:39:48.000000000 +0000 @@ -8,7 +8,7 @@ Standards-Version: 3.9.6 Homepage: https://android.googlesource.com/platform/system/core Vcs-Git: https://alioth.debian.org/anonscm/git/android-tools/android-platform-system-core.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=android-tools/android-platform-system-core.git +Vcs-Browser: http://anonscm.debian.org/cgit/android-tools/android-platform-system-core.git Package: android-system-dev Section: libdevel @@ -33,6 +33,8 @@ Depends: ${misc:Depends}, libc-dev, android-liblog (= ${binary:Version}) +Breaks: android-liblog (<< 21-4~) +Replaces: android-liblog (<< 21-4~) Description: Android logging library - Development files Library providing logging capabilities to android related tools. . @@ -41,7 +43,7 @@ Package: android-libcutils Section: libs Architecture: linux-any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, android-liblog Description: Android utils library for C This library provides common functionalities for android related tools. @@ -52,6 +54,8 @@ android-libcutils (= ${binary:Version}), android-liblog-dev (= ${binary:Version}), libbsd-dev +Breaks: android-libcutils (<< 21-4~) +Replaces: android-libcutils (<< 21-4~) Description: Android utils library for C - Development files This library provides common functionalities for android related tools. . @@ -70,6 +74,8 @@ Depends: ${misc:Depends}, android-libzipfile (= ${binary:Version}), zlib1g-dev +Breaks: android-libzipfile (<< 21-4~) +Replaces: android-libzipfile (<< 21-4~) Description: Android zipfile library - Development files Library providing zipfile handling capabilities to android related tools. . diff -Nru android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig --- android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig 2014-10-22 22:41:55.000000000 +0100 +++ android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig 2014-11-18 10:59:50.000000000 +0000 @@ -81,12 +81,12 @@ +LIBNAME = cutils + +all: $(OBJECTS) -+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(LIBNAME).so -o lib$(LIBNAME).so $(OBJECTS) $(LIBS) ++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(LIBNAME).so.0 -o lib$(LIBNAME).so.0.21.0 $(OBJECTS) $(LIBS) + ar rs lib$(LIBNAME).a $(OBJECTS) + +clean: + rm -f $(OBJECTS) -+ rm -f lib$(LIBNAME).so lib$(LIBNAME).a ++ rm -f lib$(LIBNAME).so* lib$(LIBNAME).a + --- /dev/null +++ b/libcutils/dlmalloc.h diff -Nru android-platform-system-core-21/debian/patches/libandroidlog_makefile_pkgconfig android-platform-system-core-21/debian/patches/libandroidlog_makefile_pkgconfig --- android-platform-system-core-21/debian/patches/libandroidlog_makefile_pkgconfig 2014-10-22 16:16:43.000000000 +0100 +++ android-platform-system-core-21/debian/patches/libandroidlog_makefile_pkgconfig 2014-11-18 11:00:06.000000000 +0000 @@ -20,10 +20,10 @@ +LIBNAME = log + +all: $(OBJECTS) -+ $(CC) $(LDFLAGS) -Wl,-soname,lib$(LIBNAME).so -o lib$(LIBNAME).so $(OBJECTS) $(LIBS) ++ $(CC) $(LDFLAGS) -Wl,-soname,lib$(LIBNAME).so.0 -o lib$(LIBNAME).so.0.21.0 $(OBJECTS) $(LIBS) + ar rs lib$(LIBNAME).a $(OBJECTS) + +clean: + rm -f $(OBJECTS) -+ rm -f lib$(LIBNAME).so lib$(LIBNAME).a ++ rm -f lib$(LIBNAME).so* lib$(LIBNAME).a + diff -Nru android-platform-system-core-21/debian/patches/libandroidzipfile_makefile_pkgconfig android-platform-system-core-21/debian/patches/libandroidzipfile_makefile_pkgconfig --- android-platform-system-core-21/debian/patches/libandroidzipfile_makefile_pkgconfig 2014-10-22 16:16:43.000000000 +0100 +++ android-platform-system-core-21/debian/patches/libandroidzipfile_makefile_pkgconfig 2014-11-18 10:59:15.000000000 +0000 @@ -18,9 +18,9 @@ + +all: $(OBJECTS) + $(CC) $(LDFLAGS) \ -+ -Wl,-soname,lib$(LIBNAME).so -o lib$(LIBNAME).so $(OBJECTS) $(LIBS) ++ -Wl,-soname,lib$(LIBNAME).so.0 -o lib$(LIBNAME).so.0.21.0 $(OBJECTS) $(LIBS) + ar rs lib$(LIBNAME).a $(OBJECTS) + +clean: + rm -f $(OBJECTS) -+ rm -f lib$(LIBNAME).so lib$(LIBNAME).a ++ rm -f lib$(LIBNAME).so* lib$(LIBNAME).a
