Version: 21-4
Control: tags 769646 - sid
Control: tags 770328 + patch

On Sat, 15 Nov 2014 at 11:24:43 +0100, Cyril Brulebois wrote:
> Looking at the contents of the android-libutils package one can see a
> .so and a .a; the .so contains undefined references to various
> android_atomic_* things, which don't seem to be available anywhere in
> the dependencies declared either at the ELF level or in the package
> dependencies:
> | $ nm -D /usr/lib/android/libutils.so|grep android_atomic_
> |          U android_atomic_add
> |          U android_atomic_dec
> |          U android_atomic_inc
> |          U android_atomic_or
> |          U android_atomic_release_cas

I think this has already been fixed in 21-4: libcutils and liblog didn't
have shlibs metadata at all, but now they do. The diff looks small enough
for an unblock request to be reasonable.

Unfortunately, 21-4 has its own new RC bug, #770328, because the maintainer
didn't add the correct Breaks/Replaces when moving files between binary
packages; so it can't just be unblocked as-is. I attach a possible patch
for that.

I think #769236, #769251 could just be merged with #769646. They aren't
really separate bugs, and would be fixed automatically by letting the
fix for #769646 migrate.

    S
diff --git a/debian/changelog b/debian/changelog
index 9c5b880..f997ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
+android-platform-system-core (21-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * For each library where libwhatever.so moved from android-libwhatever
+    to android-libwhatever-dev, the -dev Breaks/Replaces the runtime library
+    (Closes: #770328)
+  * Add bug number to previous changelog entry
+
+ -- Simon McVittie <s...@debian.org>  Sat, 22 Nov 2014 13:25:10 +0000
+
 android-platform-system-core (21-4) unstable; urgency=low
 
   * add versions to shared library names so dh can do auto dep detection
+    (Closes: #769251)
   * dh_shlibdeps misses libcutils dep on liblog, so force manually
 
  -- Hans-Christoph Steiner <h...@eds.org>  Tue, 18 Nov 2014 13:05:59 +0100
diff --git a/debian/control b/debian/control
index 64170de..fe5f5b4 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Architecture: linux-any
 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.
  .
@@ -52,6 +54,8 @@ Depends: ${misc:Depends},
          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 @@ Architecture: linux-any
 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.
  .

Reply via email to