r48524 - in /trunk/libhtml-widgets-navmenu-perl: ./ HTML/ debian/ lib/HTML/Widgets/ t/ t/lib/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Thu Dec 10 02:37:26 UTC 2009 

Author: jawnsy-guest
Date: Thu Dec 10 02:37:13 2009
New Revision: 48524

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48524
Log:
* New upstream release
* Add myself to Uploaders and Copyright
* Remove liberror-perl dependency (no longer required upstream)

Added:
    trunk/libhtml-widgets-navmenu-perl/t/lib/
      - copied from r48523, branches/upstream/libhtml-widgets-navmenu-perl/current/t/lib/
Removed:
    trunk/libhtml-widgets-navmenu-perl/HTML/
Modified:
    trunk/libhtml-widgets-navmenu-perl/Build.PL
    trunk/libhtml-widgets-navmenu-perl/Changes
    trunk/libhtml-widgets-navmenu-perl/MANIFEST
    trunk/libhtml-widgets-navmenu-perl/META.yml
    trunk/libhtml-widgets-navmenu-perl/debian/changelog
    trunk/libhtml-widgets-navmenu-perl/debian/control
    trunk/libhtml-widgets-navmenu-perl/debian/copyright
    trunk/libhtml-widgets-navmenu-perl/lib/HTML/Widgets/NavMenu.pm
    trunk/libhtml-widgets-navmenu-perl/t/02site-map.t
    trunk/libhtml-widgets-navmenu-perl/t/03nav-links.t
    trunk/libhtml-widgets-navmenu-perl/t/04nav-menu.t
    trunk/libhtml-widgets-navmenu-perl/t/09leading-path.t
    trunk/libhtml-widgets-navmenu-perl/t/10ul-classes.t
    trunk/libhtml-widgets-navmenu-perl/t/15aspetersen-inherit.t
    trunk/libhtml-widgets-navmenu-perl/t/16redirect.t
    trunk/libhtml-widgets-navmenu-perl/t/17nav-coords-unit.t

Modified: trunk/libhtml-widgets-navmenu-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/Build.PL?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/Build.PL (original)
+++ trunk/libhtml-widgets-navmenu-perl/Build.PL Thu Dec 10 02:37:13 2009
@@ -12,7 +12,6 @@
     {
         'Test::More' => 0,
         'Class::Accessor' => 0,
-        'Error' => 0,
         'perl' => "5.6.1",
         'IO::Scalar' => 0,
     },

Modified: trunk/libhtml-widgets-navmenu-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/Changes?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/Changes (original)
+++ trunk/libhtml-widgets-navmenu-perl/Changes Thu Dec 10 02:37:13 2009
@@ -1,4 +1,9 @@
 Revision history for Perl extension Shlomif::NavMenu.
+
+1.0400    Wed Dec  9 11:44:05 IST 2009
+    - Got rid of the dependency on Error.pm.
+    - moved the HTML/ directory with the test scripts-support code from 
+    the root of the distribution to unde t/lib .
 
 1.0302    Thu Jun 25 16:48:42 IDT 2009
     - Fixed some broken links and other inaccuracies in the POD of

Modified: trunk/libhtml-widgets-navmenu-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/MANIFEST?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/MANIFEST (original)
+++ trunk/libhtml-widgets-navmenu-perl/MANIFEST Thu Dec 10 02:37:13 2009
@@ -7,9 +7,6 @@
 examples/article-examples/simple/H-W-NM-simple.pl
 examples/article-examples/with-embellishments/H-W-NM-embellish.pl
 examples/README
-HTML/Widgets/NavMenu/Test/Data.pm
-HTML/Widgets/NavMenu/Test/Stdout.pm
-HTML/Widgets/NavMenu/Test/Util.pm
 inc/Test/Run/Builder.pm
 lib/HTML/Widgets/NavMenu/EscapeHtml.pm
 lib/HTML/Widgets/NavMenu/ExpandVal.pm
@@ -51,6 +48,9 @@
 t/16redirect.t
 t/17nav-coords-unit.t
 t/18url.t
+t/lib/HTML/Widgets/NavMenu/Test/Data.pm
+t/lib/HTML/Widgets/NavMenu/Test/Stdout.pm
+t/lib/HTML/Widgets/NavMenu/Test/Util.pm
 TODO
 TODO-Rejects
 t/pod-coverage.t

Modified: trunk/libhtml-widgets-navmenu-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/META.yml?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/META.yml (original)
+++ trunk/libhtml-widgets-navmenu-perl/META.yml Thu Dec 10 02:37:13 2009
@@ -1,6 +1,6 @@
 ---
 name: HTML-Widgets-NavMenu
-version: 1.0302
+version: 1.0400
 author:
   - |-
     Shlomi Fish E<lt>shlomif at iglu.org.ilE<gt> 
@@ -13,14 +13,15 @@
   repository: http://svn.berlios.de/svnroot/repos/web-cpan/nav-menu/
 requires:
   Class::Accessor: 0
-  Error: 0
   IO::Scalar: 0
   Test::More: 0
-  perl: 5.6.1
+  perl: v5.6.1
+configure_requires:
+  Module::Build: 0.35
 provides:
   HTML::Widgets::NavMenu:
     file: lib/HTML/Widgets/NavMenu.pm
-    version: 1.0302
+    version: 1.0400
   HTML::Widgets::NavMenu::Error:
     file: lib/HTML/Widgets/NavMenu.pm
   HTML::Widgets::NavMenu::Error::Redirect:
@@ -65,7 +66,7 @@
     file: lib/HTML/Widgets/NavMenu/Tree/Node.pm
   HTML::Widgets::NavMenu::Url:
     file: lib/HTML/Widgets/NavMenu/Url.pm
-generated_by: Module::Build version 0.33
+generated_by: Module::Build version 0.35
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4

Modified: trunk/libhtml-widgets-navmenu-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/debian/changelog?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/debian/changelog (original)
+++ trunk/libhtml-widgets-navmenu-perl/debian/changelog Thu Dec 10 02:37:13 2009
@@ -1,8 +1,14 @@
-libhtml-widgets-navmenu-perl (1.0302-2) UNRELEASED; urgency=low
+libhtml-widgets-navmenu-perl (1.0400-1) UNRELEASED; urgency=low
 
+  [ Jonathan Yu ]
+  * New upstream release
+  * Add myself to Uploaders and Copyright
+  * Remove liberror-perl dependency (no longer required upstream)
+
+  [ Ryan Niebur ]
   * Update ryan52's email address
 
- -- Ryan Niebur <ryan at debian.org>  Fri, 25 Sep 2009 00:25:09 -0700
+ -- Jonathan Yu <jawnsy at cpan.org>  Wed, 09 Dec 2009 18:26:43 -0500
 
 libhtml-widgets-navmenu-perl (1.0302-1) unstable; urgency=low
 

Modified: trunk/libhtml-widgets-navmenu-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/debian/control?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/debian/control (original)
+++ trunk/libhtml-widgets-navmenu-perl/debian/control Thu Dec 10 02:37:13 2009
@@ -2,10 +2,10 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, liberror-perl, libio-stringy-perl,
+Build-Depends-Indep: perl, libio-stringy-perl,
  libclass-accessor-perl, libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Ryan Niebur <ryan at debian.org>
+Uploaders: Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>
 Standards-Version: 3.8.3
 Homepage: http://search.cpan.org/dist/HTML-Widgets-NavMenu/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-widgets-navmenu-perl/
@@ -13,11 +13,9 @@
 
 Package: libhtml-widgets-navmenu-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, liberror-perl,
+Depends: ${perl:Depends}, ${misc:Depends},
  libio-stringy-perl, libclass-accessor-perl
-Description: Perl module for generating HTML navigation menus
+Description: module for generating HTML navigation menus
  HTML::Widgets::NavMenu generates a navigation menu for a site. It can also
  generate a complete site map, a path of leading components, and also keeps
  track of navigation links ("Next", "Prev", "Up", etc.)
-
-

Modified: trunk/libhtml-widgets-navmenu-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/debian/copyright?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/debian/copyright (original)
+++ trunk/libhtml-widgets-navmenu-perl/debian/copyright Thu Dec 10 02:37:13 2009
@@ -10,6 +10,7 @@
 
 Files: debian/*
 Copyright: 2009, Ryan Niebur <ryan at debian.org>
+ 2009, Jonathan Yu <jawnsy at cpan.org>
 License: MIT
 
 License: MIT

Modified: trunk/libhtml-widgets-navmenu-perl/lib/HTML/Widgets/NavMenu.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/lib/HTML/Widgets/NavMenu.pm?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/lib/HTML/Widgets/NavMenu.pm (original)
+++ trunk/libhtml-widgets-navmenu-perl/lib/HTML/Widgets/NavMenu.pm Thu Dec 10 02:37:13 2009
@@ -3,13 +3,11 @@
 
 package HTML::Widgets::NavMenu;
 
-our $VERSION = '1.0302';
+our $VERSION = '1.0400';
 
 package HTML::Widgets::NavMenu::Error;
 
-use Error qw(:try);
-
-use base "Error";
+use base "HTML::Widgets::NavMenu::Object";
 
 package HTML::Widgets::NavMenu::Error::Redirect;
 
@@ -21,9 +19,9 @@
 {
     my $self = shift;
 
-    my $q = shift;
-
-    print $q->redirect($q->script_name() . $self->{-redirect_path});
+    my $cgi = shift;
+
+    print $cgi->redirect($cgi->script_name() . $self->{-redirect_path});
     exit;
 }
 
@@ -174,7 +172,6 @@
 use base 'HTML::Widgets::NavMenu::Object';
 
 use HTML::Widgets::NavMenu::Url;
-use Error qw(:try);
 
 require HTML::Widgets::NavMenu::Iterator::NavMenu;
 require HTML::Widgets::NavMenu::Iterator::SiteMap;
@@ -269,8 +266,12 @@
 
     if (defined($redir_path))
     {
-        throw HTML::Widgets::NavMenu::Error::Redirect
-            -redirect_path => ($redir_path."/");
+        my $error = HTML::Widgets::NavMenu::Error::Redirect->new();
+
+        $error->{'-redirect_path'} = ($redir_path."/");
+        $error->{'msg'} = "Need to redirect";
+
+        die $error;
     }
 
     $path_info =~ s!^\/!!;
@@ -1027,7 +1028,7 @@
 =item 'nav_links_obj'
 
 This points to a hash reference whose keys are link IDs for
-the Firefox "Site Navigatoin Toolbar" 
+the Firefox "Site Navigation Toolbar" 
 ( L<http://www.bolwin.com/software/snb.shtml> ) and compatible programs,
 and its values are Node Description objects. (see "The Node Description 
 Class" below). Here's a sample code that renders the links as 

Modified: trunk/libhtml-widgets-navmenu-perl/t/02site-map.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/02site-map.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/02site-map.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/02site-map.t Thu Dec 10 02:37:13 2009
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
+
+use lib './t/lib';
 
 use Test::More tests => 6;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/03nav-links.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/03nav-links.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/03nav-links.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/03nav-links.t Thu Dec 10 02:37:13 2009
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
+
+use lib './t/lib';
 
 use Test::More tests => 14;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/04nav-menu.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/04nav-menu.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/04nav-menu.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/04nav-menu.t Thu Dec 10 02:37:13 2009
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
+
+use lib './t/lib';
 
 use Test::More tests => 26;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/09leading-path.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/09leading-path.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/09leading-path.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/09leading-path.t Thu Dec 10 02:37:13 2009
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
+
+use lib './t/lib';
 
 use Test::More tests => 34;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/10ul-classes.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/10ul-classes.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/10ul-classes.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/10ul-classes.t Thu Dec 10 02:37:13 2009
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
+
+use lib './t/lib';
 
 use Test::More tests => 3;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/15aspetersen-inherit.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/15aspetersen-inherit.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/15aspetersen-inherit.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/15aspetersen-inherit.t Thu Dec 10 02:37:13 2009
@@ -38,6 +38,8 @@
 }
 
 package main;
+
+use lib './t/lib';
 
 use Test::More tests => 1;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/16redirect.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/16redirect.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/16redirect.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/16redirect.t Thu Dec 10 02:37:13 2009
@@ -32,6 +32,8 @@
 {
     *CORE::GLOBAL::exit = sub { $exit_count++; };
 }
+
+use lib './t/lib';
 
 use Test::More tests => 6;
 

Modified: trunk/libhtml-widgets-navmenu-perl/t/17nav-coords-unit.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-widgets-navmenu-perl/t/17nav-coords-unit.t?rev=48524&op=diff
==============================================================================
--- trunk/libhtml-widgets-navmenu-perl/t/17nav-coords-unit.t (original)
+++ trunk/libhtml-widgets-navmenu-perl/t/17nav-coords-unit.t Thu Dec 10 02:37:13 2009
@@ -2,6 +2,8 @@
 
 use strict;
 use warnings;
+
+use lib './t/lib';
 
 use Test::More tests => 15;

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