r27322 - in /trunk/libsane-perl: Changes META.yml README debian/changelog debian/compat debian/control lib/Sane.pm t/data.t t/err.t t/non-blocking.t t/options.t

ra28145-guest at users.alioth.debian.org ra28145-guest at users.alioth.debian.org
Wed Nov 26 22:07:31 UTC 2008


Author: ra28145-guest
Date: Wed Nov 26 22:07:27 2008
New Revision: 27322

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27322
Log:
New upstream release
+ libextutils-depends-perl dependency.
Bumped d/compat, and d/control

Modified:
    trunk/libsane-perl/Changes
    trunk/libsane-perl/META.yml
    trunk/libsane-perl/README
    trunk/libsane-perl/debian/changelog
    trunk/libsane-perl/debian/compat
    trunk/libsane-perl/debian/control
    trunk/libsane-perl/lib/Sane.pm
    trunk/libsane-perl/t/data.t
    trunk/libsane-perl/t/err.t
    trunk/libsane-perl/t/non-blocking.t
    trunk/libsane-perl/t/options.t

Modified: trunk/libsane-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/Changes?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/Changes (original)
+++ trunk/libsane-perl/Changes Wed Nov 26 22:07:27 2008
@@ -1,6 +1,9 @@
 Revision history for Perl extension SANE.
 
-0.01  Mon Aug 25 16:37:33 2008
+0.02  Wed Nov 26 20:45:00 2008
+	- Skip most tests if we don't have libsane 1.0.19
+        - Fix symbol names in write_pnm_header
+
+0.01  Tue Nov 18 20:31:00 2008
 	- original version; created by h2xs 1.23 with options
 		-A -n Sane
-

Modified: trunk/libsane-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/META.yml?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/META.yml (original)
+++ trunk/libsane-perl/META.yml Wed Nov 26 22:07:27 2008
@@ -1,11 +1,11 @@
 --- #YAML:1.0
 name:                Sane
-version:             0.01
+version:             0.02
 abstract:            Perl extension for the SANE (Scanner Access Now Easy) Project
 license:             ~
 author:              
     - Jeffrey Ratcliffe
-generated_by:        ExtUtils::MakeMaker version 6.42
+generated_by:        ExtUtils::MakeMaker version 6.44
 distribution_type:   module
 requires:     
 meta-spec:

Modified: trunk/libsane-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/README?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/README (original)
+++ trunk/libsane-perl/README Wed Nov 26 22:07:27 2008
@@ -1,7 +1,5 @@
-SANE version 0.01
-=================
-
 Sane - Perl extension for the SANE (Scanner Access Now Easy) Project
+====================================================================
 
 This module allows you to access SANE-compatible scanners in a Perlish and
 object-oriented way, freeing you from the casting and memory management in C,

Modified: trunk/libsane-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/debian/changelog?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/debian/changelog (original)
+++ trunk/libsane-perl/debian/changelog Wed Nov 26 22:07:27 2008
@@ -1,15 +1,5 @@
-libsane-perl (0.01-1) UNRELEASED; urgency=low
+libsane-perl (0.02-1) unstable; urgency=low
 
-  TODO:
-  - FTBFS:
-    Can't locate ExtUtils/Depends.pm in @INC ...
-  - debian/copyright: pointer to GPL missing
-    recommended: switch to new format [+]
-  - recommended switch to debhelper 7 (d/rules, d/compat, d/control) [+]
-  - suggested: s/This module/The Sane module/ in d/control
-  
-  [+] dh-make-perl -R -dh 7
-  
   * Initial release (Closes: #506405).
 
  -- Jeffrey Ratcliffe <Jeffrey.Ratcliffe at gmail.com>  Tue, 25 Nov 2008 20:31:30 +0100

Modified: trunk/libsane-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/debian/compat?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/debian/compat (original)
+++ trunk/libsane-perl/debian/compat Wed Nov 26 22:07:27 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libsane-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/debian/control?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/debian/control (original)
+++ trunk/libsane-perl/debian/control Wed Nov 26 22:07:27 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jeffrey Ratcliffe <Jeffrey.Ratcliffe at gmail.com>
-Build-Depends: debhelper (>= 5), libsane-dev (>= 1.0.19)
+Build-Depends: debhelper (>= 7), libsane-dev (>= 1.0.19), libextutils-depends-perl
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsane-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/
@@ -13,7 +13,7 @@
 Architecture: any
 Depends: ${perl:Depends}, libsane (>= 1.0.19), base-files (>= 4.0.0), ${shlibs:Depends}
 Description: Perl bindings for the SANE (Scanner Access Now Easy) Project
- This module allows you to access SANE-compatible scanners in a Perlish and
- object-oriented way, freeing you from the casting and memory management in C,
- yet remaining very close in spirit to original API. 
+ The Sane module allows you to access SANE-compatible scanners in a Perlish
+ and object-oriented way, freeing you from the casting and memory management
+ in C, yet remaining very close in spirit to original API.
 

Modified: trunk/libsane-perl/lib/Sane.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/lib/Sane.pm?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/lib/Sane.pm (original)
+++ trunk/libsane-perl/lib/Sane.pm Wed Nov 26 22:07:27 2008
@@ -251,7 +251,7 @@
     SANE_NAME_LAMP_OFF_AT_EXIT
 );
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 our $DEBUG = 0;
 our ($STATUS, $_status, $_vc);
 
@@ -338,13 +338,13 @@
 # to read the image.
 
 # For some reason, the #defines need parentheses here, but not normally
- if ($format == SANE_FRAME_RED() or $format == SANE_FRAME_GREEN() or
-                  $format == SANE_FRAME_BLUE() or $format == SANE_FRAME_RGB()) {
+ if ($format == Sane::SANE_FRAME_RED() or $format == Sane::SANE_FRAME_GREEN() or
+                  $format == Sane::SANE_FRAME_BLUE() or $format == Sane::SANE_FRAME_RGB()) {
   printf $fh "P6\n# SANE data follows\n%d %d\n%d\n", $width, $height,
 	      ($depth <= 8) ? 255 : 65535;
  }
 # For some reason, the #defines need parentheses here, but not normally
- elsif ($format == SANE_FRAME_GRAY()) {
+ elsif ($format == Sane::SANE_FRAME_GRAY()) {
   if ($depth == 1) {
    printf $fh "P4\n# SANE data follows\n%d %d\n", $width, $height;
   }
@@ -408,7 +408,7 @@
 
 =head2 Sane->get_version
 
-Returns a array with the SANE_VERSION_(MAJOR|MINOR|BUILD) versions:
+Returns an array with the SANE_VERSION_(MAJOR|MINOR|BUILD) versions:
 
   join('.',Sane->get_version)
 
@@ -660,7 +660,7 @@
 
 =head1 AUTHOR
 
-Jeffrey Ratcliffe, E<lt>Jeffrey.Ratcliffe at gmail.com<gt>
+Jeffrey Ratcliffe, E<lt>Jeffrey.Ratcliffe at gmail.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: trunk/libsane-perl/t/data.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/data.t?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/t/data.t (original)
+++ trunk/libsane-perl/t/data.t Wed Nov 26 22:07:27 2008
@@ -5,13 +5,17 @@
 
 # change 'tests => 1' to 'tests => last_test_to_print';
 
-use Test::More tests => 19;
+use Test::More tests => 17;
 BEGIN { use_ok('Sane') };
 
 #########################
 
 # Insert your test code below, the Test::More module is use()ed here so read
 # its man page ( perldoc Test::More ) for help writing this test script.
+
+my @version = Sane->get_version;
+SKIP: {
+    skip "libsane 1.0.19 or better required", 18 unless $version[2] > 18;
 
 my $test = Sane::Device->open('test');
 cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
@@ -40,6 +44,9 @@
   open my $fh, '>', $filename;
   binmode $fh;
 
+  $test->write_pnm_header($fh, $param->{format}, $param->{pixels_per_line},
+                                           $param->{lines}, $param->{depth});
+
   my ($data, $len);
   do {
    ($data, $len) = $test->read ($param->{bytes_per_line});
@@ -52,6 +59,6 @@
 
   $test->cancel;
   close $fh;
-  is (-s $filename, $param->{bytes_per_line}*$param->{lines}, 'image size');
  }
 }
+};

Modified: trunk/libsane-perl/t/err.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/err.t?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/t/err.t (original)
+++ trunk/libsane-perl/t/err.t Wed Nov 26 22:07:27 2008
@@ -12,6 +12,10 @@
 
 # Insert your test code below, the Test::More module is use()ed here so read
 # its man page ( perldoc Test::More ) for help writing this test script.
+
+my @version = Sane->get_version;
+SKIP: {
+    skip "libsane 1.0.19 or better required", 37 unless $version[2] > 18;
 
 my $test = Sane::Device->open('test');
 cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
@@ -50,3 +54,4 @@
  cmp_ok($Sane::STATUS, '==', $status{$_}, $_);
  $test->cancel;
 }
+};

Modified: trunk/libsane-perl/t/non-blocking.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/non-blocking.t?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/t/non-blocking.t (original)
+++ trunk/libsane-perl/t/non-blocking.t Wed Nov 26 22:07:27 2008
@@ -12,6 +12,10 @@
 
 # Insert your test code below, the Test::More module is use()ed here so read
 # its man page ( perldoc Test::More ) for help writing this test script.
+
+my @version = Sane->get_version;
+SKIP: {
+    skip "libsane 1.0.19 or better required", 13 unless $version[2] > 18;
 
 my $test = Sane::Device->open('test');
 cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
@@ -64,3 +68,4 @@
  close $fh;
  is (-s $filename, $param->{bytes_per_line}*$param->{lines}, 'image size');
 }
+};

Modified: trunk/libsane-perl/t/options.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/options.t?rev=27322&op=diff
==============================================================================
--- trunk/libsane-perl/t/options.t (original)
+++ trunk/libsane-perl/t/options.t Wed Nov 26 22:07:27 2008
@@ -5,7 +5,7 @@
 
 # change 'tests => 1' to 'tests => last_test_to_print';
 
-use Test::More tests => 137;
+use Test::More tests => 139;
 BEGIN { use_ok('Sane') };
 
 #########################
@@ -15,6 +15,10 @@
 
 my @array = Sane->get_version;
 is ($#array, 2, 'get_version');
+
+SKIP: {
+    skip "libsane 1.0.19 or better required", 135 unless $array[2] > 18;
+
 @array = Sane->get_devices;
 cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'get_devices');
 
@@ -84,7 +88,11 @@
     }
    }
    if (defined $in) {
-    $info = $test->set_option($i, $in);
+    SKIP: {
+     skip 'Pressing buttons produces too much output', 1 unless $options->{type} != SANE_TYPE_BUTTON;
+
+     $info = $test->set_option($i, $in);
+    };
     if ($options->{cap} & SANE_CAP_INACTIVE) {
      cmp_ok($Sane::STATUS, '==', SANE_STATUS_INVAL, 'set_option');
     }
@@ -115,3 +123,4 @@
   }
  }
 }
+};




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