r35411 - in /trunk/libsane-perl: Changes MANIFEST META.yml Sane.xs debian/changelog debian/control lib/Sane.pm t/data.t t/enums.t t/err.t t/non-blocking.t t/options.t t/pod.t
ra28145-guest at users.alioth.debian.org
ra28145-guest at users.alioth.debian.org
Thu May 14 20:54:51 UTC 2009
Author: ra28145-guest
Date: Thu May 14 20:54:46 2009
New Revision: 35411
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35411
Log:
Packaging Sane-0.03
Added:
trunk/libsane-perl/t/pod.t
- copied unchanged from r35212, branches/upstream/libsane-perl/current/t/pod.t
Modified:
trunk/libsane-perl/Changes
trunk/libsane-perl/MANIFEST
trunk/libsane-perl/META.yml
trunk/libsane-perl/Sane.xs
trunk/libsane-perl/debian/changelog
trunk/libsane-perl/debian/control
trunk/libsane-perl/lib/Sane.pm
trunk/libsane-perl/t/data.t
trunk/libsane-perl/t/enums.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=35411&op=diff
==============================================================================
--- trunk/libsane-perl/Changes (original)
+++ trunk/libsane-perl/Changes Thu May 14 20:54:46 2009
@@ -1,4 +1,9 @@
-Revision history for Perl extension SANE.
+Revision history for Perl extension Sane.
+
+0.03 Mon, 11 May 2009 09:56:37 +0200
+ - Add Sane->get_version_scalar
+ - Don't export SANE_CAP_ALWAYS_SETTABLE unless libsane 1.0.19
+ - Add debug message for sane_open
0.02 Wed Nov 26 20:45:00 2008
- Skip most tests if we don't have libsane 1.0.19
Modified: trunk/libsane-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/MANIFEST?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/MANIFEST (original)
+++ trunk/libsane-perl/MANIFEST Thu May 14 20:54:46 2009
@@ -13,4 +13,5 @@
t/err.t
t/non-blocking.t
t/options.t
+t/pod.t
META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libsane-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/META.yml?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/META.yml (original)
+++ trunk/libsane-perl/META.yml Thu May 14 20:54:46 2009
@@ -1,11 +1,11 @@
--- #YAML:1.0
name: Sane
-version: 0.02
+version: 0.03
abstract: Perl extension for the SANE (Scanner Access Now Easy) Project
license: ~
author:
- Jeffrey Ratcliffe
-generated_by: ExtUtils::MakeMaker version 6.44
+generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
meta-spec:
Modified: trunk/libsane-perl/Sane.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/Sane.xs?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/Sane.xs (original)
+++ trunk/libsane-perl/Sane.xs Thu May 14 20:54:46 2009
@@ -369,7 +369,9 @@
newCONSTSUB(stash, "SANE_CAP_AUTOMATIC", newSViv(SANE_CAP_AUTOMATIC));
newCONSTSUB(stash, "SANE_CAP_INACTIVE", newSViv(SANE_CAP_INACTIVE));
newCONSTSUB(stash, "SANE_CAP_ADVANCED", newSViv(SANE_CAP_ADVANCED));
+#ifdef SANE_CAP_ALWAYS_SETTABLE
newCONSTSUB(stash, "SANE_CAP_ALWAYS_SETTABLE", newSViv(SANE_CAP_ALWAYS_SETTABLE));
+#endif
newCONSTSUB(stash, "SANE_INFO_INEXACT", newSViv(SANE_INFO_INEXACT));
newCONSTSUB(stash, "SANE_INFO_RELOAD_OPTIONS", newSViv(SANE_INFO_RELOAD_OPTIONS));
@@ -549,7 +551,9 @@
SANE_Handle h;
PPCODE:
status = sane_open(name, &h);
- SV* sv = get_sv("Sane::_status", FALSE);
+ SV* sv = get_sv("Sane::DEBUG", FALSE);
+ if (SvTRUE(sv)) printf("sane_open returned SANE_Handle %d\n", (int) h);
+ sv = get_sv("Sane::_status", FALSE);
sv_setiv(sv, status);
if (status) {
XPUSHs(sv_2mortal(newSV(0)));
Modified: trunk/libsane-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/debian/changelog?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/debian/changelog (original)
+++ trunk/libsane-perl/debian/changelog Thu May 14 20:54:46 2009
@@ -1,3 +1,11 @@
+libsane-perl (0.03-1) unstable; urgency=low
+
+ * New upstream release
+ Closes: #527695:
+ (libsane-perl: FTBFS: Sane.xs:372: error: 'SANE_CAP_ALWAYS_SETTABLE'...)
+
+ -- Jeffrey Ratcliffe <Jeffrey.Ratcliffe at gmail.com> Mon, 11 May 2009 21:30:04 +0200
+
libsane-perl (0.02-1) unstable; urgency=low
* Initial release (Closes: #506405).
Modified: trunk/libsane-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/debian/control?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/debian/control (original)
+++ trunk/libsane-perl/debian/control Thu May 14 20:54:46 2009
@@ -3,8 +3,9 @@
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 (>= 7), libsane-dev (>= 1.0.19), libextutils-depends-perl, libextutils-pkgconfig-perl
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), libsane-dev (>= 1.0.19),
+ libextutils-depends-perl, libextutils-pkgconfig-perl
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsane-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/
DM-Upload-Allowed: yes
Modified: trunk/libsane-perl/lib/Sane.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/lib/Sane.pm?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/lib/Sane.pm (original)
+++ trunk/libsane-perl/lib/Sane.pm Thu May 14 20:54:46 2009
@@ -251,7 +251,7 @@
SANE_NAME_LAMP_OFF_AT_EXIT
);
-our $VERSION = '0.02';
+our $VERSION = '0.03';
our $DEBUG = 0;
our ($STATUS, $_status, $_vc);
@@ -267,6 +267,18 @@
return undef if ($_status);
}
return Sane->_get_version($_vc);
+}
+
+
+sub get_version_scalar {
+ if (not $_vc) {
+ print "Running init\n" if $DEBUG;
+ $_vc = Sane->_init;
+ $STATUS = Sane::Status->new;
+ return undef if ($_status);
+ }
+ my @version = Sane->_get_version($_vc);
+ return $version[0]+$version[1]/1000+$version[2]/1000000;
}
@@ -412,6 +424,12 @@
join('.',Sane->get_version)
+=head2 Sane->get_version_scalar
+
+Returns an scalar with the SANE_VERSION_(MAJOR|MINOR|BUILD) versions combined
+as per the Perl version numbering, i.e. sane 1.0.19 gives 1.000019. This allows
+simple version comparisons.
+
=head2 Sane->get_devices
This function can be used to query the list of devices that are available.
Modified: trunk/libsane-perl/t/data.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/data.t?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/t/data.t (original)
+++ trunk/libsane-perl/t/data.t Thu May 14 20:54:46 2009
@@ -15,7 +15,8 @@
my @version = Sane->get_version;
SKIP: {
- skip "libsane 1.0.19 or better required", 18 unless $version[2] > 18;
+ skip "libsane 1.0.19 or better required", 18
+ unless Sane->get_version_scalar > 1.000018;
my $test = Sane::Device->open('test');
cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
Modified: trunk/libsane-perl/t/enums.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/enums.t?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/t/enums.t (original)
+++ trunk/libsane-perl/t/enums.t Thu May 14 20:54:46 2009
@@ -51,7 +51,12 @@
is (SANE_CAP_AUTOMATIC, 16, "SANE_CAP_AUTOMATIC");
is (SANE_CAP_INACTIVE, 32, "SANE_CAP_INACTIVE");
is (SANE_CAP_ADVANCED, 64, "SANE_CAP_ADVANCED");
-is (SANE_CAP_ALWAYS_SETTABLE, 128, "SANE_CAP_ALWAYS_SETTABLE");
+
+SKIP: {
+ skip 'Only available in libsane 1.0.19', 1
+ unless Sane->get_version_scalar == 1.000019;
+ is (SANE_CAP_ALWAYS_SETTABLE, 128, "SANE_CAP_ALWAYS_SETTABLE");
+};
is (SANE_INFO_INEXACT, 1, "SANE_INFO_INEXACT");
is (SANE_INFO_RELOAD_OPTIONS, 2, "SANE_INFO_RELOAD_OPTIONS");
@@ -81,7 +86,7 @@
is (SANE_NAME_SCAN_BR_X, "br-x", "SANE_NAME_SCAN_BR_X");
is (SANE_NAME_SCAN_BR_Y, "br-y", "SANE_NAME_SCAN_BR_Y");
is (SANE_NAME_SCAN_RESOLUTION, "resolution", "SANE_NAME_SCAN_RESOLUTION");
-is (SANE_NAME_SCAN_X_RESOLUTION, "resolution", "SANE_NAME_SCAN_X_RESOLUTION");
+is (SANE_NAME_SCAN_X_RESOLUTION, Sane->get_version_scalar == 1.000019 ? "resolution" : "x-resolution", "SANE_NAME_SCAN_X_RESOLUTION");
is (SANE_NAME_SCAN_Y_RESOLUTION, "y-resolution", "SANE_NAME_SCAN_Y_RESOLUTION");
is (SANE_NAME_CUSTOM_GAMMA, "custom-gamma", "SANE_NAME_CUSTOM_GAMMA");
is (SANE_NAME_GAMMA_VECTOR, "gamma-table", "SANE_NAME_GAMMA_VECTOR");
Modified: trunk/libsane-perl/t/err.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/err.t?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/t/err.t (original)
+++ trunk/libsane-perl/t/err.t Thu May 14 20:54:46 2009
@@ -13,9 +13,9 @@
# 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;
+ skip "libsane 1.0.19 or better required", 37 unless
+ Sane->get_version_scalar > 1.000018;
my $test = Sane::Device->open('test');
cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
Modified: trunk/libsane-perl/t/non-blocking.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/non-blocking.t?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/t/non-blocking.t (original)
+++ trunk/libsane-perl/t/non-blocking.t Thu May 14 20:54:46 2009
@@ -13,9 +13,9 @@
# 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;
+ skip "libsane 1.0.19 or better required", 13
+ unless Sane->get_version_scalar > 1.000018;
my $test = Sane::Device->open('test');
cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'opening test backend');
Modified: trunk/libsane-perl/t/options.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsane-perl/t/options.t?rev=35411&op=diff
==============================================================================
--- trunk/libsane-perl/t/options.t (original)
+++ trunk/libsane-perl/t/options.t Thu May 14 20:54:46 2009
@@ -17,7 +17,8 @@
is ($#array, 2, 'get_version');
SKIP: {
- skip "libsane 1.0.19 or better required", 135 unless $array[2] > 18;
+ skip "libsane 1.0.19 or better required", 135
+ unless Sane->get_version_scalar > 1.000018;
@array = Sane->get_devices;
cmp_ok($Sane::STATUS, '==', SANE_STATUS_GOOD, 'get_devices');
More information about the Pkg-perl-cvs-commits
mailing list