[Unstable/Lunar][PATCH 4/5] UBUNTU: [Packaging] debian/rules: Clean up 'printenv' target output

[Juerg Haefliger]

The output of the 'printenv' target is misaligned and somewhat in random
order. Fix the alignment and group the variables by 'type' and put the
flag variables at the end.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian/rules.d/1-maintainer.mk | 75 ++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 611587c1fdc7..f9aa57ab79ca 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -54,24 +54,39 @@ $(configs-targets):
 
 .PHONY: printenv
 printenv:
-	dh_testdir
-	@echo "src package name  = $(src_pkg_name)"
-	@echo "series            = $(series)"
-	@echo "release           = $(release)"
-	@echo "revision          = $(revision)"
-	@echo "uploadnum         = $(uploadnum)"
-	@echo "prev_revision     = $(prev_revision)"
-	@echo "abinum            = $(abinum)"
-	@echo "upstream_tag      = $(upstream_tag)"
-	@echo "variants          = $(variants)"
-	@echo "flavours          = $(flavours)"
-	@echo "do_skip_checks    = $(do_skip_checks)"
-	@echo "do_dbgsym_package = $(do_dbgsym_package)"
-	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
-	@echo "ubuntu_selftests  = $(ubuntu_selftests)"
-	@echo "bin package name  = $(bin_pkg_name)"
-	@echo "hdr package name  = $(hdrs_pkg_name)"
-	@echo "doc package name  = $(doc_pkg_name)"
+	@dh_testdir
+	@echo "src_pkg_name              = $(src_pkg_name)"
+	@echo "series                    = $(series)"
+	@echo "release                   = $(release)"
+	@echo "revision                  = $(revision)"
+	@echo "uploadnum                 = $(uploadnum)"
+	@echo "prev_revision             = $(prev_revision)"
+	@echo "abinum                    = $(abinum)"
+	@echo "upstream_tag              = $(upstream_tag)"
+	@echo "variants                  = $(variants)"
+	@echo "flavours                  = $(flavours)"
+	@echo "bin_pkg_name              = $(bin_pkg_name)"
+	@echo "hdr_pkg_name              = $(hdrs_pkg_name)"
+	@echo "doc_pkg_name              = $(doc_pkg_name)"
+	@echo "libc_dev_version          = $(libc_dev_version)"
+	@echo "ubuntu_selftests          = $(ubuntu_selftests)"
+	@echo "arch                      = $(arch)"
+	@echo "kmake                     = $(kmake)"
+	@echo
+	@echo "CONCURRENCY_LEVEL         = $(CONCURRENCY_LEVEL)"
+	@echo "DEB_HOST_GNU_TYPE         = $(DEB_HOST_GNU_TYPE)"
+	@echo "DEB_BUILD_GNU_TYPE        = $(DEB_BUILD_GNU_TYPE)"
+	@echo "DEB_HOST_ARCH             = $(DEB_HOST_ARCH)"
+	@echo "DEB_BUILD_ARCH            = $(DEB_BUILD_ARCH)"
+	@echo
+	@echo "any_signed                = $(any_signed)"
+	@echo " uefi_signed              = $(uefi_signed)"
+	@echo " opal_signed              = $(opal_signed)"
+	@echo " sipl_signed              = $(sipl_signed)"
+	@echo
+	@echo "do_skip_checks            = $(do_skip_checks)"
+	@echo "do_full_build             = $(do_full_build)"
+	@echo "do_dbgsym_package         = $(do_dbgsym_package)"
 	@echo "do_doc_package            = $(do_doc_package)"
 	@echo "do_doc_package_content    = $(do_doc_package_content)"
 	@echo "do_source_package         = $(do_source_package)"
@@ -85,25 +100,13 @@ printenv:
 	@echo "do_tools                  = $(do_tools)"
 	@echo "do_any_tools              = $(do_any_tools)"
 	@echo "do_linux_tools            = $(do_linux_tools)"
-	@echo " do_tools_cpupower         = $(do_tools_cpupower)"
-	@echo " do_tools_perf             = $(do_tools_perf)"
-	@echo " do_tools_bpftool          = $(do_tools_bpftool)"
-	@echo " do_tools_x86              = $(do_tools_x86)"
-	@echo " do_tools_host             = $(do_tools_host)"
+	@echo " do_tools_cpupower        = $(do_tools_cpupower)"
+	@echo " do_tools_perf            = $(do_tools_perf)"
+	@echo " do_tools_bpftool         = $(do_tools_bpftool)"
+	@echo " do_tools_x86             = $(do_tools_x86)"
+	@echo " do_tools_host            = $(do_tools_host)"
 	@echo "do_cloud_tools            = $(do_cloud_tools)"
-	@echo " do_tools_hyperv           = $(do_tools_hyperv)"
-	@echo "any_signed                = $(any_signed)"
-	@echo " uefi_signed               = $(uefi_signed)"
-	@echo " opal_signed               = $(opal_signed)"
-	@echo " sipl_signed               = $(sipl_signed)"
-	@echo "do_full_build             = $(do_full_build)"
-	@echo "libc_dev_version          = $(libc_dev_version)"
-	@echo "DEB_HOST_GNU_TYPE         = $(DEB_HOST_GNU_TYPE)"
-	@echo "DEB_BUILD_GNU_TYPE        = $(DEB_BUILD_GNU_TYPE)"
-	@echo "DEB_HOST_ARCH             = $(DEB_HOST_ARCH)"
-	@echo "DEB_BUILD_ARCH            = $(DEB_BUILD_ARCH)"
-	@echo "arch                      = $(arch)"
-	@echo "kmake                     = $(kmake)"
+	@echo " do_tools_hyperv          = $(do_tools_hyperv)"
 
 .PHONY: printchanges
 printchanges:
-- 
2.34.1