[libguard-perl] 01/05: Imported Upstream version 1.023

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libguard-perl.

commit ad3d4eb0c29e10c809a8e278774ee34169248041
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed May 27 00:17:25 2015 +0200

    Imported Upstream version 1.023
---
 Changes   |  8 ++++++--
 Guard.pm  |  2 +-
 Guard.xs  | 12 +++++++++++-
 MANIFEST  |  3 ++-
 META.json | 47 ++++++++++++++++++++++++++++++-----------------
 META.yml  | 21 +++++++++++++++++++++
 6 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/Changes b/Changes
index 78e5d22..097e195 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Guard
 
+1.023 Thu Nov 20 19:12:58 CET 2014
+	- work around backwards compatibility breakage in perl 5.22
+          (removal of PL_sv_objcount).
+
 1.022 Sat Jul  2 02:38:21 CEST 2011
 	- document how () after the function name overrides the
           prototype.
@@ -9,7 +13,7 @@ Revision history for Perl extension Guard
 	- try to provide compatibility to pre-5.8.8.
 
 1.02 Sat Apr 11 06:42:06 CEST 2009
-	- set NODEBUG on scope_guard, to work around -d: modules
+	- set NODEBUG on scope_guard, to work around -d:-modules
           causing scope_guard to be called in the wrong context.
 
 1.01 Wed Jan 14 00:30:18 CET 2009
@@ -24,7 +28,7 @@ Revision history for Perl extension Guard
 0.5  Sat Dec 13 22:46:46 CET 2008
 	- vastly improve documentation,
           clarify local/scope_guard ordering
-          and give a niftier examples.
+          and give niftier examples.
         - always bless guard objects and convert
           Guard::cancel to a method, at an 8% runtime
           cost.
diff --git a/Guard.pm b/Guard.pm
index 76353f8..7e1d9f3 100644
--- a/Guard.pm
+++ b/Guard.pm
@@ -44,7 +44,7 @@ package Guard;
 no warnings;
 
 BEGIN {
-   $VERSION = '1.022';
+   $VERSION = 1.023;
    @ISA = qw(Exporter);
    @EXPORT = qw(guard scope_guard);
 
diff --git a/Guard.xs b/Guard.xs
index 2b2fa9e..8671742 100644
--- a/Guard.xs
+++ b/Guard.xs
@@ -4,6 +4,14 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#include "patchlevel.h"
+
+#define PERL_VERSION_ATLEAST(a,b,c)                             \
+  (PERL_REVISION > (a)                                          \
+   || (PERL_REVISION == (a)                                     \
+       && (PERL_VERSION > (b)                                   \
+           || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
+
 /* apparently < 5.8.8 */
 #ifndef SvSTASH_set
 # define SvSTASH_set(x,a) SvSTASH(x) = (a)
@@ -104,13 +112,15 @@ guard (SV *block)
 	PROTOTYPE: &
         CODE:
 {
-  	SV *cv = guard_get_cv (aTHX_ block);
+	SV *cv = guard_get_cv (aTHX_ block);
         SV *guard = NEWSV (0, 0);
         SvUPGRADE (guard, SVt_PVMG);
         sv_magicext (guard, cv, PERL_MAGIC_ext, &guard_vtbl, 0, 0);
         RETVAL = newRV_noinc (guard);
         SvOBJECT_on (guard);
+#if !PERL_VERSION_ATLEAST(5,18,0)
         ++PL_sv_objcount;
+#endif
         SvSTASH_set (guard, (HV*)SvREFCNT_inc ((SV *)guard_stash));
 }
 	OUTPUT:
diff --git a/MANIFEST b/MANIFEST
index 24157c0..f33aad8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,4 +9,5 @@ t/00_load.t
 t/01_scoped.t
 t/02_guard.t
 t/03_die.t
-META.json                                Module meta-data (added by MakeMaker)
+META.yml                                 Module YAML meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
index a52a3d7..df8b444 100644
--- a/META.json
+++ b/META.json
@@ -1,26 +1,39 @@
 {
+   "abstract" : "unknown",
+   "author" : [
+      "unknown"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142060",
+   "license" : [
+      "unknown"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Guard",
    "no_index" : {
       "directory" : [
          "t",
          "inc"
       ]
    },
-   "meta-spec" : {
-      "version" : 1.4,
-      "url" : "http://module-build.sourceforge.net/META-spec-v1.4.html"
-   },
-   "generated_by" : "ExtUtils::MakeMaker::JSONMETA version 7.000",
-   "distribution_type" : "module",
-   "version" : "1.022",
-   "name" : "Guard",
-   "author" : [],
-   "license" : "unknown",
-   "build_requires" : {
-      "ExtUtils::MakeMaker" : 0
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
    },
-   "requires" : {},
-   "abstract" : null,
-   "configure_requires" : {
-      "ExtUtils::MakeMaker" : 0
-   }
+   "release_status" : "stable",
+   "version" : 1.023
 }
diff --git a/META.yml b/META.yml
new file mode 100644
index 0000000..e34c836
--- /dev/null
+++ b/META.yml
@@ -0,0 +1,21 @@
+---
+abstract: unknown
+author:
+  - unknown
+build_requires:
+  ExtUtils::MakeMaker: '0'
+configure_requires:
+  ExtUtils::MakeMaker: '0'
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142060'
+license: unknown
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: Guard
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+version: 1.023

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libguard-perl.git