Merge pull request #80 from zonemaster/develop

Merge develop into master as part of release of v2.0.1
zonemaster · May 24, 2019 · 820c1dc · 820c1dc
2 parents d135a10 + 3017afd
commit 820c1dc
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 2,880 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ Makefile
 blib
 pm_to_blib
 LDNS.c
+inc
 ppport.h
 MANIFEST.bak
 Net-LDNS-*.tar.gz
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ perl:
     - "5.24"
     - "5.22"
     - "5.20"
-    - "5.18"
     - "5.16"
-before_install: cpanm --quiet --notest Devel::CheckLib Test::More
+
+# Install configure-time dependencies
+before_install: cpanm --quiet --notest Devel::CheckLib Module::Install Module::Install::XSUtil
diff --git a/Changes b/Changes
@@ -1,5 +1,15 @@
 Release history for Zonemaster component Zonemaster-LDNS
 
+2.0.1 2019-05-21
+
+- Removed
+  - Ubuntu 14.04 is no longer supported
+
+- Changed
+  - inc::Module::install is no longer bundled
+  - Dependency declarations have been cleaned up
+
+
 2.0.0 2019-01-25 (pre-release version)
  - Status
    - This is a pre-release version not fully tested on all supported

diff --git a/Makefile.PL b/Makefile.PL
@@ -24,9 +24,11 @@ GetOptions(
 );
 
 configure_requires 'Devel::CheckLib';
-requires 'MIME::Base64';
+configure_requires 'Module::Install' => 1.19;
+configure_requires 'Module::Install::XSUtil';
 test_requires 'JSON::PP';
 test_requires 'Test::Fatal';
+test_requires 'Test::More' => 1.302015;
 
 use_ppport 3.19;
 cc_libs 'crypto';

diff --git a/README.md b/README.md
@@ -36,6 +36,9 @@ Run-time dependencies:
 Compile-time dependencies (only when installing from source):
  * `make`
  * `Devel::CheckLib`
+ * `Module::Install`
+ * `Module::Install::XSUtil`
+ * `Test::More >= 1.302015`
  * `git` (if [Internal ldns] is enabled)
  * `libtool` (if [Internal ldns] is enabled)
  * `autoconf` (if [Internal ldns] is enabled)