r4733 - in /packages/libwww-google-calculator-perl/trunk: Build.PL Changes MANIFEST META.yml Makefile.PL debian/changelog debian/control debian/rules lib/WWW/Google/Calculator.pm t/02_live.t

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Jan 19 17:59:49 CET 2007 

Author: gwolf
Date: Fri Jan 19 17:59:49 2007
New Revision: 4733

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=4733
Log:
New upstream version (Not uploading yet, I'll wait for 0.3-3 to enter Etch)

Added:
    packages/libwww-google-calculator-perl/trunk/t/02_live.t
      - copied unchanged from r4731, packages/libwww-google-calculator-perl/branches/upstream/current/t/02_live.t
Removed:
    packages/libwww-google-calculator-perl/trunk/Build.PL
Modified:
    packages/libwww-google-calculator-perl/trunk/Changes
    packages/libwww-google-calculator-perl/trunk/MANIFEST
    packages/libwww-google-calculator-perl/trunk/META.yml
    packages/libwww-google-calculator-perl/trunk/Makefile.PL
    packages/libwww-google-calculator-perl/trunk/debian/changelog
    packages/libwww-google-calculator-perl/trunk/debian/control
    packages/libwww-google-calculator-perl/trunk/debian/rules
    packages/libwww-google-calculator-perl/trunk/lib/WWW/Google/Calculator.pm

Modified: packages/libwww-google-calculator-perl/trunk/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/Changes?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/Changes (original)
+++ packages/libwww-google-calculator-perl/trunk/Changes Fri Jan 19 17:59:49 2007
@@ -1,4 +1,10 @@
 Revision history for Perl module WWW::Google::Calculator
+
+0.04 2006-12-04T14:04:56+09:00
+     - Added live test with real network
+     - Fixed module break answer when it has multiplier (Reported by Torkild Retvedt)
+     - Fixed none ascii operator (×) to *
+     - Changed module builder Module::Build to Module::Install
 
 0.03 2006-06-10T17:38:23+09:00
      - Fixed typo s/Class::Accessors::Fast/Class::Accessor::Fast/ in Build.PL

Modified: packages/libwww-google-calculator-perl/trunk/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/MANIFEST?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/MANIFEST (original)
+++ packages/libwww-google-calculator-perl/trunk/MANIFEST Fri Jan 19 17:59:49 2007
@@ -1,12 +1,12 @@
-MANIFEST
+Changes
+lib/WWW/Google/Calculator.pm
+LICENSE
+Makefile.PL
+MANIFEST			This list of files
+META.yml
 README
-LICENSE
-Todo
-Changes
+t/01_load.t
+t/02_live.t
 t/pod-coverage.t
 t/pod.t
-Build.PL
-Makefile.PL
-lib/WWW/Google/Calculator.pm
-t/01_load.t
-META.yml
+Todo

Modified: packages/libwww-google-calculator-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/META.yml?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/META.yml (original)
+++ packages/libwww-google-calculator-perl/trunk/META.yml Fri Jan 19 17:59:49 2007
@@ -1,22 +1,17 @@
----
+abstract: Perl interface for Google calculator
+author: Daisuke Murase <typester at cpan.org>
+build_requires: 
+  Test::More: 0
+distribution_type: module
+generated_by: Module::Install version 0.64
+license: perl
 name: WWW-Google-Calculator
-version: 0.03
-author:
-  - 'Daisuke Murase <typester at cpan.org>'
-abstract: Perl interface for Google calculator
-license: perl
-resources:
-  license: http://dev.perl.org/licenses/
-requires:
+no_index: 
+  directory: 
+    - inc
+    - t
+requires: 
   Class::Accessor::Fast: 0
   HTML::TokeParser: 0
-  URI: 0
   WWW::Mechanize: 0
-provides:
-  WWW::Google::Calculator:
-    file: lib/WWW/Google/Calculator.pm
-    version: 0.03
-generated_by: Module::Build version 0.2801
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
+version: 0.04

Modified: packages/libwww-google-calculator-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/Makefile.PL?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/Makefile.PL (original)
+++ packages/libwww-google-calculator-perl/trunk/Makefile.PL Fri Jan 19 17:59:49 2007
@@ -1,27 +1,14 @@
-unless (eval "use Module::Build::Compat 0.02; 1" ) {
-  print "This module requires Module::Build to install itself.\n";
+use inc::Module::Install;
+name 'WWW-Google-Calculator';
+all_from 'lib/WWW/Google/Calculator.pm';
 
-  require ExtUtils::MakeMaker;
-  my $yn = ExtUtils::MakeMaker::prompt
-    ('  Install Module::Build from CPAN?', 'y');
+requires 'Class::Accessor::Fast' => 0;
+requires 'HTML::TokeParser' => 0;
+requires 'WWW::Mechanize' => 0;
 
-  if ($yn =~ /^y/i) {
-    require Cwd;
-    require File::Spec;
-    require CPAN;
+build_requires 'Test::More';
 
-    # Save this 'cause CPAN will chdir all over the place.
-    my $cwd = Cwd::cwd();
-    my $makefile = File::Spec->rel2abs($0);
+use_test_base;
 
-    CPAN::Shell->install('Module::Build::Compat');
-
-    chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    exec $^X, $makefile, @ARGV;  # Redo now that we have Module::Build
-  } else {
-    warn " *** Cannot install without Module::Build.  Exiting ...\n";
-    exit 1;
-  }
-}
-Module::Build::Compat->run_build_pl(args => \@ARGV);
-Module::Build::Compat->write_makefile();
+auto_include;
+WriteAll;

Modified: packages/libwww-google-calculator-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/debian/changelog?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/debian/changelog (original)
+++ packages/libwww-google-calculator-perl/trunk/debian/changelog Fri Jan 19 17:59:49 2007
@@ -1,3 +1,12 @@
+libwww-google-calculator-perl (0.04-1) unstable; urgency=low
+
+  * New upstream release
+  * Upstream changed from Module::Build to Module::Install - Reworking
+    debian/rules to reflect the change
+  * Added build-dependency on libtest-base-perl
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 19 Jan 2007 10:58:16 -0600
+
 libwww-google-calculator-perl (0.03-3) unstable; urgency=high
 
   * Added missing dependencies on libclass-accessor-perl,

Modified: packages/libwww-google-calculator-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/debian/control?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/debian/control (original)
+++ packages/libwww-google-calculator-perl/trunk/debian/control Fri Jan 19 17:59:49 2007
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 4.0.2)
-Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libclass-accessor-perl, libwww-mechanize-perl, libtest-pod-perl, libtest-pod-coverage-perl
+Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libclass-accessor-perl, libwww-mechanize-perl, libtest-pod-perl, libtest-pod-coverage-perl, libtest-base-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: gregor herrmann <gregor+debian at comodo.priv.at>, Gunnar Wolf <gwolf at debian.org>
 Standards-Version: 3.7.2

Modified: packages/libwww-google-calculator-perl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/debian/rules?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/debian/rules (original)
+++ packages/libwww-google-calculator-perl/trunk/debian/rules Fri Jan 19 17:59:49 2007
@@ -27,8 +27,8 @@
 	dh_testdir
 
 	# Add commands to compile the package here
-	$(PERL) Build.PL installdirs=vendor
-	OPTIMIZE="-Wall -O2 -g" $(PERL) Build
+	$(PERL) Makefile.PL installdirs=vendor
+	OPTIMIZE="-Wall -O2 -g" $(MAKE)
 
 	touch build-stamp
 
@@ -37,7 +37,7 @@
 	dh_testroot
 
 	# Add commands to clean up after the build process here
-	[ ! -f Build ] || $(PERL) Build distclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 
 	dh_clean build-stamp install-stamp
 
@@ -48,8 +48,13 @@
 	dh_clean -k
 
 	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(PERL) Build test
-	$(PERL) Build install destdir=$(TMP)
+	$(MAKE) test
+	$(MAKE) install DESTDIR=$(TMP)
+
+	# As this is a architecture independent package, we are not
+	# supposed to install stuff to /usr/lib. MakeMaker creates
+	# the dirs, we delete them from the deb:
+	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
 
 	touch install-stamp
 

Modified: packages/libwww-google-calculator-perl/trunk/lib/WWW/Google/Calculator.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libwww-google-calculator-perl/trunk/lib/WWW/Google/Calculator.pm?rev=4733&op=diff
==============================================================================
--- packages/libwww-google-calculator-perl/trunk/lib/WWW/Google/Calculator.pm (original)
+++ packages/libwww-google-calculator-perl/trunk/lib/WWW/Google/Calculator.pm Fri Jan 19 17:59:49 2007
@@ -7,7 +7,7 @@
 use HTML::TokeParser;
 use URI;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 __PACKAGE__->mk_accessors(qw/mech error/);
 
@@ -86,6 +86,9 @@
 sub parse_html {
     my ( $self, $html ) = @_;
 
+    $html =~ s!<sup>(.*?)</sup>!^$1!g;
+    $html =~ s!&#215;!*!g;
+
     my $res;
     my $p = HTML::TokeParser->new( \$html );
     while ( my $token = $p->get_token ) {

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