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

unblock android-platform-build/21-4

Fix RC bug to keep this package in testing, its related to this:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769251



$ debdiff android-platform-build_21-2.dsc  android-platform-build_21-4.dsc
diff -Nru android-platform-build-21/debian/android-libhost-dev.links
android-platform-build-21/debian/android-libhost-dev.links
--- android-platform-build-21/debian/android-libhost-dev.links  1970-01-01
01:00:00.000000000 +0100
+++ android-platform-build-21/debian/android-libhost-dev.links  2014-11-18
13:55:38.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libhost.so.0.21.0 usr/lib/android/libhost.so
diff -Nru android-platform-build-21/debian/android-libhost.install
android-platform-build-21/debian/android-libhost.install
--- android-platform-build-21/debian/android-libhost.install    2014-09-19
02:25:15.000000000 +0200
+++ android-platform-build-21/debian/android-libhost.install    2014-11-18
13:55:18.000000000 +0100
@@ -1 +1 @@
-libs/host/libhost.so usr/lib/android/
+libs/host/libhost.so.0.21.0 usr/lib/android/
diff -Nru android-platform-build-21/debian/android-libhost.links
android-platform-build-21/debian/android-libhost.links
--- android-platform-build-21/debian/android-libhost.links      1970-01-01
01:00:00.000000000 +0100
+++ android-platform-build-21/debian/android-libhost.links      2014-11-18
13:55:38.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/android/libhost.so.0.21.0 usr/lib/android/libhost.so.0
diff -Nru android-platform-build-21/debian/android-libhost.lintian-overrides
android-platform-build-21/debian/android-libhost.lintian-overrides
--- android-platform-build-21/debian/android-libhost.lintian-overrides
1970-01-01 01:00:00.000000000 +0100
+++ android-platform-build-21/debian/android-libhost.lintian-overrides
2014-11-18 13:56:38.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-libhost: postinst-has-useless-call-to-ldconfig
+android-libhost: postrm-has-useless-call-to-ldconfig
diff -Nru android-platform-build-21/debian/changelog
android-platform-build-21/debian/changelog
--- android-platform-build-21/debian/changelog  2014-10-01 18:57:51.000000000 
+0200
+++ android-platform-build-21/debian/changelog  2014-11-25 13:02:07.000000000 
+0100
@@ -1,3 +1,17 @@
+android-platform-build (21-4) unstable; urgency=low
+
+  * include Breaks: and Replaces: to allow for proper upgrading
+
+ -- Hans-Christoph Steiner <h...@eds.org>  Tue, 25 Nov 2014 12:53:11 +0100
+
+android-platform-build (21-3) unstable; urgency=low
+
+  * add versions to shlibs so dh can do dep detection
+  * link libhost with $(CXX) since it includes a .cpp file
+  * Standards-Version: 3.9.6
+
+ -- Hans-Christoph Steiner <h...@eds.org>  Tue, 18 Nov 2014 15:15:37 +0100
+
 android-platform-build (21-2) unstable; urgency=low

   * include pseudolocalize in libhost
diff -Nru android-platform-build-21/debian/control
android-platform-build-21/debian/control
--- android-platform-build-21/debian/control    2014-09-19 02:39:21.000000000 
+0200
+++ android-platform-build-21/debian/control    2014-11-25 12:51:32.000000000 
+0100
@@ -9,10 +9,10 @@
                android-liblog-dev,
                android-libcutils-dev,
                android-system-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://android.googlesource.com/platform/build
 Vcs-Git:
https://alioth.debian.org/anonscm/git/android-tools/android-platform-build.git
-Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=android-tools/android-platform-build.git
+Vcs-Browser:
http://anonscm.debian.org/cgit/android-tools/android-platform-build.git

 Package: zipalign
 Architecture: any
@@ -54,6 +54,8 @@
 Depends: ${misc:Depends},
          libc-dev,
          android-libhost (= ${binary:Version})
+Breaks: android-libhost (<< 21-3~)
+Replaces: android-libhost (<< 21-3~)
 Description: Android utility library for cross-platform tools - headers
  Library providing utility functions to Android related tools. This is needed
  purely to get various Android utilities working.
diff -Nru android-platform-build-21/debian/patches/libhost-makefile.patch
android-platform-build-21/debian/patches/libhost-makefile.patch
--- android-platform-build-21/debian/patches/libhost-makefile.patch     
2014-10-01
18:55:53.000000000 +0200
+++ android-platform-build-21/debian/patches/libhost-makefile.patch     
2014-11-18
15:10:55.000000000 +0100
@@ -21,15 +21,15 @@
 +
 +LIBNAME = libhost
 +
-+all: $(LIBNAME).so $(LIBNAME).a
++all: $(LIBNAME).so.0.21.0 $(LIBNAME).a
 +
-+$(LIBNAME).so: $(OBJECTS)
-+      $(CC) $(LDFLAGS) -Wl,-soname,$(LIBNAME).so -o $(LIBNAME).so $(OBJECTS) 
$(LIBS)
++$(LIBNAME).so.0.21.0: $(OBJECTS)
++      $(CXX) $(LDFLAGS) -Wl,-soname,$(LIBNAME).so.0 -o $(LIBNAME).so.0.21.0
$(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

Reply via email to