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.
---
 Bugzilla/Attachment/Database.pm    |  2 --
 Bugzilla/Attachment/FileSystem.pm  |  2 --
 Bugzilla/Attachment/PatchReader.pm | 25 ++++++++++++++++---------
 Bugzilla/Attachment/S3.pm          |  2 --
 4 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'Bugzilla/Attachment')

diff --git a/Bugzilla/Attachment/Database.pm b/Bugzilla/Attachment/Database.pm
index 42cdd2d6f..24617cacc 100644
--- a/Bugzilla/Attachment/Database.pm
+++ b/Bugzilla/Attachment/Database.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Attachment::Database;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/Bugzilla/Attachment/FileSystem.pm b/Bugzilla/Attachment/FileSystem.pm
index a9fdf83b6..675184c49 100644
--- a/Bugzilla/Attachment/FileSystem.pm
+++ b/Bugzilla/Attachment/FileSystem.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Attachment::FileSystem;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index fb8b83392..2c1647736 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -1,16 +1,23 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
 # The contents of this file are subject to the Mozilla Public
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Attachment::PatchReader;
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# Contributor(s): John Keiser <john@johnkeiser.com>
+#                 Frédéric Buclin <LpSolit@gmail.com>
 
-use 5.10.1;
 use strict;
-use warnings;
+
+package Bugzilla::Attachment::PatchReader;
 
 use IPC::Open3;
 use Symbol 'gensym';
diff --git a/Bugzilla/Attachment/S3.pm b/Bugzilla/Attachment/S3.pm
index e1c7269a5..6d11f423e 100644
--- a/Bugzilla/Attachment/S3.pm
+++ b/Bugzilla/Attachment/S3.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Attachment::S3;
-
-use 5.10.1;
 use strict;
 use warnings;
 
-- 
cgit v1.2.3-24-g4f1b