Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master + local symlink to data/ directory

3 files changed, 15 insertions, 21 deletions

diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm
index aff9d4b4b..a07df0f1b 100644
--- a/extensions/Bitly/Config.pm
+++ b/extensions/Bitly/Config.pm
@@ -6,32 +6,21 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Bitly;
-use strict;
 
-use Bugzilla::Install::Util qw(vers_cmp);
+use 5.10.1;
+use strict;
+use warnings;
 
 use constant NAME => 'Bitly';
 
 sub REQUIRED_MODULES {
-    my @required;
-    push @required, {
-        package => 'LWP',
-        module  => 'LWP',
-        version => 5,
-    };
-    # LWP 6 split https support into a separate package
-    if (Bugzilla::Install::Requirements::have_vers({
-        package => 'LWP',
-        module  => 'LWP',
-        version => 6,
-    })) {
-        push @required, {
-            package => 'LWP-Protocol-https',
-            module  => 'LWP::Protocol::https',
-            version => 0
-        };
-    }
-    return \@required;
+    return [
+        {
+            package => 'LWP',
+            module  => 'LWP',
+            version => '5.835',
+        },
+    ];
 }
 
 use constant OPTIONAL_MODULES => [
@@ -42,4 +31,6 @@ use constant OPTIONAL_MODULES => [
     },
 ];
 
+use constant API_VERSION_MAP  => { '1_0' => '1_0' };
+
 __PACKAGE__->NAME;
diff --git a/extensions/Bitly/Extension.pm b/extensions/Bitly/Extension.pm
index a368b20fe..82f17bc2a 100644
--- a/extensions/Bitly/Extension.pm
+++ b/extensions/Bitly/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Bitly;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Bitly/lib/WebService.pm b/extensions/Bitly/lib/WebService.pm
index b47accda6..b8ada56d2 100644
--- a/extensions/Bitly/lib/WebService.pm
+++ b/extensions/Bitly/lib/WebService.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::Bitly::WebService;
 
+use 5.10.1;
 use strict;
 use warnings;