Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
unblock android-platform-frameworks-base/21-2
No android-platform-frameworks-base bugs have been classified as RC, but it was
also affected by the same bugs that affected android-platform-system-core,
android-platform-build, and android-platform-frameworks-native. Therefore, I'm
requesting an unblock to bring this package in sync with the other three, so
that packages that depend on this one won't also suffer from the dependency
madness that happened before.
These are the relevant bugs:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769646
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769251
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769236
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770329
and these unblock requests:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771355
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771069
The debdiff should also look quite familiar to someone who has viewed the
other unblock requests since the changes are all basically the same thing:
$ debdiff android-platform-frameworks-base_21-1.dsc
android-platform-frameworks-base_21-2.dsc
diff -Nru android-platform-frameworks-base-21/debian/aapt.1
android-platform-frameworks-base-21/debian/aapt.1
--- android-platform-frameworks-base-21/debian/aapt.1 2014-10-16
04:39:12.000000000 +0200
+++ android-platform-frameworks-base-21/debian/aapt.1 2014-10-16
04:51:39.000000000 +0200
@@ -26,7 +26,7 @@
.PP
.B aapt
-.RI d[ump] [\-\-values] WHAT file.{apk} [asset [asset ...]]
+.RI d[ump]\ [\-\-values]\ WHAT\ file.{apk}\ [asset\ [asset\ ...]]
strings Print the contents of the resource table string pool in the
APK.
badging Print the label and icon for the app declared in APK.
diff -Nru android-platform-frameworks-base-21/debian/aapt.install
android-platform-frameworks-base-21/debian/aapt.install
--- android-platform-frameworks-base-21/debian/aapt.install 2014-10-02
03:04:57.000000000 +0200
+++ android-platform-frameworks-base-21/debian/aapt.install 2014-10-21
07:02:19.000000000 +0200
@@ -1 +1,2 @@
tools/aapt/aapt usr/bin/
+debian/bash_completion.d/aapt etc/bash_completion.d/
diff -Nru
android-platform-frameworks-base-21/debian/android-libandroidfw-dev.links
android-platform-frameworks-base-21/debian/android-libandroidfw-dev.links
--- android-platform-frameworks-base-21/debian/android-libandroidfw-dev.links
1970-01-01 01:00:00.000000000 +0100
+++ android-platform-frameworks-base-21/debian/android-libandroidfw-dev.links
2014-11-18 13:46:40.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libandroidfw.so.0.21.0 usr/lib/android/libandroidfw.so
diff -Nru
android-platform-frameworks-base-21/debian/android-libandroidfw.install
android-platform-frameworks-base-21/debian/android-libandroidfw.install
--- android-platform-frameworks-base-21/debian/android-libandroidfw.install
2014-10-02 03:04:57.000000000 +0200
+++ android-platform-frameworks-base-21/debian/android-libandroidfw.install
2014-11-18 13:47:22.000000000 +0100
@@ -1 +1 @@
-libs/androidfw/libandroidfw.so usr/lib/android/
+libs/androidfw/libandroidfw.so.0.21.0 usr/lib/android/
diff -Nru
android-platform-frameworks-base-21/debian/android-libandroidfw.links
android-platform-frameworks-base-21/debian/android-libandroidfw.links
--- android-platform-frameworks-base-21/debian/android-libandroidfw.links
1970-01-01 01:00:00.000000000 +0100
+++ android-platform-frameworks-base-21/debian/android-libandroidfw.links
2014-11-18 13:46:40.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libandroidfw.so.0.21.0 usr/lib/android/libandroidfw.so.0
diff -Nru
android-platform-frameworks-base-21/debian/android-libandroidfw.lintian-overrides
android-platform-frameworks-base-21/debian/android-libandroidfw.lintian-overrides
---
android-platform-frameworks-base-21/debian/android-libandroidfw.lintian-overrides
1970-01-01 01:00:00.000000000 +0100
+++
android-platform-frameworks-base-21/debian/android-libandroidfw.lintian-overrides
2014-11-18 13:46:40.000000000 +0100
@@ -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-libandroidfw: postinst-has-useless-call-to-ldconfig
+android-libandroidfw: postrm-has-useless-call-to-ldconfig
diff -Nru android-platform-frameworks-base-21/debian/changelog
android-platform-frameworks-base-21/debian/changelog
--- android-platform-frameworks-base-21/debian/changelog 2014-10-15
23:28:17.000000000 +0200
+++ android-platform-frameworks-base-21/debian/changelog 2014-12-02
14:43:13.000000000 +0100
@@ -1,3 +1,12 @@
+android-platform-frameworks-base (21-2) unstable; urgency=low
+
+ * add versions to shlibs so dh can do dep detection
+ (Closes: #768821) (Closes: #769236)
+ * set Android Tools team as Maintainer
+ * fix installation of aapt bash completion rules
+
+ -- Hans-Christoph Steiner <hans@eds.org> Tue, 02 Dec 2014 14:36:42 +0100
+
android-platform-frameworks-base (21-1) unstable; urgency=low
* Initial release (Closes: #763571)
diff -Nru android-platform-frameworks-base-21/debian/control
android-platform-frameworks-base-21/debian/control
--- android-platform-frameworks-base-21/debian/control 2014-10-16
04:39:13.000000000 +0200
+++ android-platform-frameworks-base-21/debian/control 2014-11-26
15:20:33.000000000 +0100
@@ -1,10 +1,11 @@
Source: android-platform-frameworks-base
Section: devel
Priority: extra
-Maintainer: Hans-Christoph Steiner <hans@eds.org>
+Maintainer: Android tools Maintainer
<android-tools-devel@lists.alioth.debian.org>
+Uploaders: Hans-Christoph Steiner <hans@eds.org>
Build-Depends: debhelper (>= 9.0.0~),
android-system-dev,
- android-libcutils-dev,
+ android-libcutils-dev (>= 21-5~),
android-libhost-dev,
android-liblog-dev,
android-libutils-dev,
@@ -32,6 +33,8 @@
Depends: android-libandroidfw (= ${binary:Version}),
${misc:Depends},
android-libcutils-dev
+Breaks: android-libandroidfw (<< 21-2~)
+Replaces: android-libandroidfw (<< 21-2~)
Description: Android utility library - Development files
Library providing utility functions to Android related tools. This is needed
purely to get various Android utilities working. In the Google builds of the
diff -Nru android-platform-frameworks-base-21/debian/install
android-platform-frameworks-base-21/debian/install
--- android-platform-frameworks-base-21/debian/install 2014-10-16
00:55:24.000000000 +0200
+++ android-platform-frameworks-base-21/debian/install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/bash_completion.d/aapt etc/bash_completion.d/
diff -Nru
android-platform-frameworks-base-21/debian/patches/libs_androidfw_makefile.patch
android-platform-frameworks-base-21/debian/patches/libs_androidfw_makefile.patch
---
android-platform-frameworks-base-21/debian/patches/libs_androidfw_makefile.patch
2014-10-02 00:52:34.000000000 +0200
+++
android-platform-frameworks-base-21/debian/patches/libs_androidfw_makefile.patch
2014-11-26 15:19:23.000000000 +0100
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/libs/androidfw/Makefile
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,55 @@
+#!/bin/make
+
+CXX = g++
@@ -41,16 +41,18 @@
+LIBS := $(ALL_LIBS) $(LIBS)
+
+LIBNAME = libandroidfw
++SONAME = $(LIBNAME).so.0
++SOLIBNAME = $(SONAME).21.0
+
-+all: $(LIBNAME).a $(LIBNAME).so
++all: $(LIBNAME).a $(SOLIBNAME)
+
-+$(LIBNAME).so: $(OBJECTS)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIBNAME).so -o $(LIBNAME).so $(OBJECTS) $(LIBS)
++$(SOLIBNAME): $(OBJECTS)
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(SONAME) -o $(SOLIBNAME) $(OBJECTS) $(LIBS)
+
+$(LIBNAME).a: $(OBJECTS)
+ ar rs $(LIBNAME).a $(OBJECTS)
+
+clean:
+ rm -f $(OBJECTS)
-+ rm -f $(LIBNAME).so $(LIBNAME).a
++ rm -f $(LIBNAME).so* $(LIBNAME).a
+
Attachment:
signature.asc
Description: OpenPGP digital signature