[SCM] Debian packaging of libdate-calc-perl branch, master, updated. caf9ee6dce5f7f74d2c9a726090419ecc719ec9d

Florian Schlichting fschlich at zedat.fu-berlin.de
Mon Sep 12 22:26:35 UTC 2011


The following commit has been merged in the master branch:
commit f69c1d03e8f225595b89a0231298391b75dc91ad
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Mon Sep 12 22:11:35 2011 +0000

    Delete unnecessary d/clean and unused d/patches/SvPV.patch

diff --git a/debian/changelog b/debian/changelog
index 41090df..687a21c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ libdate-calc-perl (6.3-1) UNRELEASED; urgency=low
   * Depend on the actual version of Carp::Clan that this module says it
     depends on.
   * Bump S-V and compat (no change).
+  * Delete unnecessary d/clean and unused d/patches/SvPV.patch
 
  -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Mon, 12 Sep 2011 21:55:24 +0000
 
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 449002b..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-patchlevel.h
diff --git a/debian/patches/SvPV.patch b/debian/patches/SvPV.patch
deleted file mode 100644
index 9a6a263..0000000
--- a/debian/patches/SvPV.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Thu, 26 Aug 2010 17:08:56 +0900
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/558272
-Bug: https://rt.cpan.org/Ticket/Display.html?id=60233
-Subject: Use SvPV to strigify the SV in case it is not already a string
-
---- libdate-calc-perl.orig/Calc.xs
-+++ libdate-calc-perl/Calc.xs
-@@ -51,9 +51,7 @@
- 
- 
- #define DATECALC_STRING(ref,var,len) \
--    ( ref && !(SvROK(ref)) && SvPOK(ref) && \
--    (var = (charptr)SvPV(ref,PL_na)) && \
--    ((len = (N_int)SvCUR(ref)) | 1) )
-+    ( ref && (var = (charptr)SvPV(ref,len)) )
- 
- #define DATECALC_SCALAR(ref,typ,var) \
-     ( ref && !(SvROK(ref)) && ((var = (typ)SvIV(ref)) | 1) )
-@@ -1268,7 +1266,7 @@
- PPCODE:
- {
-     charptr string;
--    N_int   length;
-+    STRLEN  length;
-     Z_int   lang;
- 
-     if ((items == 1) or (items == 2))
-@@ -1295,7 +1293,7 @@
- PPCODE:
- {
-     charptr string;
--    N_int   length;
-+    STRLEN  length;
-     Z_int   lang;
- 
-     if ((items == 1) or (items == 2))
-@@ -1333,7 +1331,7 @@
- PPCODE:
- {
-     charptr string;
--    N_int   length;
-+    STRLEN  length;
-     Z_int   lang;
-     Z_int   year;
-     Z_int   month;
-@@ -1369,7 +1367,7 @@
- PPCODE:
- {
-     charptr string;
--    N_int   length;
-+    STRLEN  length;
-     Z_int   lang;
-     Z_int   year;
-     Z_int   month;
-@@ -1780,8 +1778,8 @@
- {
-     charptr string;
-     charptr buffer;
--    N_int length;
--    N_int index;
-+    STRLEN length;
-+    STRLEN index;
- 
-     if ( DATECALC_STRING(scalar,string,length) )
-     {
-@@ -1808,8 +1806,8 @@
- {
-     charptr string;
-     charptr buffer;
--    N_int length;
--    N_int index;
-+    STRLEN length;
-+    STRLEN index;
- 
-     if ( DATECALC_STRING(scalar,string,length) )
-     {
---- /dev/null
-+++ libdate-calc-perl/t/debian-558272.t
-@@ -0,0 +1,23 @@
-+#! /usr/bin/perl
-+
-+use strict;
-+use warnings;
-+
-+use Test::More 0.88;
-+use Test::Exception;
-+
-+use_ok("Date::Calc");
-+
-+my $string = "Oct";
-+$string =~ /(.*)/;
-+lives_and { is Date::Calc::Decode_Month($1), 10 } 'Decode_Month($1) works';
-+
-+{
-+  package
-+    Foo;
-+  use overload '""' => sub { "Nov" };
-+}
-+my $foo = bless {}, 'Foo';
-+lives_and { is Date::Calc::Decode_Month($foo), 11 } 'Decode_Month() works with overload';
-+
-+done_testing();

-- 
Debian packaging of libdate-calc-perl



More information about the Pkg-perl-cvs-commits mailing list