Merge ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

Show the upstream version only in the screen, and hide the rest in a package_version variable for bug 1723434.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good. Feel free to merge this and upload.

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index f89b787..8a85ef0 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-18e6620996821d33d36fc71cff2d5862ed24dfd8
-18e6620996821d33d36fc71cff2d5862ed24dfd8
+2682d074012bffc6242d607745fafe0bc4d209dc
+2682d074012bffc6242d607745fafe0bc4d209dc
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 grub2_2.02.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index b0c12de..97e2c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.02-2ubuntu7) UNRELEASED; urgency=medium
+
+  * debian/patches/shorter_version_info.patch: Only show the upstream version
+    in menu and console, and hide the package one in a package_version
+    variable. (LP: #1723434)
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 08 Feb 2018 10:50:56 +0100
+
 grub2 (2.02-2ubuntu6) bionic; urgency=medium
 
   [ Steve Langasek ]
diff --git a/debian/patches/series b/debian/patches/series
index 8142c1a..881bbcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -73,3 +73,4 @@ dont-fail-efi-warnings.patch
 tsc_efi_default_to_pmtimer.patch
 mkconfig_keep_native_term_active.patch
 bufio_sensible_block_sizes.patch
+shorter_version_info.patch
diff --git a/debian/patches/shorter_version_info.patch b/debian/patches/shorter_version_info.patch
new file mode 100644
index 0000000..c040d20
--- /dev/null
+++ b/debian/patches/shorter_version_info.patch
@@ -0,0 +1,39 @@
+From 2682d074012bffc6242d607745fafe0bc4d209dc Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Thu, 8 Feb 2018 10:48:37 +0100
+Subject: Show only upstream version, hide rest in package_version variable
+
+The complete package version can get a bit long, so only show the
+upstream version in the menu and on the top of the console, and
+hide the complete version in a package_version variable.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1723434
+Last-Updated: 2018-02-08
+
+Patch-Name: shorter_version_info.patch
+---
+ grub-core/normal/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index e924f6448..4a6b3bff0 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
+  
+   grub_term_cls (term);
+ 
+-  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
++  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), VERSION);
+   if (!msg_formatted)
+     return;
+  
+@@ -560,6 +560,8 @@ GRUB_MOD_INIT(normal)
+   grub_env_export ("grub_cpu");
+   grub_env_set ("grub_platform", GRUB_PLATFORM);
+   grub_env_export ("grub_platform");
++  
++  grub_env_set ("package_version", PACKAGE_VERSION);
+ 
+   grub_boot_time ("Normal module prepared");
+ }
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index e924f64..4a6b3bf 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
  
   grub_term_cls (term);
 
-  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
+  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), VERSION);
   if (!msg_formatted)
     return;
  
@@ -560,6 +560,8 @@ GRUB_MOD_INIT(normal)
   grub_env_export ("grub_cpu");
   grub_env_set ("grub_platform", GRUB_PLATFORM);
   grub_env_export ("grub_platform");
+  
+  grub_env_set ("package_version", PACKAGE_VERSION);
 
   grub_boot_time ("Normal module prepared");
 }