[Android-tools-devel] mistake in uploading android-framework-23
tony mancill
tmancill at debian.org
Sat Mar 10 23:12:32 UTC 2018
Hello Android Tools Maintainers,
I apologize for uploading android-framework-23 without checking with
you first or uploading as a delayed NMU. I saw a notification that a
Java Team package was going to removed from the archive due to 891548
[1] and prepared the upload assuming that android-framework-23 was also
a Java Team package. I didn't realize my mistake until I tried to push
the updated commits to Alioth.
The changes are pretty minimal (debdiff attached) - just a tweak to the
aidl.mk to use the shell's for instead of make's foreach and some minor
freshening. I am also attaching my commits in case you'd like to apply
them to the repo.
So, again, my apologies. I didn't intend to hijack the package.
Sorry for the surprise,
tony
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891548
-------------- next part --------------
diff -Nru android-framework-23-6.0.1+r72/debian/aidl.mk android-framework-23-6.0.1+r72/debian/aidl.mk
--- android-framework-23-6.0.1+r72/debian/aidl.mk 2016-12-09 05:09:20.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/aidl.mk 2018-03-10 12:32:30.000000000 -0800
@@ -389,5 +389,7 @@
build:
@mkdir -p debian/out/android/build/aidl
- @$(foreach aidl_file, $(framework_aidl_files), aidl -b $(aidl_includes) -odebian/out/android/build/aidl $(aidl_file);)
+ for af in $(framework_aidl_files) ; do \
+ aidl -b $(aidl_includes) -odebian/out/android/build/aidl $$af ; \
+ done;
@aidl --preprocess debian/out/android/build/framework.aidl $(aidl_files)
diff -Nru android-framework-23-6.0.1+r72/debian/android-sdk-platform-23.docs android-framework-23-6.0.1+r72/debian/android-sdk-platform-23.docs
--- android-framework-23-6.0.1+r72/debian/android-sdk-platform-23.docs 1969-12-31 16:00:00.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/android-sdk-platform-23.docs 2018-03-10 12:32:30.000000000 -0800
@@ -0,0 +1 @@
+frameworks/base/NOTICE
diff -Nru android-framework-23-6.0.1+r72/debian/changelog android-framework-23-6.0.1+r72/debian/changelog
--- android-framework-23-6.0.1+r72/debian/changelog 2016-12-09 05:14:29.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/changelog 2018-03-10 12:32:30.000000000 -0800
@@ -1,3 +1,13 @@
+android-framework-23 (6.0.1+r72-4) unstable; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS (Closes: #891548)
+ * Add Apache NOTICE file
+ * Use debhelper 11
+ * Bump Standards-Version to 4.1.3
+
+ -- tony mancill <tmancill at debian.org> Sat, 10 Mar 2018 12:32:30 -0800
+
android-framework-23 (6.0.1+r72-3) unstable; urgency=medium
* Build-Depends on gradle-debian-helper (>= 1.4~) for backport friendly
diff -Nru android-framework-23-6.0.1+r72/debian/compat android-framework-23-6.0.1+r72/debian/compat
--- android-framework-23-6.0.1+r72/debian/compat 2016-10-11 00:49:37.000000000 -0700
+++ android-framework-23-6.0.1+r72/debian/compat 2018-03-10 12:32:30.000000000 -0800
@@ -1 +1 @@
-10
\ No newline at end of file
+11
diff -Nru android-framework-23-6.0.1+r72/debian/control android-framework-23-6.0.1+r72/debian/control
--- android-framework-23-6.0.1+r72/debian/control 2016-12-09 04:14:24.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/control 2018-03-10 12:32:30.000000000 -0800
@@ -8,7 +8,7 @@
Build-Depends: aapt,
aidl,
android-logtags-tools,
- debhelper (>= 10),
+ debhelper (>= 11),
default-jdk-headless | default-jdk (>= 2:1.7),
dh-exec,
doclava-aosp,
@@ -16,7 +16,7 @@
maven-repo-helper,
p7zip-full,
proguard
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Homepage: https://android.googlesource.com
Vcs-Git: https://anonscm.debian.org/git/android-tools/android-framework-23.git
Vcs-Browser: https://anonscm.debian.org/cgit/android-tools/android-framework-23.git
@@ -50,4 +50,4 @@
(6.0 Marshmallow).
.
An Android SDK Platform of a specific API Level is required to build any
- Android applications that target this API Level.
\ No newline at end of file
+ Android applications that target this API Level.
diff -Nru android-framework-23-6.0.1+r72/debian/libandroid-23-java.docs android-framework-23-6.0.1+r72/debian/libandroid-23-java.docs
--- android-framework-23-6.0.1+r72/debian/libandroid-23-java.docs 1969-12-31 16:00:00.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/libandroid-23-java.docs 2018-03-10 12:32:30.000000000 -0800
@@ -0,0 +1 @@
+frameworks/base/NOTICE
diff -Nru android-framework-23-6.0.1+r72/debian/libandroid-uiautomator-23-java.docs android-framework-23-6.0.1+r72/debian/libandroid-uiautomator-23-java.docs
--- android-framework-23-6.0.1+r72/debian/libandroid-uiautomator-23-java.docs 1969-12-31 16:00:00.000000000 -0800
+++ android-framework-23-6.0.1+r72/debian/libandroid-uiautomator-23-java.docs 2018-03-10 12:32:30.000000000 -0800
@@ -0,0 +1 @@
+frameworks/base/NOTICE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-FTBFS-891548.patch
Type: text/x-diff
Size: 868 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0005.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Add-Apache-NOTICE-file.patch
Type: text/x-diff
Size: 1253 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0006.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Use-debhelper-11.patch
Type: text/x-diff
Size: 1240 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0007.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-Bump-Standards-Version-to-4.1.3.patch
Type: text/x-diff
Size: 798 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0008.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-prepare-changelog-for-upload.patch
Type: text/x-diff
Size: 846 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0009.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/android-tools-devel/attachments/20180310/9df8ba89/attachment-0001.sig>
More information about the Android-tools-devel
mailing list