Hello, I have cc-ed the maintainers of the following packages that rdepend on libtext-iconv-perl:
apt-cache rdepends libtext-iconv-perl
libtext-iconv-perl
Reverse Depends:
w3c-markup-validator
pisg
muttprint
libxtm-perl
libxml-twig-perl
libxml-sax-writer-perl
gnuift-perl
debconf-i18n
ddtc
bins
I intend to upload libtext-iconv-perl_1.4-1 by Wednesday 15 June at
00:00 UTC, unless there is an objection. If you have a problem with
uploading it, please reply to [EMAIL PROTECTED]
Please inspect the following debdiff between the current version in
sarge/etch (1.2-3) and the new version 1.4-1.
debdiff libtext-iconv-perl_1.2-3.dsc libtext-iconv-perl_1.4-1.dsc
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Changes
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Changes
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Changes 2001-07-27
19:21:25.000000000 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Changes 2004-07-18
08:18:45.000000000 +1000
@@ -17,3 +17,19 @@
- since HP-UX seems to be the only platform where the second
argument to iconv() is *not* const char**, put an #ifdef
into Iconv.xs
+
+1.3 Mon Jun 28 19:25:43 CEST 2004
+ - Makefile.PL now tries to detect the need for -liconv
+ - added retval() method to Text::Iconv objects, which returns the
+ iconv() return value (according to the Single UNIX Specification,
+ "the number of non-identical conversions performed")
+ - to make this possible, Text::Iconv objects are--on the C level--no
+ longer just the iconv handle, but a struct (which can contain other
+ information besides the handle)
+
+1.4 Sun Jul 18 00:09:21 CEST 2004
+ - Added instance attribute raise_error and corresponding
+ method to control exception raising on a per-object basis.
+ - Reset shift state for state-dependent conversions.
+ - Makefile.PL now passes all options besides LIBS and INC to
+ MakeMaker, so options like INSTALLDIRS=vendor work again.
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Iconv.pm
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Iconv.pm
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Iconv.pm 2001-08-11
20:10:04.000000000 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Iconv.pm 2004-07-18
08:25:46.000000000 +1000
@@ -1,6 +1,6 @@
package Text::Iconv;
-# @(#) $Id: Iconv.pm,v 1.3 2001/08/11 10:10:04 mxp Exp $
-# Copyright (c) 2000 Michael Piotrowski
+# @(#) $Id: Iconv.pm,v 1.6 2004/07/17 22:25:46 mxp Exp $
+# Copyright (c) 2004 Michael Piotrowski
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
@@ -16,7 +16,7 @@
@EXPORT_OK = qw(
convert
);
-$VERSION = '1.2';
+$VERSION = '1.4';
bootstrap Text::Iconv $VERSION;
@@ -50,31 +50,57 @@
are implementation-dependent. Valid values are specified in the
system documentation
+As an experimental feature, this version of B<Text::Iconv> objects
+provide the retval() method:
+
+ $result = $converter->convert("lorem ipsum dolor sit amet");
+ $retval = $converter->retval;
+
+This method can be called after calling convert(). It returns the
+return value of the underlying iconv() function for the last
+conversion; according to the Single UNIX Specification, this value
+indicates "the number of non-identical conversions performed." Note,
+however, that iconv implementations vary widely in the interpretation
+of this specification.
+
+When called before the first call to convert(), or if an error occured
+during the conversion, retval() returns B<undef>.
+
=head1 ERRORS
If the conversion can't be initialized an exception is raised (using
croak()).
-As an experimental feature, this version of I<Text:Iconv> provides a
-new class attribute B<raise_error> and a corresponding class method
-for setting and getting its value. The handling of errors during
-conversion now depends on the setting of this attribute. If
-B<raise_error> is set to a true value, an exception is raised;
-otherwise, the convert() method only returns B<undef>. By default
-B<raise_error> is false. Warnings are no longer emitted. Example
-usage:
+=head2 Handling of conversion errors
+
+I<Text::Iconv> provides a class attribute B<raise_error> and a
+corresponding class method for setting and getting its value. The
+handling of errors during conversion depends on the setting of this
+attribute. If B<raise_error> is set to a true value, an exception is
+raised; otherwise, the convert() method only returns B<undef>. By
+default B<raise_error> is false. Example usage:
Text::Iconv->raise_error(1); # Conversion errors raise exceptions
Text::Iconv->raise_error(0); # Conversion errors return undef
$a = Text::Iconv->raise_error(); # Get current setting
+=head2 Per-object handling of conversion errors
+
+As an experimental feature, I<Text::Iconv> also provides an instance
+attribute B<raise_error> and a corresponding method for setting and
+getting its value. If B<raise_error> is B<undef>, the class-wide
+settings apply. If B<raise_error> is 1 or 0 (true or false), the
+object settings override the class-wide settings.
+
Consult L<iconv(3)> for details on errors that might occur.
-Converting undef, e.g.,
+=head2 Conversion of B<undef>
+
+Converting B<undef>, e.g.,
$converted = $converter->convert(undef);
-always returns undef. This is not considered an error.
+always returns B<undef>. This is not considered an error.
=head1 NOTES
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Iconv.xs
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Iconv.xs
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Iconv.xs 2005-06-11
12:28:11.917299416 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Iconv.xs 2004-07-18
08:08:50.000000000 +1000
@@ -1,6 +1,6 @@
-/* $Id: Iconv.xs,v 1.9 2001/08/11 10:10:04 mxp Exp $ */
+/* $Id: Iconv.xs,v 1.12 2004/07/17 22:08:50 mxp Exp $ */
/* XSUB for Perl module Text::Iconv */
-/* Copyright (c) 2000 Michael Piotrowski */
+/* Copyright (c) 2004 Michael Piotrowski */
#ifdef __cplusplus
extern "C" {
@@ -15,10 +15,30 @@
#include <iconv.h>
/*****************************************************************************/
+/* This struct represents a Text::Iconv object */
+
+struct tiobj
+{
+ iconv_t handle; /* iconv handle (returned by iconv_open()) */
+ SV *retval; /* iconv() return value (according to the Single UNIX
+ Specification, "the number of non-identical
+ conversions performed") */
+ SV *raise_error; /* Per-object flag controlling whether exceptions
+ are to be thrown */
+};
+
+/*****************************************************************************/
static int raise_error = 0;
-SV *do_conv(iconv_t iconv_handle, SV *string)
+/* Macro for checking when to throw an exception for use in the
+ do_conv() function. The logic is: Throw an exception IF
+ obj->raise_error is undef AND raise_error is true OR IF
+ obj->raise_error is true */
+#define RAISE_ERROR_P (!SvOK(obj->raise_error) && raise_error) \
+ || SvTRUE(obj->raise_error)
+
+SV *do_conv(struct tiobj *obj, SV *string)
{
char *ibuf; /* char* to the content of SV *string */
char *obuf; /* temporary output buffer */
@@ -66,11 +86,16 @@
}
else
{
- outbytesleft = 2 * inbytesleft;
+ outbytesleft = 5; /* 2 * inbytesleft; */
}
l_obuf = outbytesleft;
- obuf = (char *) New(0, obuf, outbytesleft, char); /* Perl malloc */
+
+ New(0, obuf, outbytesleft, char); /* Perl malloc */
+ if (obuf == NULL)
+ {
+ croak("New: %s", strerror(errno));
+ }
/**************************************************************************/
@@ -81,36 +106,42 @@
while(inbytesleft != 0)
{
-#ifdef __hpux
+#if (defined(__hpux) || defined(__linux)) && ! defined(_LIBICONV_VERSION)
/* Even in HP-UX 11.00, documentation and header files do not agree */
- ret = iconv(iconv_handle, &icursor, &inbytesleft,
+ /* glibc doesn't seem care too much about standards */
+ ret = iconv(obj->handle, &icursor, &inbytesleft,
&ocursor, &outbytesleft);
#else
- ret = iconv(iconv_handle, (const char **)&icursor, &inbytesleft,
+ ret = iconv(obj->handle, (const char **)&icursor, &inbytesleft,
&ocursor, &outbytesleft);
#endif
if(ret == (size_t) -1)
{
+ obj->retval = &PL_sv_undef;
+
switch(errno)
{
case EILSEQ:
/* Stop conversion if input character encountered which
does not belong to the input char set */
- if (raise_error)
+ if (RAISE_ERROR_P)
croak("Character not from source char set: %s",
strerror(errno));
- Safefree(obuf);
+ Safefree(obuf);
+ /* INIT_SHIFT_STATE(obj->handle, ocursor, outbytesleft); */
return(&PL_sv_undef);
case EINVAL:
/* Stop conversion if we encounter an incomplete
character or shift sequence */
- if (raise_error)
+ if (RAISE_ERROR_P)
croak("Incomplete character or shift sequence: %s",
strerror(errno));
- Safefree(obuf);
+ Safefree(obuf);
return(&PL_sv_undef);
case E2BIG:
+ /* fprintf(stdout, "%s\n", obuf); */
+
/* If the output buffer is not large enough, copy the
converted bytes to the return string, reset the
output buffer and continue */
@@ -119,16 +150,48 @@
outbytesleft = l_obuf;
break;
default:
- if (raise_error)
+ if (RAISE_ERROR_P)
croak("iconv error: %s", strerror(errno));
- Safefree(obuf);
+ Safefree(obuf);
return(&PL_sv_undef);
}
}
+ else
+ {
+ obj->retval = newSViv(ret);
+ }
+ }
+
+ /* For state-dependent encodings, place conversion descriptor into
+ initial shift state and place the byte sequence to change the
+ output buffer to its initial shift state.
+
+ The only (documented) error for this use of iconv() is E2BIG;
+ here it could happen only if the output buffer has no more room
+ for the reset sequence. We can simply prevent this case by
+ copying its content to the return string before calling iconv()
+ (just like when E2BIG happens during the "normal" use of
+ iconv(), see above). This adds the (slight, I'd guess) overhead
+ of an additional call to sv_catpvn(), but it makes the code much
+ cleaner.
+
+ Note: Since we currently don't return incomplete conversion
+ results in case of EINVAL and EILSEQ, we don't have to care
+ about the shift state there. If we did return the results in
+ these cases, we'd also have to reset the shift state there.
+ */
+
+ sv_catpvn(perl_str, obuf, l_obuf - outbytesleft);
+ ocursor = obuf;
+ outbytesleft = l_obuf;
- /* Flush the state for state-dependent character sets */
- (void) iconv(iconv_handle, NULL, NULL,
- &ocursor, &outbytesleft);
+ if((ret = iconv(obj->handle, NULL, NULL, &ocursor, &outbytesleft))
+ == (size_t) -1)
+ {
+ croak("iconv error (while trying to reset shift state): %s",
+ strerror(errno));
+ Safefree(obuf);
+ return(&PL_sv_undef);
}
/* Copy the converted bytes to the return string, and free the
@@ -140,12 +203,12 @@
return perl_str;
}
-typedef iconv_t Text__Iconv;
+typedef struct tiobj Text__Iconv;
/*****************************************************************************/
/* Perl interface */
-MODULE = Text::Iconv PACKAGE = Text::Iconv
+MODULE = Text::Iconv PACKAGE = Text::Iconv
PROTOTYPES: ENABLE
@@ -160,39 +223,75 @@
OUTPUT:
RETVAL
-Text::Iconv
+Text::Iconv *
new(self, fromcode, tocode)
char *fromcode
char *tocode
CODE:
- if((RETVAL = iconv_open(tocode, fromcode)) == (iconv_t)-1)
- {
- switch(errno)
+ iconv_t handle;
+ Text__Iconv *obj;
+
+ if ((handle = iconv_open(tocode, fromcode)) == (iconv_t)-1)
+ {
+ switch(errno)
+ {
+ case ENOMEM:
+ croak("Insufficient memory to initialize conversion: %s",
+ strerror(errno));
+ case EINVAL:
+ croak("Unsupported conversion: %s", strerror(errno));
+ default:
+ croak("Couldn't initialize conversion: %s", strerror(errno));
+ }
+ }
+
+ Newz(0, obj, 1, Text__Iconv);
+ if (obj == NULL)
{
- case ENOMEM:
- croak("Insufficient memory to initialize conversion: %s",
- strerror(errno));
- case EINVAL:
- croak("Unsupported conversion: %s", strerror(errno));
- default:
- croak("Couldn't initialize conversion: %s", strerror(errno));
+ croak("Newz: %s", strerror(errno));
}
- }
+
+ obj->handle = handle;
+ obj->retval = &PL_sv_undef;
+ obj->raise_error = newSViv(0);
+ sv_setsv(obj->raise_error, &PL_sv_undef);
+ RETVAL = obj;
OUTPUT:
RETVAL
-SV*
-convert(self, string)
- Text::Iconv self
+MODULE = Text::Iconv PACKAGE = Text::IconvPtr PREFIX = ti_
+
+SV *
+ti_convert(self, string)
+ Text::Iconv *self
SV *string
CODE:
RETVAL = do_conv(self, string);
OUTPUT:
RETVAL
+SV *
+ti_retval(self)
+ Text::Iconv *self
+ CODE:
+ RETVAL = self->retval;
+ OUTPUT:
+ RETVAL
+
+SV *
+ti_raise_error(self, ...)
+ Text::Iconv *self
+ PPCODE:
+ if (items > 1 && SvIOK(ST(1)))
+ {
+ sv_setiv(self->raise_error, SvIV(ST(1)));
+ }
+ XPUSHs(sv_mortalcopy(self->raise_error));
+
void
-DESTROY(self)
- Text::Iconv self
+ti_DESTROY(self)
+ Text::Iconv * self
CODE:
/* printf("Now in Text::Iconv::DESTROY\n"); */
- (void) iconv_close(self);
+ (void) iconv_close(self->handle);
+ Safefree(self);
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Makefile.PL
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Makefile.PL
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/Makefile.PL 2000-02-28
03:01:05.000000000 +1100
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/Makefile.PL 2004-07-18
08:16:55.000000000 +1000
@@ -1,11 +1,129 @@
+# @(#) $Id: Makefile.PL,v 1.6 2004/07/17 22:16:55 mxp Exp $
+
use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
+use Config;
+
+my %config;
+my $ok;
+
+###############################################################################
+# Read settings from the commandline
+# We must delete the options we're handling ourselves to keep
+# MakeMaker from processing them, but the rest should be preserved so
+# that we get the default MakeMaker behavior.
+
+my $i = 0;
+
+while ($i <= $#ARGV)
+{
+ my ($key, $val) = split(/=/, $ARGV[$i], 2);
+ $config{$key} = $val;
+
+ if ($key eq 'LIBS' || $key eq 'INC')
+ {
+ delete $ARGV[$i];
+ }
+
+ $i++;
+}
+
+###############################################################################
+# Check for iconv.
+
+if ($config{LIBS} or $config{INC})
+{
+ print "Your settings:\n",
+ " LIBS: ", $config{LIBS}, "\n", " INC: ", $config{INC}, "\n";
+}
+
+print 'Checking for iconv ... ';
+
+if (linktest($config{LIBS}, $config{INC}))
+{
+ $ok = 1;
+ print "ok (iconv apparently in libc)\n";
+}
+elsif ($config{LIBS} !~ /-liconv/)
+{
+ $config{LIBS} .= ' -liconv';
+
+ if (linktest($config{LIBS}, $config{INC}))
+ {
+ $ok = 1;
+ print "ok (added -liconv)\n";
+ }
+}
+
+if ($ok)
+{
+ print <<EOT;
+
+NOTE: If you have multiple iconv implementations installed, you might
+ want to make sure that I've found the one you want to use.
+ If necessary, you can explicitly specify paths like this:
+
+ $^X Makefile.PL LIBS='-L/path/to/lib' INC='-I/path/to/include'
+
+EOT
+}
+else
+{
+ print "fail\n";
+
+ print "Failed to find iconv, please check your settings and re-run as:\n";
+ print "$^X Makefile.PL LIBS='-L/path/to/lib' INC='-I/path/to/include'\n";
+ exit 1;
+}
+
+###############################################################################
+# Write the makefile
+
WriteMakefile(
- 'NAME' => 'Text::Iconv',
- 'VERSION_FROM' => 'Iconv.pm', # finds $VERSION
- 'LIBS' => [''], # e.g., '-lm'
- 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
- 'INC' => '', # e.g., '-I/usr/include/other'
- 'dist' => {COMPRESS => 'gzip', SUFFIX => 'gz'},
+ 'NAME' => 'Text::Iconv',
+ 'VERSION_FROM' => 'Iconv.pm', # finds $VERSION
+ 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1
+ ($] >= 5.005 ? ## Add these new keywords supported since 5.005
+ (ABSTRACT_FROM => 'Iconv.pm', # retrieve abstract from module
+ AUTHOR => 'Michael Piotrowski <[EMAIL PROTECTED]>') : ()),
+ 'LIBS' => $config{LIBS},
+ 'DEFINE' => "@DEFINE",
+ 'INC' => $config{INC},
+ 'dist' => {COMPRESS => 'gzip', SUFFIX => 'gz'},
);
+
+###############################################################################
+
+sub linktest
+{
+ my $libs = shift;
+ my $incs = shift;
+
+ my $file = '.linktest';
+ my $prog = <<EOT;
+#include <iconv.h>
+
+int main(void)
+{
+ (void) iconv_open("", "");
+}
+EOT
+
+ my $compile = join ' ', $Config{cc}, $incs, $Config{ccflags},
+ $Config{ldflags}, $libs;
+ # print "Compiler: $compile\n";
+ open LINKTEST, '>', "$file.c" or die "Can't create test file";
+ print LINKTEST $prog;
+ close LINKTEST;
+
+ my $result = system("$compile -o $file $file.c $libs 2> /dev/null") / 256;
+ unlink $file, "$file.c", "$file.o";
+
+ if ($result == 0)
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/README
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/README
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/README 2001-08-11
20:08:29.000000000 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/README 2004-07-18
08:13:09.000000000 +1000
@@ -1,6 +1,6 @@
-Text::Iconv Version 1.2
+Text::Iconv Version 1.4
-Copyright © 2001 Michael Piotrowski. All Rights Reserved.
+Copyright © 2004 Michael Piotrowski. All Rights Reserved.
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
@@ -26,9 +26,9 @@
systems also allow you to build your own tables (e.g., HP-UX, Tru64
UNIX, and AIX provide the genxlt(1) command).
-It is also possible to use a separate iconv library such as Bruno
-Haible's libiconv package, just make sure that the desired library is
-found (see <http://clisp.cons.org/~haible/packages-libiconv.html>).
+It is also possible to use a separate iconv library such as GNU
+libiconv package, just make sure that the desired library is found
+(see <http://www.gnu.org/directory/localization/libiconv.html>).
Building the module
-------------------
@@ -40,10 +40,7 @@
2. The supported conversions
3. The names for the supported codesets
-Please check your system documentation for the above points. You
-might also have to link in a special library (AIX seems to require
-this). If this is the case, add it to the list of needed libraries in
-Makefile.PL (e.g.: -liconv).
+Please check your system documentation for the above points.
The module can be built using this sequence of commands:
@@ -51,6 +48,18 @@
make
make test
+On some systems, the iconv functions are in libc; on others (and when
+you want to use a separate iconv library, such as GNU libiconv), you
+have to link with -liconv. Makefile.PL tries to automatically detect
+this. However, if your iconv library is in a non-standard path, you
+might have to help it. You can specify library and include paths like
+this:
+
+ perl Makefile.PL LIBS='-L/path/to/lib' INC='-I/path/to/include
+
+You might also have to do this if you have multiple iconv
+implementations installed and want to use a specific one.
+
The purpose of the test scripts (run by "make test") is to check if an
iconv library can be found, and if the iconv functions can be called.
It is neither intended to find out which conversions are supported,
@@ -74,10 +83,10 @@
Feedback
--------
-This version of Locale::iconv was tested on HP-UX 10.20 and 11.00,
-Solaris 2.6, and Linux 2.2.13 (whatever that means), using their
-native iconv implementations. I've also gotten success reports for
-HP-UX 10.20 and Solaris 2.6 using Bruno Haible's libiconv.
+This version of Text::Iconv was tested on HP-UX 11.00 (native and with
+GNU libiconv), NetBSD 1.6.1 (with GNU libiconv), NetBSD 1.6ZK (native
+and with GNU libiconv), FreeBSD 5.1 (with GNU libiconv), Solaris 8,
+Solaris 9, and Linux 2.4.20.
If you are building the module on another platform I would appreciate
a note to tell me how you got on, especially if you need to specify
@@ -87,9 +96,6 @@
Thanks
------
-Thanks go to:
-
-Otto Frost, Marc Lehmann, Loic Dachary, Steve Haslam, Matt Sergeant,
-and Leon Brocard.
+Thanks go to all those who reported bugs and suggested features.
Michael Piotrowski <[EMAIL PROTECTED]>
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/changelog
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/changelog
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/changelog 2005-06-11
12:28:11.918299266 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/changelog 2005-06-11
12:28:12.073276100 +1000
@@ -1,3 +1,24 @@
+libtext-iconv-perl (1.4-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixed "/usr/share/man/man3/Text::Iconv.3pm.gz: says Text:Iconv",
+ closes: #204516.
+ - Fixed "upstream release 1.4 is available", closes: #312957.
+ * Patch to flush state after converting text, #230170, is not needed,
+ as indicated by the upstream author. Please refer to
+ http://rt.cpan.org/NoAuth/Bug.html?id=5099
+ * Replaced dh_installmanpages with dh_installman in debian/rules.
+ * Contrary to the 1.2-3 changelog note, the upstream author is
+ quick to respond and actively maintains this Perl module.
+
+ -- Anibal Monsalve Salazar <[EMAIL PROTECTED]> Sat, 11 Jun 2005 12:23:46
+1000
+
+libtext-iconv-perl (1.2-4) unstable; urgency=low
+
+ * New maintainer.
+
+ -- Anibal Monsalve Salazar <[EMAIL PROTECTED]> Fri, 10 Jun 2005 21:05:07
+1000
+
libtext-iconv-perl (1.2-3) unstable; urgency=low
* Applied patch to flush state after converting text (closes: #230170)
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/control
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/control
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/control 2005-06-11
12:28:11.917299416 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/control 2005-06-11
12:28:12.072276250 +1000
@@ -1,17 +1,19 @@
Source: libtext-iconv-perl
-Section: text
+Section: perl
Priority: important
-Maintainer: Steve Haslam <[EMAIL PROTECTED]>
+Maintainer: Anibal Monsalve Salazar <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
Build-Depends: perl (>= 5.8.0-6), debhelper (>= 4)
Package: libtext-iconv-perl
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}
-Description: Convert between character sets in Perl
+Description: converts between character sets in Perl
The iconv() family of functions from XPG4 define an API for converting
between character sets (e.g. UTF-8 to Latin1, EBCDIC to ASCII). They
- are provided by libc6
+ are provided by libc6.
.
This package allows access to them from Perl via the Text::Iconv
package.
+ .
+ Homepage http://search.cpan.org/search?dist=Text-Iconv
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/copyright
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/copyright
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/copyright 2005-06-11
12:28:11.919299117 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/copyright 2005-06-11
12:28:12.073276100 +1000
@@ -1,6 +1,8 @@
This package Debianised by Steve Haslam <[EMAIL PROTECTED]> on 4th
March 2000.
+It is currently maintained by Anibal Monsalve Salazar <[EMAIL PROTECTED]>.
+
Originally downloaded from CPAN:
<URL:http://search.cpan.org/search?dist=Text-Iconv>
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/rules
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/rules
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/debian/rules 2005-06-11
12:28:11.918299266 +1000
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/debian/rules 2005-06-11
12:28:12.072276250 +1000
@@ -1,12 +1,14 @@
#!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
+# Made with the aid of dh_make, by Craig Small
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Cristoph Lameter.
+# This debian/rules was maintained by Steve Haslam <[EMAIL PROTECTED]>.
+# Copyright (C) 2005 Anibal Monsalve Salazar <[EMAIL PROTECTED]>.
# taken from liblocale-gettext-perl 1.01 -araqnid
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
ifndef PERL
PERL = /usr/bin/perl
@@ -58,11 +60,8 @@
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installemacsen
-# dh_installinit
dh_installcron
- dh_installmanpages
-# dh_undocumented
+ dh_installman
dh_installchangelogs
dh_strip
dh_compress
@@ -71,7 +70,6 @@
dh_perl -d
dh_shlibdeps
dh_gencontrol
-# dh_makeshlibs
dh_md5sums
dh_builddeb
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/t/01_charsets.t
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/t/01_charsets.t
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/t/01_charsets.t 2000-12-18
10:33:59.000000000 +1100
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/t/01_charsets.t 2004-06-29
05:10:48.000000000 +1000
@@ -1,3 +1,5 @@
+# @(#) $Id: 01_charsets.t,v 1.2 2004/06/28 19:10:48 mxp Exp $
+
BEGIN { $| = 1; print "1..13\n"; }
END {print "not ok 1\n" unless $loaded;}
use Text::Iconv;
@@ -29,7 +31,7 @@
$c1 = try_codesets($codesets{$source}, $codesets{$target});
$c2 = try_codesets($codesets{$target}, $codesets{$source});
-
+
if (not defined $c1 or not defined $c2)
{
print "not ok $test_no \t # (call to open_iconv() failed)\n";
@@ -48,15 +50,16 @@
if ($@)
{
- print "not ok $test_no \t # (conversion failed)\n";
+ print "not ok $test_no \t # ($source <-> $target conversion
failed: $@)\n";
}
elsif ($r2 eq $strings{$source})
{
- print "ok $test_no \t # ($source <-> $target)\n";
+ print "ok $test_no \t # ($source <-> $target)", $c1->retval,
"/", $c2->retval,"\n";
}
else
{
- print "not ok $test_no \t # (roundtrip failed)\n";
+ print "not ok $test_no \t # ($source <-> $target roundtrip
failed)\n";
+print $c1->retval, "/", $c2->retval,"\n";
}
}
}
@@ -86,7 +89,7 @@
{
$converter = new Text::Iconv($f, $t);
};
-
+
last TRY if not $@;
}
}
diff -Nru /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/typemap
/tmp/GvIujZHlpz/libtext-iconv-perl-1.4/typemap
--- /tmp/Lo9sEV6ikR/libtext-iconv-perl-1.2/typemap 2000-12-14
08:15:43.000000000 +1100
+++ /tmp/GvIujZHlpz/libtext-iconv-perl-1.4/typemap 2004-06-29
05:10:48.000000000 +1000
@@ -1,2 +1,2 @@
TYPEMAP
-Text::Iconv T_PTROBJ
+Text::Iconv * T_PTROBJ
Regards,
Anibal Monsalve Salazar
--
.''`. Debian GNU/Linux
: :' : Free Operating System
`. `' http://debian.org/
`- http://v7w.com/anibal
signature.asc
Description: Digital signature
