Merge from savannah/emacs-30

121371a7064 Move java/incrementing-version-code to AndroidManifest.xm...
8099dc6e3ae Provide an Android version code derived from the Emacs ve...
59fcb2aa1b2 ; * lisp/register.el (register-use-preview): Doc fix (bug...
0383937a701 ; Improve documentation of 'shortdoc'

2 files changed, 15 insertions, 0 deletions

diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index c066d91011a..66b26e65088 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -338,3 +338,18 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
              android:label="GNU Emacs service"/>
   </application>
 </manifest>
+
+<!-- Auto-incrementing version code.
+
+This comment contains an Android version code
+(https://developer.android.com/studio/publish/versioning#versioningsettings)
+corresponding to the current Emacs version.  The version code in
+AndroidManifest.xml.in is hard-coded to a fixed value to facilitate
+package downgrades.  Some automated systems employed by Android package
+repositories require an incrementing numeric version code to detect
+upgrades, which is provided here and is altered by admin/admin.el.
+Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25.
+
+Version-code: 300050000
+
+-->
diff --git a/java/incrementing-version-code b/java/incrementing-version-code
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/java/incrementing-version-code