--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: fabstz-it@yahoo.fr
Please unblock package google-android-installers
This version adds a Binary dependency that was missing.
It fixes #1033729
[ Reason ]
Fix bug, add missing binary package dependency.
[ Impact ]
Users that install google-android-cmdline-tools*-installers packages
will have
to manually install the google-android-build-tools-*-installer also (and
find
by themselves that they are required)
[ Tests ]
Manual test that the required dependencies are installed.
[ Risks ]
No big risk since it is just about specifying a dependency inside the same
source package.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
(Anything else the release team should know.)
N/A
unblock google-android-installers/1675172737
diff -Nru google-android-installers-1675172735/debian/changelog google-android-installers-1675172737/debian/changelog
--- google-android-installers-1675172735/debian/changelog 2023-02-08 11:36:58.000000000 +0100
+++ google-android-installers-1675172737/debian/changelog 2023-04-09 22:31:58.000000000 +0200
@@ -1,3 +1,15 @@
+google-android-installers (1675172737) unstable; urgency=medium
+
+ * cmdline-tools: set Architecture to 'amd64 i386'
+
+ -- Fab Stz <fabstz-it@yahoo.fr> Sun, 09 Apr 2023 22:31:58 +0200
+
+google-android-installers (1675172736) unstable; urgency=medium
+
+ * cmdline-tools: add dependency to build-tools packages. Closes: #1033729
+
+ -- Fab Stz <fabstz-it@yahoo.fr> Mon, 03 Apr 2023 18:25:39 +0200
+
google-android-installers (1675172735) unstable; urgency=medium
* New upstream update
diff -Nru google-android-installers-1675172735/debian/cmdline-tools.control.in google-android-installers-1675172737/debian/cmdline-tools.control.in
--- google-android-installers-1675172735/debian/cmdline-tools.control.in 2023-02-08 11:36:58.000000000 +0100
+++ google-android-installers-1675172737/debian/cmdline-tools.control.in 2023-04-09 22:31:58.000000000 +0200
@@ -1,7 +1,8 @@
Package: google-android-cmdline-tools-%VER%-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
diff -Nru google-android-installers-1675172735/debian/cmdline-tools.substvars.in google-android-installers-1675172737/debian/cmdline-tools.substvars.in
--- google-android-installers-1675172735/debian/cmdline-tools.substvars.in 1970-01-01 01:00:00.000000000 +0100
+++ google-android-installers-1675172737/debian/cmdline-tools.substvars.in 2023-04-09 22:31:58.000000000 +0200
@@ -0,0 +1 @@
+googleAndroidCmdlineToolsInstallers:Depends=
diff -Nru google-android-installers-1675172735/debian/control google-android-installers-1675172737/debian/control
--- google-android-installers-1675172735/debian/control 2023-02-08 11:36:58.000000000 +0100
+++ google-android-installers-1675172737/debian/control 2023-04-09 22:31:58.000000000 +0200
@@ -2133,9 +2133,10 @@
available at developer.android.com.
Package: google-android-cmdline-tools-1.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, screenshot2, sdkmanager,
@@ -2162,9 +2163,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-2.1-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, screenshot2, sdkmanager,
@@ -2191,9 +2193,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-3.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, screenshot2, sdkmanager,
@@ -2220,9 +2223,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-4.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, retrace, screenshot2, sdkmanager,
@@ -2249,9 +2253,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-5.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
@@ -2278,9 +2283,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-6.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
@@ -2307,9 +2313,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-7.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
@@ -2336,9 +2343,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-8.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
@@ -2365,9 +2373,10 @@
Agreement of this binary package is available at developer.android.com.
Package: google-android-cmdline-tools-9.0-installer
-Architecture: all
+Architecture: amd64 i386
Depends: default-jre-headless,
google-android-licenses (= ${source:Version}),
+ ${googleAndroidCmdlineToolsInstallers:Depends},
${googleAndroidInstallers:Depends},
${misc:Depends}
#Provides: apkanalyzer, avdmanager, lint, profgen, retrace, screenshot2, sdkmanager,
diff -Nru google-android-installers-1675172735/debian/rules google-android-installers-1675172737/debian/rules
--- google-android-installers-1675172735/debian/rules 2023-02-08 11:36:58.000000000 +0100
+++ google-android-installers-1675172737/debian/rules 2023-04-09 22:31:58.000000000 +0200
@@ -19,6 +19,9 @@
override_dh_clean:
dh_clean
+
+ @sed -i -e "/googleAndroidCmdlineToolsInstallers:Depends=/ s/=.*/=/" debian/cmdline-tools.substvars.in
+
@echo "Cleaning files for 'platforms' package"
@for version in ${PLATFORMS_VERSIONS_TO_PACKAGE}; do \
version=$$(echo $$version | sed "s/,/;/g");\
@@ -241,6 +244,8 @@
cat debian/licenses/$$LICENSE.copyright >> debian/$$PKG_NAME.copyright ;\
echo "" >> debian/$$PKG_NAME.copyright ;\
cat debian/copyright.debian.in >> debian/$$PKG_NAME.copyright ;\
+ sed -i -e "/googleAndroidCmdlineToolsInstallers:Depends=/ s/=\(.*\)/=$$PKG_NAME | \1/" debian/cmdline-tools.substvars.in ;\
+ sed -i -e "/googleAndroidCmdlineToolsInstallers:Depends=/ s/ | $$//" debian/cmdline-tools.substvars.in ;\
done
@echo "Generating files for 'patcher' package"
@@ -558,7 +563,7 @@
ZIPSIZE=$$(grep --perl-regex "^$$version\t" debian/version_list.txt | cut -d " " -f6) ;\
UNPACKED_SIZE=$$(grep --perl-regex "^$$version\t" debian/version_list.txt | cut -d " " -f12 | sed "s/^$$/0/") ;\
INSTALLED_SIZE=$$(((0 + $$UNPACKED_SIZE) / 1024)) ;\
- dh_gencontrol -pgoogle-android-cmdline-tools-$$VER-installer -- -v$$VER+$(DEB_VERSION) -DInstalled-Size=$$INSTALLED_SIZE -Tdebian/substvars.in ;\
+ dh_gencontrol -pgoogle-android-cmdline-tools-$$VER-installer -- -v$$VER+$(DEB_VERSION) -DInstalled-Size=$$INSTALLED_SIZE -Tdebian/substvars.in -Tdebian/cmdline-tools.substvars.in ;\
done
for version in ${PLATFORM_TOOLS_VERSIONS_TO_PACKAGE}; do \
version=$$(echo $$version | sed "s/,/;/g");\
--- End Message ---