[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771362: unblock android-platform-frameworks-native/21-3

Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

unblock android-platform-frameworks-native/21-3

No bugs have been filed against android-platform-frameworks-native, but it was
also affected by the same bugs that affected android-platform-system-core,
android-platform-build, and android-platform-frameworks-base.  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


$ debdiff android-platform-frameworks-native_21-1.dsc
android-platform-frameworks-native_21-3.dsc
dpkg-source: warning: extracting unsigned source package
(/media/share/code/android-tools/android-platform-frameworks-native_21-1.dsc)
diff -Nru
android-platform-frameworks-native-21/debian/android-libutils-dev.links
android-platform-frameworks-native-21/debian/android-libutils-dev.links
--- android-platform-frameworks-native-21/debian/android-libutils-dev.links
1970-01-01 01:00:00.000000000 +0100
+++ android-platform-frameworks-native-21/debian/android-libutils-dev.links
2014-11-18 14:14:56.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libutils.so.0.21.0 usr/lib/android/libutils.so
diff -Nru
android-platform-frameworks-native-21/debian/android-libutils.install
android-platform-frameworks-native-21/debian/android-libutils.install
--- android-platform-frameworks-native-21/debian/android-libutils.install
2014-11-28 20:45:18.000000000 +0100
+++ android-platform-frameworks-native-21/debian/android-libutils.install
2014-11-18 14:16:56.000000000 +0100
@@ -1 +1 @@
-libs/utils/libutils.so usr/lib/android/
+libs/utils/libutils.so.0.21.0 usr/lib/android/
diff -Nru android-platform-frameworks-native-21/debian/android-libutils.links
android-platform-frameworks-native-21/debian/android-libutils.links
--- android-platform-frameworks-native-21/debian/android-libutils.links
1970-01-01 01:00:00.000000000 +0100
+++ android-platform-frameworks-native-21/debian/android-libutils.links
2014-11-18 14:14:56.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libutils.so.0.21.0 usr/lib/android/libutils.so.0
diff -Nru
android-platform-frameworks-native-21/debian/android-libutils.lintian-overrides android-platform-frameworks-native-21/debian/android-libutils.lintian-overrides
---
android-platform-frameworks-native-21/debian/android-libutils.lintian-overrides	1970-01-01
01:00:00.000000000 +0100
+++
android-platform-frameworks-native-21/debian/android-libutils.lintian-overrides	2014-11-18
14:14:56.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-libutils: postinst-has-useless-call-to-ldconfig
+android-libutils: postrm-has-useless-call-to-ldconfig
diff -Nru android-platform-frameworks-native-21/debian/changelog
android-platform-frameworks-native-21/debian/changelog
--- android-platform-frameworks-native-21/debian/changelog	2014-11-28
20:45:18.000000000 +0100
+++ android-platform-frameworks-native-21/debian/changelog	2014-11-26
14:57:20.000000000 +0100
@@ -1,3 +1,15 @@
+android-platform-frameworks-native (21-3) unstable; urgency=low
+
+  * add Breaks: and Replaces: for proper upgrading (Closes: #771062)
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Wed, 26 Nov 2014 14:55:28 +0100
+
+android-platform-frameworks-native (21-2) unstable; urgency=low
+
+  * add versions to shlibs so dh can do dep detection
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Tue, 18 Nov 2014 14:22:13 +0100
+
 android-platform-frameworks-native (21-1) unstable; urgency=low

   * Initial release (Closes: #749100)
diff -Nru android-platform-frameworks-native-21/debian/control
android-platform-frameworks-native-21/debian/control
--- android-platform-frameworks-native-21/debian/control	2014-11-28
20:45:18.000000000 +0100
+++ android-platform-frameworks-native-21/debian/control	2014-11-25
12:55:42.000000000 +0100
@@ -10,10 +10,10 @@
                android-libcutils-dev,
                android-liblog-dev,
                zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://android.googlesource.com/platform/frameworks/native
 Vcs-Git:
https://alioth.debian.org/anonscm/git/android-tools/android-platform-frameworks-native.git
-Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=android-tools/android-platform-frameworks-native.git
+Vcs-Browser:
http://anonscm.debian.org/cgit/android-tools/android-platform-frameworks-native.git

 Package: android-libutils
 Section: libs
@@ -29,6 +29,8 @@
 Depends: android-libutils (= ${binary:Version}),
          ${misc:Depends},
          android-libcutils-dev
+Breaks: android-libutils (<< 21-2~)
+Replaces: android-libutils (<< 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.
diff -Nru
android-platform-frameworks-native-21/debian/patches/libutils_makefile.patch
android-platform-frameworks-native-21/debian/patches/libutils_makefile.patch
---
android-platform-frameworks-native-21/debian/patches/libutils_makefile.patch
2014-11-28 20:45:18.000000000 +0100
+++
android-platform-frameworks-native-21/debian/patches/libutils_makefile.patch
2014-11-18 14:17:47.000000000 +0100
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/libs/utils/Makefile
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,60 @@
 +#!/bin/make
 +
 +CXX = g++
@@ -50,12 +50,14 @@
 +LIBS := $(ALL_LIBS) $(LIBS)
 +
 +LIBNAME = libutils
++SONAME = $(LIBNAME).so.0
++SOFILENAME = $(SONAME).21.0
 +
 +all: $(OBJECTS)
-+	$(CXX) $(LDFLAGS) -Wl,-soname,$(LIBNAME).so -o $(LIBNAME).so $(OBJECTS) $(LIBS)
++	$(CXX) $(LDFLAGS) -Wl,-soname,$(SONAME) -o $(SOFILENAME) $(OBJECTS) $(LIBS)
 +	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

Reply to: