[SCM] Debian packaging of libdbd-xbase-perl branch, master, updated. 2dfd52645d71c907df323b837fe95a15ffb973aa
Florian Schlichting
fschlich at zedat.fu-berlin.de
Tue Aug 30 20:19:31 UTC 2011
The following commit has been merged in the master branch:
commit 797a10ed6b0597b8a1d0a7d1ca4bbb511995338d
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date: Tue Aug 30 19:58:01 2011 +0000
refresh patches, drop Makefile.PL.patch, no_O_BINARY_redefine.patch (superseded by upstream)
diff --git a/debian/changelog b/debian/changelog
index 9ea3002..707ead0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ libdbd-xbase-perl (1:1.03-1) UNRELEASED; urgency=low
* Imported Upstream version 1.03
* bump S-V and compat (source/format quilt is now native)
* refresh debian/copyright
+ * refresh patches; drop Makefile.PL.patch,
+ no_O_BINARY_redefine.patch (superseded by upstream); forward
+ pod_spelling.patch
-- Florian Schlichting <fschlich at zedat.fu-berlin.de> Tue, 30 Aug 2011 19:15:19 +0000
diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
deleted file mode 100644
index 3dd7316..0000000
--- a/debian/patches/Makefile.PL.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Description: add more files to the clean target
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -46,6 +46,6 @@ WriteMakefile(
- 'EXE_FILES' => [ 'bin/dbfdump', ' bin/indexdump' ],
- 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz',
- POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' },
-- 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '},
-+ 'clean' => { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx t/rooms.sdbm1.dir t/rooms.sdbm1.pag t/rooms.sdbmd.dir t/rooms.sdbmd.pag t/tstidx.dbf t/tstidxid.idx t/tstidxname.idx t/write1.dbf t/write1.FPT'},
- );
-
diff --git a/debian/patches/no_O_BINARY_redefine.patch b/debian/patches/no_O_BINARY_redefine.patch
deleted file mode 100644
index b37f206..0000000
--- a/debian/patches/no_O_BINARY_redefine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Description: do not re-define O_BONARY
-# this stops an annoying warning when this module is loaded
-# Bug: http://rt.cpan.org/Public/Bug/Display.html?id=29523
-# Big-Debian: 494828
-# Author: Damyan Ivanov <dmn at debian.org>
---- a/lib/XBase/Base.pm
-+++ b/lib/XBase/Base.pm
-@@ -11,15 +11,6 @@ use strict;
- use IO::File;
- use Fcntl qw( O_RDWR O_RDONLY );
-
--### I _Realy_ hate to have this code here!
--BEGIN { local $^W = 0;
-- if ($^O =~ /mswin/i) {
-- eval 'use Fcntl qw( O_BINARY )'
-- } else {
-- eval ' sub O_BINARY { 0 } '
-- }
--}
--
- $XBase::Base::VERSION = '0.129';
-
- # Sets the debug level
diff --git a/debian/patches/pod_spelling.patch b/debian/patches/pod_spelling.patch
index a0a2556..361b0d4 100644
--- a/debian/patches/pod_spelling.patch
+++ b/debian/patches/pod_spelling.patch
@@ -1,8 +1,9 @@
# Description: fix some spelling errors
# Author: Damyan Ivanov <dmn at debian.org>
+# Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=70613
--- a/lib/DBD/XBase.pm
+++ b/lib/DBD/XBase.pm
-@@ -156,7 +156,7 @@ sub quote {
+@@ -156,7 +156,7 @@
### return "'\Q$text\E'";
}
@@ -11,7 +12,7 @@
sub commit {
warn "Commit ineffective while AutoCommit is on"
if $_[0]->FETCH('Warn');
-@@ -678,7 +678,7 @@ rtrim, length. I do not have an exact id
+@@ -678,7 +678,7 @@
functions I want to support. It's easy to write them in a couple of
minutes now the interface is there (check the XBase::SQL module if you
want to send a patch containing support for more), it's just that I do
@@ -22,7 +23,7 @@
The select command may contain and order by clause. Only one column is
--- a/lib/XBase.pm
+++ b/lib/XBase.pm
-@@ -1047,7 +1047,7 @@ B<name> is then the name of the table, o
+@@ -1047,7 +1047,7 @@
B<memofile> specifies non standard name for the associated memo file.
By default it's the name of the dbf file, with extension dbt or fpt.
@@ -31,7 +32,7 @@
the dbt file and you do not need it. Default is false.
B<memosep> separator of memo records in the dBase III dbt files. The
-@@ -1193,7 +1193,7 @@ in the hash retain their value.
+@@ -1193,7 +1193,7 @@
=back
@@ -42,7 +43,7 @@
Assorted examples of reading and writing:
--- a/lib/XBase/Base.pm
+++ b/lib/XBase/Base.pm
-@@ -353,7 +353,7 @@ Unlinks the file.
+@@ -353,7 +353,7 @@
=item create_file
@@ -53,7 +54,7 @@
=back
--- a/lib/XBase/FAQ.pod
+++ b/lib/XBase/FAQ.pod
-@@ -117,7 +117,7 @@ If you want to match wildcards with B<DB
+@@ -116,7 +116,7 @@
=item Can I sue you if B<XBase.pm/DBD::XBase> corrupts my data?
No. At least, I hope no. The software is provided without any
@@ -64,7 +65,7 @@
that the results are different from those expected, you are welcome to
--- a/lib/XBase/Index.pm
+++ b/lib/XBase/Index.pm
-@@ -1760,7 +1760,7 @@ making my life easier in helping you.
+@@ -1760,7 +1760,7 @@
=head2 Programmer's notes
diff --git a/debian/patches/series b/debian/patches/series
index 109abb2..39c0987 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-Makefile.PL.patch
underline-dump.patch
-no_O_BINARY_redefine.patch
pod_spelling.patch
diff --git a/debian/patches/underline-dump.patch b/debian/patches/underline-dump.patch
index acc8f97..9ed6d0e 100644
--- a/debian/patches/underline-dump.patch
+++ b/debian/patches/underline-dump.patch
@@ -1,9 +1,10 @@
# Description: rename dbfdump to dbf_dump following the rename in Debian (due
# to #274792)
+# Author: Gregor Herrmann <gregoa at debian.org>
# Forwarded: not-needed
--- a/README
+++ b/README
-@@ -48,7 +48,7 @@ How does the code look like:
+@@ -48,7 +48,7 @@
my $table = new XBase 'table.dbf';
my @data = $table->get_record(0);
@@ -12,7 +13,7 @@
the content of the table in readable form.
-@@ -75,7 +75,7 @@ Support, documentation:
+@@ -75,7 +75,7 @@
native XBase engines produce data incompatible with this
module.
@@ -23,7 +24,7 @@
man page for DBI specific issues, and the XBase::FAQ page.
--- a/bin/dbfdump.PL
+++ b/bin/dbfdump.PL
-@@ -33,7 +33,7 @@ Getopt::Long::GetOptions( \%options,
+@@ -33,7 +33,7 @@
) or exit;
if (defined $options{'version'}) {
@@ -32,7 +33,7 @@
exit;
}
-@@ -44,7 +44,7 @@ if ($stdin) {
+@@ -44,7 +44,7 @@
if (@ARGV == 0 or defined $options{'help'}) {
die <<'EOF';
@@ -41,7 +42,7 @@
where the options specify
--rs output record separator (default newline)
--fs output field separator (default colon)
-@@ -129,11 +129,11 @@ __END__
+@@ -129,11 +129,11 @@
=head1 NAME
@@ -55,7 +56,7 @@
where options are
-@@ -153,15 +153,15 @@ where options are
+@@ -153,15 +153,15 @@
=head1 SYNOPSIS
@@ -76,7 +77,7 @@
default, it prints all fields, separated by colons, one record on
a line. The output record and column separators can be changed by
switches on the command line. You can also ask only for some fields to
-@@ -181,7 +181,7 @@ at Faculty of Informatics, Masaryk Unive
+@@ -183,7 +183,7 @@
=head1 SEE ALSO
@@ -87,7 +88,7 @@
--- a/bin/indexdump.PL
+++ b/bin/indexdump.PL
-@@ -71,15 +71,15 @@ print "Total records: $i\n" if $showtota
+@@ -71,15 +71,15 @@
=head1 NAME
@@ -106,7 +107,7 @@
--type specifies the num/date/char type of the index
--start defines the value to start dump from
--n prints also the total number of records
-@@ -87,12 +87,12 @@ where options are
+@@ -87,12 +87,12 @@
=head1 SYNOPSIS
@@ -122,7 +123,7 @@
The type of the index is one of those supported by the XBase::Index
Perl module (cdx, idx, ntx, ndx, mdx).
-@@ -110,7 +110,7 @@ at Faculty of Informatics, Masaryk Unive
+@@ -112,7 +112,7 @@
=head1 SEE ALSO
@@ -133,7 +134,7 @@
--- a/eg/use_index
+++ b/eg/use_index
-@@ -77,7 +77,7 @@ name:
+@@ -77,7 +77,7 @@
my $cur = $table->prepare_select_with_index(
[ "cust.cdx", 'addr' ], 'field1', 'field2');
@@ -144,7 +145,7 @@
plain field name, chances are that XBase.pm won't be able to recognize
--- a/lib/XBase.pm
+++ b/lib/XBase.pm
-@@ -1341,7 +1341,7 @@ Example of use is
+@@ -1341,7 +1341,7 @@
$table->dump_records("fs" => " | ", "rs" => " <-+\n",
"fields" => [ "id", "msg" ]);'
@@ -153,7 +154,7 @@
=head2 Errors and debugging
-@@ -1423,7 +1423,7 @@ Dan Albertsson for providing support for
+@@ -1427,7 +1427,7 @@
=head1 SEE ALSO
perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface;
@@ -164,7 +165,7 @@
--- a/lib/XBase/FAQ.pod
+++ b/lib/XBase/FAQ.pod
-@@ -175,11 +175,11 @@ script from a different directory (pwd)
+@@ -174,11 +174,11 @@
to your script and you will see that it's not B<DBD::XBase> problem.
@@ -178,7 +179,7 @@
you the expected number of records and length of one record, like
Filename: file.dbf
-@@ -191,7 +191,7 @@ you the expected number of records and l
+@@ -190,7 +190,7 @@
Num fields: 40
So the expected length of the file is at least I<1313 + 65 * 1117>. If
@@ -189,7 +190,7 @@
=item How is this B<DBD::XBase> related to B<DBD::ODBC>?
--- a/lib/XBase/Index.pm
+++ b/lib/XBase/Index.pm
-@@ -1647,17 +1647,18 @@ reading support stable before I get to w
+@@ -1647,17 +1647,18 @@
=head2 Testing your index file (and XBase::Index)
@@ -214,7 +215,7 @@
if you haven't installed this version of XBase.pm/DBD::XBase yet. You
should get the content of the index file. On each row, there is
-@@ -1674,18 +1675,18 @@ index to see if the sequence is OK.
+@@ -1674,18 +1675,18 @@
The index formats usually distinguish between numeric and character
data. Some of the file formats include the information about the type
@@ -239,7 +240,7 @@
=head2 Using the index files to speed up searches in dbf
--- a/new-XBase
+++ b/new-XBase
-@@ -395,7 +395,7 @@ Example of use is
+@@ -395,7 +395,7 @@
$table->dump_records("fs" => " | ", "rs" => " <-+\n",
"fields" => [ "id", "msg" ]);'
@@ -248,7 +249,7 @@
the printing.
=head1 Writing the data
-@@ -597,7 +597,7 @@ Dan Albertsson for providing support for
+@@ -595,7 +595,7 @@
XBase::FAQ(3); XBase::Index(3);
DBD::XBase(3) and DBI(3) for DBI interface;
--
Debian packaging of libdbd-xbase-perl
More information about the Pkg-perl-cvs-commits
mailing list