Merge pull request #340 from zonemaster/develop

Merge develop into master
zonemaster · Jun 21, 2023 · 47937ad · 47937ad
2 parents 55ff383 + 9a9f381
commit 47937ad
Show file tree

Hide file tree

Showing 18 changed files with 928 additions and 991 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,25 @@
 Release history for Zonemaster component Zonemaster-CLI 
 
+v6.0.0 2023-06-21 (public release version)
+
+ [Breaking changes]
+ - Adds display of Zonemaster::LDNS and libldns versions
+   when --version has been selected (#306)
+
+ [Features]
+ - Updates various report options to zonemaster-cli script
+   (#318, #337, #309, #308)
+ - Adds options "--sourceaddr4" and "--sourceaddr6" to
+   zonemaster-cli script (#317)
+
+ [Fixes]
+ - Updates translations (#338, #328, #329, #331, #327, #322)
+ - Updates documentation in zonemaster-cli script (#336)
+ - Fixes table layout in zonemaster-cli output (#335)
+ - Removes documentation moved to the zonemaster/zonemaster
+   repository (#332)
+ - Removes some untranslatable characters from msgids (#307)
+
 
 v5.0.2 2023-03-01 (public fix version)
 

diff --git a/MANIFEST b/MANIFEST
@@ -1,6 +1,5 @@
 Changes
 CONTRIBUTING.md
-docs/Installation.md
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
@@ -29,4 +28,3 @@ share/locale/fr/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/nb/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
 t/00-load.t
-USING.md
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -4,6 +4,9 @@
 ^MANIFEST\.SKIP$
 ^Dockerfile$
 
+# PO files are not present in the distribution package, tests of those are irrelevant there.
+t/po-files.t
+
 \.tar\.gz$
 \.bak$
 \.po$
@@ -73,3 +76,5 @@
 ^MYMETA\.
 #!end included /usr/share/perl/5.20/ExtUtils/MANIFEST.SKIP
 
+# Development mode aid for File::ShareDir
+^lib/auto/share/dist/Zonemaster-CLI
diff --git a/Makefile.PL b/Makefile.PL
@@ -23,8 +23,8 @@ requires(
     'MooseX::Getopt'     => 0,
     'Text::Reflow'       => 0,
     'Try::Tiny'          => 0,
-    'Zonemaster::Engine' => 4.006002,
-    'Zonemaster::LDNS'   => 3.001000,
+    'Zonemaster::LDNS'   => 3.002000,  # v3.2.0
+    'Zonemaster::Engine' => 4.007000,  # v4.7.0
 );
 
 # Make all platforms include inc/Module/Install/External.pm

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ For an overview of the Zonemaster software, please see the
 ## Prerequisite
 
 Before you install the Zonemaster-CLI utility, you need the Zonemaster-Engine
-test framework installed. Please see the
-[Zonemaster Engine installation instructions]
+test framework installed. Please see the [Zonemaster Engine installation
+instructions][Zonemaster-Engine installation].
 
 
 ## Installation
@@ -54,11 +54,11 @@ This is free software under a 2-clause BSD license. The full text of the license
 be found in the [LICENSE](LICENSE) file included in this respository.
 
 
-[Docker Image Creation]:                          https://github.com/zonemaster/zonemaster/blob/master/docs/internal-documentation/maintenance/ReleaseProcess-create-docker-image.md
-[Docker Hub]:                                     https://hub.docker.com/u/zonemaster
-[Installation]:                                   docs/Installation.md
-[USING]:                                          USING.md
-[Zonemaster Engine installation instructions]:    https://github.com/zonemaster/zonemaster-engine/blob/master/docs/Installation.md
-[Zonemaster README]:                              https://github.com/zonemaster/zonemaster/blob/master/README.md
-[Zonemaster repository]:                          https://github.com/zonemaster/zonemaster
+[Docker Image Creation]:             https://github.com/zonemaster/zonemaster/blob/master/docs/internal/maintenance/ReleaseProcess-create-docker-image.md
+[Docker Hub]:                        https://hub.docker.com/u/zonemaster
+[Installation]:                      https://github.com/zonemaster/zonemaster/blob/master/docs/public/installation/zonemaster-cli.md
+[USING]:                             https://github.com/zonemaster/zonemaster/blob/master/docs/public/using/cli.md
+[Zonemaster-Engine installation]:    https://github.com/zonemaster/zonemaster/blob/master/docs/public/installation/zonemaster-engine.md
+[Zonemaster README]:                 https://github.com/zonemaster/zonemaster/blob/master/README.md
+[Zonemaster repository]:             https://github.com/zonemaster/zonemaster