From 14bcdce1dc6029c3676c3640d8148c83c14692e5 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 12 Sep 2016 16:22:17 -0400
Subject: Revert "Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to
 bmo/master + local symlink to data/ directory"

This reverts commit e6bf4cacb10f86077fe898349485f5c7ab9fb4b6.
---
 extensions/BMO/Config.pm                           | 3 ---
 extensions/BMO/Extension.pm                        | 4 ----
 extensions/BMO/bin/bug_1022707.pl                  | 2 +-
 extensions/BMO/bin/bug_1093952.pl                  | 2 +-
 extensions/BMO/bin/bug_1141452.pl                  | 2 +-
 extensions/BMO/bin/migrate-github-pull-requests.pl | 2 +-
 extensions/BMO/lib/Constants.pm                    | 4 ----
 extensions/BMO/lib/Data.pm                         | 3 ---
 extensions/BMO/lib/FakeBug.pm                      | 2 --
 extensions/BMO/lib/Reports/Groups.pm               | 2 --
 extensions/BMO/lib/Reports/Internship.pm           | 2 --
 extensions/BMO/lib/Reports/ProductSecurity.pm      | 2 --
 extensions/BMO/lib/Reports/Recruiting.pm           | 2 --
 extensions/BMO/lib/Reports/ReleaseTracking.pm      | 2 --
 extensions/BMO/lib/Reports/Triage.pm               | 3 ---
 extensions/BMO/lib/Reports/UserActivity.pm         | 2 --
 extensions/BMO/lib/Util.pm                         | 2 --
 extensions/BMO/lib/WebService.pm                   | 1 -
 18 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'extensions/BMO')

diff --git a/extensions/BMO/Config.pm b/extensions/BMO/Config.pm
index 153af24cb..93445f576 100644
--- a/extensions/BMO/Config.pm
+++ b/extensions/BMO/Config.pm
@@ -20,10 +20,7 @@
 #   Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::BMO;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'BMO';
 
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index ac0acd72d..5b87d2e8b 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -22,11 +22,7 @@
 #   Byron Jones <glob@mozilla.com>
 
 package Bugzilla::Extension::BMO;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::BugMail;
diff --git a/extensions/BMO/bin/bug_1022707.pl b/extensions/BMO/bin/bug_1022707.pl
index b0a49aa65..c27757220 100755
--- a/extensions/BMO/bin/bug_1022707.pl
+++ b/extensions/BMO/bin/bug_1022707.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 use Bugzilla::Constants qw( USAGE_MODE_CMDLINE );
diff --git a/extensions/BMO/bin/bug_1093952.pl b/extensions/BMO/bin/bug_1093952.pl
index a784e63a3..55d68b9be 100755
--- a/extensions/BMO/bin/bug_1093952.pl
+++ b/extensions/BMO/bin/bug_1093952.pl
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 use Bugzilla::Component;
diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl
index d2d260d7b..0d9b891ea 100755
--- a/extensions/BMO/bin/bug_1141452.pl
+++ b/extensions/BMO/bin/bug_1141452.pl
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/BMO/bin/migrate-github-pull-requests.pl b/extensions/BMO/bin/migrate-github-pull-requests.pl
index 11bf8c55f..1d84352a2 100755
--- a/extensions/BMO/bin/migrate-github-pull-requests.pl
+++ b/extensions/BMO/bin/migrate-github-pull-requests.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/BMO/lib/Constants.pm b/extensions/BMO/lib/Constants.pm
index 3670cb9a2..c77e14f7b 100644
--- a/extensions/BMO/lib/Constants.pm
+++ b/extensions/BMO/lib/Constants.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Constants;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Exporter);
 our @EXPORT = qw(
     REQUEST_MAX_ATTACH_LINES
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index d4c2e3012..b074cb64a 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Data;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 use Tie::IxHash;
diff --git a/extensions/BMO/lib/FakeBug.pm b/extensions/BMO/lib/FakeBug.pm
index f84835ddd..6127cb560 100644
--- a/extensions/BMO/lib/FakeBug.pm
+++ b/extensions/BMO/lib/FakeBug.pm
@@ -3,9 +3,7 @@ package Bugzilla::Extension::BMO::FakeBug;
 # hack to allow the bug entry templates to use check_can_change_field to see if
 # various field values should be available to the current user
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Bug;
 
diff --git a/extensions/BMO/lib/Reports/Groups.pm b/extensions/BMO/lib/Reports/Groups.pm
index ce7df767c..a4816f914 100644
--- a/extensions/BMO/lib/Reports/Groups.pm
+++ b/extensions/BMO/lib/Reports/Groups.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Groups;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Internship.pm b/extensions/BMO/lib/Reports/Internship.pm
index 2dfa583a6..cad403d09 100644
--- a/extensions/BMO/lib/Reports/Internship.pm
+++ b/extensions/BMO/lib/Reports/Internship.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Internship;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/ProductSecurity.pm b/extensions/BMO/lib/Reports/ProductSecurity.pm
index e7ccda171..2324e725a 100644
--- a/extensions/BMO/lib/Reports/ProductSecurity.pm
+++ b/extensions/BMO/lib/Reports/ProductSecurity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::ProductSecurity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Recruiting.pm b/extensions/BMO/lib/Reports/Recruiting.pm
index 39eb8327d..bd988d9b1 100644
--- a/extensions/BMO/lib/Reports/Recruiting.pm
+++ b/extensions/BMO/lib/Reports/Recruiting.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Recruiting;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/ReleaseTracking.pm b/extensions/BMO/lib/Reports/ReleaseTracking.pm
index b6c7c4520..8894a5169 100644
--- a/extensions/BMO/lib/Reports/ReleaseTracking.pm
+++ b/extensions/BMO/lib/Reports/ReleaseTracking.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::ReleaseTracking;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Triage.pm b/extensions/BMO/lib/Reports/Triage.pm
index e9a987b54..debb50577 100644
--- a/extensions/BMO/lib/Reports/Triage.pm
+++ b/extensions/BMO/lib/Reports/Triage.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Triage;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Component;
 use Bugzilla::Constants;
diff --git a/extensions/BMO/lib/Reports/UserActivity.pm b/extensions/BMO/lib/Reports/UserActivity.pm
index 8dfe0c5cd..0a8e79e1f 100644
--- a/extensions/BMO/lib/Reports/UserActivity.pm
+++ b/extensions/BMO/lib/Reports/UserActivity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::UserActivity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Util.pm b/extensions/BMO/lib/Util.pm
index dc9c904f9..df781b9d2 100644
--- a/extensions/BMO/lib/Util.pm
+++ b/extensions/BMO/lib/Util.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/WebService.pm b/extensions/BMO/lib/WebService.pm
index 6ee7cfa6e..87d45085e 100644
--- a/extensions/BMO/lib/WebService.pm
+++ b/extensions/BMO/lib/WebService.pm
@@ -19,7 +19,6 @@
 
 package Bugzilla::Extension::BMO::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-- 
cgit v1.2.3-24-g4f1b