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

This reverts commit e6bf4cacb10f86077fe898349485f5c7ab9fb4b6.

29 files changed, 8 insertions, 34 deletions

diff --git a/extensions/Push/Config.pm b/extensions/Push/Config.pm
index 860e31a23..11e3502fd 100644
--- a/extensions/Push/Config.pm
+++ b/extensions/Push/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::Push;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Push';
 
diff --git a/extensions/Push/Extension.pm b/extensions/Push/Extension.pm
index f682dea35..1d6ec5b62 100644
--- a/extensions/Push/Extension.pm
+++ b/extensions/Push/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/bin/bugzilla-pushd.pl b/extensions/Push/bin/bugzilla-pushd.pl
index 8e92381f3..f048df157 100755
--- a/extensions/Push/bin/bugzilla-pushd.pl
+++ b/extensions/Push/bin/bugzilla-pushd.pl
@@ -10,8 +10,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/Push/bin/nagios_push_checker.pl b/extensions/Push/bin/nagios_push_checker.pl
index 092a9da8f..f022f584d 100755
--- a/extensions/Push/bin/nagios_push_checker.pl
+++ b/extensions/Push/bin/nagios_push_checker.pl
@@ -10,8 +10,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/extensions/Push/lib/Admin.pm b/extensions/Push/lib/Admin.pm
index fa65e0d69..5b0bb8e70 100644
--- a/extensions/Push/lib/Admin.pm
+++ b/extensions/Push/lib/Admin.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Admin;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/BacklogMessage.pm b/extensions/Push/lib/BacklogMessage.pm
index 28b17bae3..cd40ebefb 100644
--- a/extensions/Push/lib/BacklogMessage.pm
+++ b/extensions/Push/lib/BacklogMessage.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::BacklogMessage;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/BacklogQueue.pm b/extensions/Push/lib/BacklogQueue.pm
index a7200c688..79b9b72ee 100644
--- a/extensions/Push/lib/BacklogQueue.pm
+++ b/extensions/Push/lib/BacklogQueue.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::BacklogQueue;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Backoff.pm b/extensions/Push/lib/Backoff.pm
index f0116a2a7..55552e5e1 100644
--- a/extensions/Push/lib/Backoff.pm
+++ b/extensions/Push/lib/Backoff.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Backoff;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Config.pm b/extensions/Push/lib/Config.pm
index 337c2696d..7033b4195 100644
--- a/extensions/Push/lib/Config.pm
+++ b/extensions/Push/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector.disabled/AMQP.pm b/extensions/Push/lib/Connector.disabled/AMQP.pm
index f712ee890..7b7d4aa72 100644
--- a/extensions/Push/lib/Connector.disabled/AMQP.pm
+++ b/extensions/Push/lib/Connector.disabled/AMQP.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::AMQP;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector.disabled/ServiceNow.pm b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
index a6d84cbe0..832cc9262 100644
--- a/extensions/Push/lib/Connector.disabled/ServiceNow.pm
+++ b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::ServiceNow;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Aha.pm b/extensions/Push/lib/Connector/Aha.pm
index e85b5fadf..b64610e03 100644
--- a/extensions/Push/lib/Connector/Aha.pm
+++ b/extensions/Push/lib/Connector/Aha.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Aha;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Base.pm b/extensions/Push/lib/Connector/Base.pm
index ee41bd160..290ea9740 100644
--- a/extensions/Push/lib/Connector/Base.pm
+++ b/extensions/Push/lib/Connector/Base.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Base;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/File.pm b/extensions/Push/lib/Connector/File.pm
index ae249ffe5..563a78567 100644
--- a/extensions/Push/lib/Connector/File.pm
+++ b/extensions/Push/lib/Connector/File.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::File;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/ReviewBoard.pm b/extensions/Push/lib/Connector/ReviewBoard.pm
index 1c657a728..97f489826 100644
--- a/extensions/Push/lib/Connector/ReviewBoard.pm
+++ b/extensions/Push/lib/Connector/ReviewBoard.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::ReviewBoard;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Spark.pm b/extensions/Push/lib/Connector/Spark.pm
index 3194bd3ab..a65567916 100644
--- a/extensions/Push/lib/Connector/Spark.pm
+++ b/extensions/Push/lib/Connector/Spark.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Spark;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/TCL.pm b/extensions/Push/lib/Connector/TCL.pm
index f5b430e47..25e5750dc 100644
--- a/extensions/Push/lib/Connector/TCL.pm
+++ b/extensions/Push/lib/Connector/TCL.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::TCL;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connectors.pm b/extensions/Push/lib/Connectors.pm
index 75a5083ff..026d3f7f1 100644
--- a/extensions/Push/lib/Connectors.pm
+++ b/extensions/Push/lib/Connectors.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connectors;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Constants.pm b/extensions/Push/lib/Constants.pm
index 09c5e464c..18b12d511 100644
--- a/extensions/Push/lib/Constants.pm
+++ b/extensions/Push/lib/Constants.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::Push::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use base 'Exporter';
 
 our @EXPORT = qw(
diff --git a/extensions/Push/lib/Daemon.pm b/extensions/Push/lib/Daemon.pm
index 7f2459a95..c8472e450 100644
--- a/extensions/Push/lib/Daemon.pm
+++ b/extensions/Push/lib/Daemon.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Daemon;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Log.pm b/extensions/Push/lib/Log.pm
index 8a35a6cf5..6faabea97 100644
--- a/extensions/Push/lib/Log.pm
+++ b/extensions/Push/lib/Log.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Log;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/LogEntry.pm b/extensions/Push/lib/LogEntry.pm
index f4e894b94..848df0480 100644
--- a/extensions/Push/lib/LogEntry.pm
+++ b/extensions/Push/lib/LogEntry.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::LogEntry;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Logger.pm b/extensions/Push/lib/Logger.pm
index 833cb3b19..9824f3476 100644
--- a/extensions/Push/lib/Logger.pm
+++ b/extensions/Push/lib/Logger.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Logger;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Message.pm b/extensions/Push/lib/Message.pm
index 1beb18ef0..6d2ed2531 100644
--- a/extensions/Push/lib/Message.pm
+++ b/extensions/Push/lib/Message.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Message;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Option.pm b/extensions/Push/lib/Option.pm
index a08e4c11d..25d529f98 100644
--- a/extensions/Push/lib/Option.pm
+++ b/extensions/Push/lib/Option.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Option;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Push.pm b/extensions/Push/lib/Push.pm
index 45b9b05dd..aaac0bbd6 100644
--- a/extensions/Push/lib/Push.pm
+++ b/extensions/Push/lib/Push.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Push;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Queue.pm b/extensions/Push/lib/Queue.pm
index 3ee0321d9..d89cb23c3 100644
--- a/extensions/Push/lib/Queue.pm
+++ b/extensions/Push/lib/Queue.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Queue;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Serialise.pm b/extensions/Push/lib/Serialise.pm
index bb6834c13..94f33c754 100644
--- a/extensions/Push/lib/Serialise.pm
+++ b/extensions/Push/lib/Serialise.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Serialise;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Util.pm b/extensions/Push/lib/Util.pm
index bda6331bf..f52db6936 100644
--- a/extensions/Push/lib/Util.pm
+++ b/extensions/Push/lib/Util.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Util;
 
-use 5.10.1;
 use strict;
 use warnings;