[SCM] Debian packaging of Mason CPAN distribution branch, master, updated. debian/2.14-1-6-g1b39f88

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 43b9ab4beff17806b04bf4273e92fb082a53ce3a
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Nov 29 12:14:28 2011 +0000

    dropping patches applied upstream

diff --git a/debian/changelog b/debian/changelog
index 52baf98..14873a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libmason-perl (2.15-1) UNRELEASED; urgency=low
 
   * Imported Upstream version 2.15 (Closes: #649066)
+  * Dropped pod_error.patch and half of spelling.patch, applied upstream.
 
  -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Tue, 29 Nov 2011 10:50:29 +0000
 
diff --git a/debian/patches/pod_error.patch b/debian/patches/pod_error.patch
deleted file mode 100644
index ac96ffe..0000000
--- a/debian/patches/pod_error.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fix for a minor pod error
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=71581 
-
---- a/lib/Mason/Compilation.pm
-+++ b/lib/Mason/Compilation.pm
-@@ -944,6 +944,8 @@
- An arrayref of valid flags: contains only C<extends> at time of writing. Add to
- this list if you want to create your own flags.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- L<Mason|Mason>
diff --git a/debian/patches/series b/debian/patches/series
index e7dc961..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.patch
-pod_error.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 48d928d..868fc47 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -12,14 +12,3 @@ Forwarded: https://rt.cpan.org/Ticket/Display.html?id=71581
  
  =item compile ()
  
---- a/lib/Mason/Manual/Components.pod
-+++ b/lib/Mason/Manual/Components.pod
-@@ -247,7 +247,7 @@
- 
- Each component class naturally inherits from (or 'extends') a superclass. The
- default superclass for components is L<Mason::Component|Mason::Component>, but
--this may be overriden in two ways: the I<extends flag> and I<autobase
-+this may be overridden in two ways: the I<extends flag> and I<autobase
- components>.
- 
- =head2 Extends flag

-- 
Debian packaging of Mason CPAN distribution