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

Bug#856428: marked as done (unblock android-platform-system-core/1:7.0.0+r1-3)

Your message dated Wed, 01 Mar 2017 17:19:27 +0000
with message-id <E1cj7uR-00061a-BQ@respighi.debian.org>
and subject line unblock android-platform-system-core
has caused the Debian Bug report #856428,
regarding unblock android-platform-system-core/1:7.0.0+r1-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
856428: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856428
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package: android-platform-system-coreq

It previously had bash-completion, and a build bug preventing the
upstream completion file from being installed in 1:7.0.0+r1-2 (#856418,
#856419).  This also fixes two other usability bugs (#856001, #848852).

Attached is the source debdiff.



diff -Nru android-platform-system-core-7.0.0+r1/debian/adb.mk android-platform-system-core-7.0.0+r1/debian/adb.mk
--- android-platform-system-core-7.0.0+r1/debian/adb.mk	2016-12-06 14:08:28.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/adb.mk	2017-02-28 23:45:00.000000000 +0100
@@ -9,7 +9,7 @@
 SOURCES := $(foreach source, $(SOURCES), adb/$(source))
 CXXFLAGS += -std=c++14 -fpermissive
 CPPFLAGS += -Iinclude -Iadb -Ibase/include \
-            -DADB_REVISION='"debian"' -DADB_HOST=1 -D_GNU_SOURCE
+            -DADB_REVISION='"$(DEB_VERSION)"' -DADB_HOST=1 -D_GNU_SOURCE
 LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android -Wl,-rpath-link=. \
            -lpthread -L. -ladb -lbase -lcutils
 
diff -Nru android-platform-system-core-7.0.0+r1/debian/changelog android-platform-system-core-7.0.0+r1/debian/changelog
--- android-platform-system-core-7.0.0+r1/debian/changelog	2016-12-21 21:45:45.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/changelog	2017-03-01 00:00:28.000000000 +0100
@@ -1,3 +1,11 @@
+android-platform-system-core (1:7.0.0+r1-3) unstable; urgency=medium
+
+  * install bash-completion for adb and fastboot (Closes: #856418, #856419)
+  * use package version for adb/fastboot's --version (Closes: #856001)
+  * fix depends built from this package to same version (Closes: #848852)
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Tue, 28 Feb 2017 23:45:05 +0100
+
 android-platform-system-core (1:7.0.0+r1-2) unstable; urgency=medium
 
   * Build tools for working with sparse images
diff -Nru android-platform-system-core-7.0.0+r1/debian/control android-platform-system-core-7.0.0+r1/debian/control
--- android-platform-system-core-7.0.0+r1/debian/control	2016-12-21 21:40:05.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/control	2017-03-01 00:00:28.000000000 +0100
@@ -6,6 +6,7 @@
            Kai-Chung Yan <seamlikok@gmail.com>,
            Chirayu Desai <chirayudesai1@gmail.com>
 Build-Depends: android-libunwind-dev (>= 7.0.0+r1~) [amd64 i386 armel armhf arm64 mips mipsel mips64el],
+               bash-completion,
                debhelper (>= 10),
                dh-exec,
                dpkg-dev (>= 1.17.14),
@@ -49,7 +50,10 @@
 Package: android-libcutils
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
-Depends: libbsd0, ${shlibs:Depends}, ${misc:Depends}
+Depends: android-liblog (= ${binary:Version}),
+         libbsd0,
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: Android utils library for C
  This library provides common functionalities for android related tools.
  .
@@ -75,7 +79,9 @@
 
 Package: adb
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: android-libadb (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: android-sdk-platform-tools-common
 Breaks: android-tools-adb
 Replaces: android-tools-adb
@@ -186,7 +192,9 @@
 Package: android-libadb
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: android-libbase (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: Library for Android Debug Bridge
  This library provides APIs for accessing and controlling Android devices.
  .
@@ -208,7 +216,9 @@
 Package: android-libbase
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: android-liblog (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: Android base library
  This library provides APIs for basic tasks like handling files, Unicode
  strings, logging, memory allocation, integer parsing, etc..
@@ -230,7 +240,9 @@
 Package: fastboot
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
 Build-Profiles: <!stage1>
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: android-libadb (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Breaks: android-tools-fastboot
 Replaces: android-tools-fastboot
 Provides: android-tools-fastboot
diff -Nru android-platform-system-core-7.0.0+r1/debian/fastboot.mk android-platform-system-core-7.0.0+r1/debian/fastboot.mk
--- android-platform-system-core-7.0.0+r1/debian/fastboot.mk	2016-12-08 15:09:45.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/fastboot.mk	2017-02-28 23:45:00.000000000 +0100
@@ -12,7 +12,7 @@
           util_linux.cpp
 SOURCES := $(foreach source, $(SOURCES), fastboot/$(source))
 CXXFLAGS += -fpermissive
-CPPFLAGS += -DUSE_F2FS -DFASTBOOT_REVISION='"debian"' \
+CPPFLAGS += -DUSE_F2FS -DFASTBOOT_REVISION='"$(DEB_VERSION)"' \
             -Iinclude \
             -Imkbootimg \
             -Iadb \
diff -Nru android-platform-system-core-7.0.0+r1/debian/libadb.mk android-platform-system-core-7.0.0+r1/debian/libadb.mk
--- android-platform-system-core-7.0.0+r1/debian/libadb.mk	2016-12-06 14:08:28.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/libadb.mk	2017-03-01 00:00:28.000000000 +0100
@@ -19,7 +19,7 @@
           services.cpp
 SOURCES := $(foreach source, $(SOURCES), adb/$(source))
 CXXFLAGS += -fpermissive -std=c++14
-CPPFLAGS += -Iinclude -Ibase/include -DADB_HOST=1 -DADB_REVISION='"debian"'
+CPPFLAGS += -Iinclude -Ibase/include -DADB_HOST=1 -DADB_REVISION='"$(DEB_VERSION)"'
 LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \
            -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
            -lcrypto -lpthread -L. -lbase -lcutils
diff -Nru android-platform-system-core-7.0.0+r1/debian/rules android-platform-system-core-7.0.0+r1/debian/rules
--- android-platform-system-core-7.0.0+r1/debian/rules	2016-12-21 21:45:45.000000000 +0100
+++ android-platform-system-core-7.0.0+r1/debian/rules	2017-03-01 00:00:28.000000000 +0100
@@ -38,7 +38,7 @@
 	make -f $<
 
 libadb.so: debian/libadb.mk libcutils.so libbase.so
-	make -f $<
+	make -f $< DEB_VERSION=$(DEB_VERSION)
 
 libbacktrace.so: debian/libbacktrace.mk libcutils.so libbase.so liblog.so
 	make -f $<
@@ -56,10 +56,10 @@
 	make -f $<
 
 adb: debian/adb.mk libadb.so libcutils.so libbase.so
-	make -f $<
+	make -f $< DEB_VERSION=$(DEB_VERSION)
 
 fastboot: debian/fastboot.mk libziparchive.so libsparse.so libbase.so libcutils.so libadb.so
-	make -f $<
+	make -f $< DEB_VERSION=$(DEB_VERSION)
 
 simg2img: debian/simg2img.mk libsparse.so
 	make -f $<
@@ -73,7 +73,7 @@
 .PHONY: adb fastboot simg2img img2simg append2simg
 
 %:
-	dh $@
+	dh $@ --with bash-completion
 
 override_dh_auto_build: $(COMPONENTS)
 	pandoc -s -o debian/adb.1 debian/adb.1.md

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: