diff --git a/Date-Calc-6.3.diff b/Date-Calc-6.3.diff
deleted file mode 100644
index 99fb45f..0000000
--- a/Date-Calc-6.3.diff
+++ /dev/null
@@ -1,635 +0,0 @@
-Index: Date-Calc-6.3/t/f027.t
-===================================================================
---- Date-Calc-6.3.orig/t/f027.t
-+++ Date-Calc-6.3/t/f027.t
-@@ -43,107 +43,107 @@ if ((($year,$mm,$dd) = Decode_Date_US2("
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_1364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_01364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_001364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_10364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_010364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_0010364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_110364_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_0110364_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_00110364_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_1031964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_1032064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_01031964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_01032064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_001031964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_001032064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_11031964_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_11032064_")) &&
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_011031964_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_011032064_")) &&
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_0011031964_")) &&
--($year==1964) && ($mm==11) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_0011032064_")) &&
-+($year==2064) && ($mm==11) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_1964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_1_3_2064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_jan_3_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan_3_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_jAN_3_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_January_3_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-@@ -151,68 +151,68 @@ unless (($year,$mm,$dd) = Decode_Date_US
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2(" January 3rd, 1964 ")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2(" January 3rd, 2064 ")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan0364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan00364_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan2264_")) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan02264_",0)) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_Jan002264_",'')) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja31964_",1)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja32064_",1)) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja031964_",2)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja032064_",2)) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja0031964_",3)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja0032064_",3)) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja221964_",undef)) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja222064_",undef)) &&
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja0221964_")) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja0222064_")) &&
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_ja00221964_")) &&
--($year==1964) && ($mm==1) && ($dd==22))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_ja00222064_")) &&
-+($year==2064) && ($mm==1) && ($dd==22))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-@@ -220,22 +220,22 @@ unless (($year,$mm,$dd) = Decode_Date_US
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--unless (($year,$mm,$dd) = Decode_Date_US2("_ja331964_"))
-+unless (($year,$mm,$dd) = Decode_Date_US2("_ja332064_"))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("x000001x000003x000064x")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US2("_ja_000003x000064x")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_US2("_Janeiro_3_dia_tres_de_janeiro_de_1964_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US2("_Janeiro_3_dia_tres_de_janeiro_de_2064_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-Index: Date-Calc-6.3/t/f028.t
-===================================================================
---- Date-Calc-6.3.orig/t/f028.t
-+++ Date-Calc-6.3/t/f028.t
-@@ -43,132 +43,132 @@ if ((($year,$mm,$dd) = Decode_Date_EU2("
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_03164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_003164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_30164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_030164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_0030164_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_110364_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_0110364_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_00110364_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_3011964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_3012064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_03011964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_03012064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_003011964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_003012064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_11031964_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_11032064_")) &&
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_011031964_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_011032064_")) &&
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_0011031964_")) &&
--($year==1964) && ($mm==3) && ($dd==11))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_0011032064_")) &&
-+($year==2064) && ($mm==3) && ($dd==11))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_1964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_3_1_2064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3_jan_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3_Jan_64_",0)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3_jAN_64_",1)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3-JAN-64_",2)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_3-Jan-1964_",3)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_3-Jan-2064_",3)) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_3-January-1964_",'')) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_3-January-2064_",'')) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-000064_",undef)) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-001964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_000003-Jan-002064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3_ja_64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-@@ -177,42 +177,42 @@ unless (($year,$mm,$dd) = Decode_Date_EU
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja64_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja000064_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja1964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_3ja2064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja1964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_03ja2064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja1964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_003ja2064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja001964_")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_000003ja002064_")) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-@@ -220,22 +220,22 @@ unless (($year,$mm,$dd) = Decode_Date_EU
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--unless (($year,$mm,$dd) = Decode_Date_EU2("_33ja1964_"))
-+unless (($year,$mm,$dd) = Decode_Date_EU2("_33ja2064_"))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("x000003x000001x000064x")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_EU2("x000003_ja_000064x")) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
--if ((($year,$mm,$dd) = Decode_Date_EU2("_dia_tres_3_janeiro_1964_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) &&
--($year==1964) && ($mm==1) && ($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU2("_dia_tres_3_janeiro_2064_mil_novecentos_sessenta_e_seis_",Decode_Language("Portug"))) &&
-+($year==2064) && ($mm==1) && ($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-Index: Date-Calc-6.3/t/f016.t
-===================================================================
---- Date-Calc-6.3.orig/t/f016.t
-+++ Date-Calc-6.3/t/f016.t
-@@ -17,51 +17,51 @@ print "1..25\n";
- 
- $n = 1;
- if ((($year,$mm,$dd) = Decode_Date_EU("3.1.64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("3 1 64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("03.01.64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("03/01/64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
--if ((($year,$mm,$dd) = Decode_Date_EU("3. Ene 1964",4)) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU("3. Ene 2064",4)) &&
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("Geburtstag: 3. Januar '64 in Backnang/Württemberg",3)) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("03-Jan-64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
--if ((($year,$mm,$dd) = Decode_Date_EU("3.Jan1964",6)) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_EU("3.Jan2064",6)) &&
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("3Jan64",0)) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("030164")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("3ja64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_EU("3164")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
-@@ -74,39 +74,39 @@ unless (($year,$mm,$dd) = Decode_Date_EU
- $n++;
- 
- if ((($year,$mm,$dd) = Decode_Date_US("1 3 64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_US("01/03/64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 '64")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
--if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 1964")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US("Jan 3 2064")) &&
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
--if ((($year,$mm,$dd) = Decode_Date_US("===> January 3rd 1964 (birthday)")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US("===> January 3rd 2064 (birthday)")) &&
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
--if ((($year,$mm,$dd) = Decode_Date_US("Jan31964")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+if ((($year,$mm,$dd) = Decode_Date_US("Jan32064")) &&
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_US("Jan364")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_US("ja364")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- if ((($year,$mm,$dd) = Decode_Date_US("1364")) &&
--($year==1964)&&($mm==1)&&($dd==3))
-+($year==2064)&&($mm==1)&&($dd==3))
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- 
diff --git a/Date-Calc-6.3.tar.gz b/Date-Calc-6.3.tar.gz
deleted file mode 100644
index 2c41485..0000000
--- a/Date-Calc-6.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3eb66188af89abc65b71e9852808d5d6b4bea7a606c55f2ae52c229bfc5bdb93
-size 168967
diff --git a/Date-Calc-6.4.tar.gz b/Date-Calc-6.4.tar.gz
new file mode 100644
index 0000000..e360597
--- /dev/null
+++ b/Date-Calc-6.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ce137b2e797b7c0901f3adf1a05a19343356cd1f04676aa1c56a9f624f859ad
+size 173828
diff --git a/cpanspec.yml b/cpanspec.yml
new file mode 100644
index 0000000..c61f43d
--- /dev/null
+++ b/cpanspec.yml
@@ -0,0 +1,20 @@
+---
+description_paragraphs: 3
+#no_testing: broken upstream
+#sources:
+#  - source1
+#  - source2
+#patches:
+#  foo.patch: -p1
+#  bar.patch:
+#preamble: |-
+# BuildRequires:  gcc-c++
+#post_prep: |-
+# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s,  *,,g'`
+# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL 
+#post_install: |-
+# sed on %{name}.files
+#license: SUSE-NonFree
+#skip_noarch: 1
+#custom_build: -
+#./Build build flags=%{?_smp_mflags} --myflag
diff --git a/perl-Date-Calc.changes b/perl-Date-Calc.changes
index 37f5735..3c7a049 100644
--- a/perl-Date-Calc.changes
+++ b/perl-Date-Calc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 16 19:56:35 UTC 2015 - coolo@suse.com
+
+- updated to 6.4
+   see /usr/share/doc/packages/perl-Date-Calc/CHANGES.txt
+- remove upstream Date-Calc-6.3.diff
+
 -------------------------------------------------------------------
 Sun Jan  4 13:16:20 UTC 2015 - coolo@suse.com
 
diff --git a/perl-Date-Calc.spec b/perl-Date-Calc.spec
index d009eda..7ae941d 100644
--- a/perl-Date-Calc.spec
+++ b/perl-Date-Calc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-Date-Calc
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,81 +17,50 @@
 
 
 Name:           perl-Date-Calc
-BuildRequires:  perl(Bit::Vector) >= 7.1
-BuildRequires:  perl(Carp::Clan) >= 6.04
-Requires:       perl(Bit::Vector) >= 7.1
-Requires:       perl(Carp::Clan) >= 6.04
-BuildRequires:  perl-macros
-Version:        6.3
+Version:        6.4
 Release:        0
-Provides:       DateCalc
-Provides:       perl_dc
-Obsoletes:      perl_dc
-Url:            http://search.cpan.org/perldoc?Date::Calc
-Summary:        Perl Date-Calc Module
-License:        Artistic-1.0 or GPL-2.0+
+%define cpan_name Date-Calc
+Summary:        Gregorian calendar date calculations
+License:        Artistic-1.0 or GPL-1.0+
 Group:          Development/Libraries/Perl
-Source:         http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Date-Calc-%{version}.tar.gz
-Patch:          Date-Calc-%{version}.diff
+Url:            http://search.cpan.org/dist/Date-Calc/
+Source0:        http://www.cpan.org/authors/id/S/ST/STBEY/%{cpan_name}-%{version}.tar.gz
+Source1:        cpanspec.yml
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  perl
+BuildRequires:  perl-macros
+BuildRequires:  perl(Bit::Vector) >= 7.4
+BuildRequires:  perl(Carp::Clan) >= 6.04
+Requires:       perl(Bit::Vector) >= 7.4
+Requires:       perl(Carp::Clan) >= 6.04
+Recommends:     perl(Date::Calc::XS) >= 6.4
 %{perl_requires}
 
 %description
-This package consists of a C library and a Perl module (which uses the
-C library, internally) for all kinds of date calculations based on the
-Gregorian calendar (the one used in all western countries today),
-thereby complying with all relevant norms and standards: ISO/R
-2015-1971, DIN 1355 and, to some extent, ISO 8601 (where applicable).
+* *
 
-(See also http://www.engelschall.com/u/sb/download/Date-Calc/DIN1355/
-for a scan of part of the "DIN 1355" document (in German)).
+  'use Date::Calc qw( Days_in_Year Days_in_Month ... );'
 
-The module of course handles year numbers of 2000 and above correctly
-("Year 2000" or "Y2K" compliance) -- actually all year numbers from 1
-to the largest positive integer representable on your system (which is
-at least 32767) can be dealt with.
-
-Note that this package EXTRAPOLATES the Gregorian calendar BACK until
-the year 1 A.D. -- even though the Gregorian calendar was only adopted
-in 1582 by most (not all) European countries, in obedience to the
-corresponding decree of catholic pope Gregor I in that year.
-
-Some (mainly protestant) countries continued to use the Julian calendar
-(used until then) until as late as the beginning of the 20th century.
-
-Finally, note that this package is not intended to do everything you
-could ever imagine automagically for you; it is rather intended to
-serve as a toolbox (in the best of UNIX spirit and traditions) which
-should, however, always get you where you want to go.
+* *
 
 %prep
-%setup -n Date-Calc-%{version} -q
-%patch -p1
+%setup -q -n %{cpan_name}-%{version}
 
 %build
-perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall"
-make %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
 
 %check
-make test
+%{__make} test
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+%perl_make_install
 %perl_process_packlist
-chmod -R u+w *.txt
-for i in `ls *.txt`; do mv $i `basename $i .txt`; done
-rm -rf tools/compile.bat
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man3/Carp::*
-rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/Carp
+%perl_gen_filelist
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files 
-%defattr(-, root, root)
-%doc license README CREDITS CHANGES MANIFEST 
-%doc %{_mandir}/man?/*
-%{perl_vendorarch}/auto/Date/
-%{perl_vendorlib}/Date/
+%files -f %{name}.files
+%defattr(-,root,root,755)
+%doc CHANGES.txt CREDITS.txt README.txt
 
 %changelog