RT #26953: Util.pm was in the wrong directory, but only the

Perl from Darwinports complained, because apparently most other Perl installs have "." in @inc.
beyondgrep · May 9, 2007 · 6905b3d · 6905b3d
1 parent 19745e4
commit 6905b3d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 deletions.
diff --git a/Ack.pm b/Ack.pm
@@ -10,13 +10,13 @@ App::Ack - A container for functions for the ack program
 
 =head1 VERSION
 
-Version 1.60
+Version 1.61_01
 
 =cut
 
 our $VERSION;
 BEGIN {
-    $VERSION = '1.60';
+    $VERSION = '1.61_01';
 }
 
 our %types;

diff --git a/Changes b/Changes
@@ -2,6 +2,11 @@ Changelog for ack
 
 NEXT
 
+    [FIXES]
+    RT #26953: Util.pm was in the wrong directory, but only the
+    Perl from Darwinports complained, because apparently most other
+    Perl installs have "." in @INC.
+
     [ENHANCEMENTS]
     Added .properties extension for --java.
 

diff --git a/MANIFEST b/MANIFEST
@@ -8,7 +8,6 @@ ack-help.txt
 ack-help-types.txt
 ack-standalone
 squash
-Util.pm
 
 t/00-load.t
 t/ack-a.t
@@ -22,6 +21,7 @@ t/pod.t
 t/pod-coverage.t
 t/standalone.t
 t/zero.t
+t/Util.pm
 
 t/etc/core.2112
 t/etc/buttonhook.html.xxx
@@ -59,3 +59,4 @@ t/text/boy-named-sue.txt
 t/text/freedom-of-choice.txt
 t/text/science-of-myth.txt
 t/text/shut-up-be-happy.txt
+META.yml                                 Module meta-data (added by MakeMaker)
diff --git a/META.yml b/META.yml
@@ -1,10 +1,12 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         ack
-version:      1.17_02
+version:      1.60
 version_from: Ack.pm
 installdirs:  site
 requires:
+    File::Basename:                0
+    File::Next:                    0.4
     Getopt::Long:                  0
     Term::ANSIColor:               0
     Test::More:                    0

diff --git a/ack b/ack
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-our $VERSION   = '1.60';
+our $VERSION   = '1.61_01';
 our $COPYRIGHT = 'Copyright 2005-2007 Andy Lester, all rights reserved.';
 # Check http://petdance.com/ack/ for updates
 
@@ -662,6 +662,7 @@ L<http://ack.googlecode.com/svn/>
 How appropriate to have I<ack>nowledgements!
 
 Thanks to everyone who has contributed to ack in any way, including
+Piers Cawley,
 Stephen Steneker,
 Elias Lutfallah,
 Mark Leighton Fisher,

diff --git a/ack-help-types.txt b/ack-help-types.txt
@@ -16,7 +16,7 @@ Note that some extensions may appear in multiple types.  For example,
     --[no]elisp     .el
     --[no]haskell   .hs .lhs
     --[no]html      .htm .html .shtml
-    --[no]java      .java
+    --[no]java      .java .properties
     --[no]js        .js
     --[no]jsp       .jsp .jspx .jhtm .jhtml
     --[no]lisp      .lisp

diff --git a/ack-standalone b/ack-standalone
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-our $VERSION   = '1.60';
+our $VERSION   = '1.61_01';
 our $COPYRIGHT = 'Copyright 2005-2007 Andy Lester, all rights reserved.';
 # Check http://petdance.com/ack/ for updates
 
@@ -660,6 +660,7 @@ L<http://ack.googlecode.com/svn/>
 How appropriate to have I<ack>nowledgements!
 
 Thanks to everyone who has contributed to ack in any way, including
+Piers Cawley,
 Stephen Steneker,
 Elias Lutfallah,
 Mark Leighton Fisher,
@@ -873,7 +874,7 @@ use Scalar::Util ();
 
 our $VERSION;
 BEGIN {
-    $VERSION = '1.60';
+    $VERSION = '1.61_01';
 }
 
 our %types;
@@ -897,7 +898,7 @@ BEGIN {
         haskell     => [qw( hs lhs )],
         html        => [qw( htm html shtml )],
         lisp        => [qw( lisp )],
-        java        => [qw( java )],
+        java        => [qw( java properties )],
         js          => [qw( js )],
         jsp         => [qw( jsp jspx jhtm jhtml )],
         make        => q{Makefiles},

diff --git a/Util.pm → t/Util.pm b/Util.pm → t/Util.pm
diff --git a/t/ack-type.t b/t/ack-type.t
@@ -37,7 +37,7 @@ my $perl = [qw(
     t/swamp/perl.pm
     t/swamp/perl.pod
     t/zero.t
-    Util.pm
+    t/Util.pm
 )];
 
 my $perl_ruby = [ @{$perl}, @{$ruby} ];