Re: RC bug #482140 - RfC for upcoming changes
Am Sonntag, den 12.10.2008, 19:05 +0200 schrieb Luk Claes:
> Daniel Leidert wrote:
> > Hi,
> >
> > With the help of Nico Tyni and Agustin Martin Domingo I think, the RC
> > bug #482140 [1] can be solved by changing docbook-xml and xml-core. I
> > already did some cleaning in these two package related to packaging
> > stuff and I would like to know, if you allow uploading of the proposed
> > changes for #482140 *together* with these clean-up-changes or if I have
> > to separate them. I attach the diffs for an upload containing all
> > changes, so you get an impression of the changes.
> >
> > [1] http://bugs.debian.org/482140
>
> Please review the changes of the binary packages (debs) carefully before
> uploading if you include the cleaning.
I will do of course.
A second question: I'm thinking about an update to the package in Etch
to try to solve this issue already there (besides the fixed packages I
prepare for Lenny). So users of an up-to-date Etch will not have the
problem. The proposed changes are attached.
Would this be ok/accepted for Etch?
Regards, Daniel
Index: tools/update-xmlcatalog
===================================================================
--- tools/update-xmlcatalog (Revision 1255)
+++ tools/update-xmlcatalog (Arbeitskopie)
@@ -121,7 +121,7 @@
use strict;
## ----------------------------------------------------------------------
-use File::Spec::Functions;
+use File::Spec;
use Getopt::Long;
## ----------------------------------------------------------------------
@@ -196,7 +196,7 @@
{
if ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -261,7 +261,7 @@
{
if ( defined( $root ) )
{
- my $catalog = catfile( $catalog_dir, 'catalog' );
+ my $catalog = File::Spec->catfile( $catalog_dir, 'catalog' );
if ( ! -f $catalog )
{
print STDERR "$name: error: root catalog $catalog not found\n";
@@ -275,7 +275,7 @@
}
elsif ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -344,8 +344,8 @@
if ( defined( $root ) )
{
$catalog = 'catalog';
- $catalog_data = catfile( $catalog_data_dir, $catalog );
- $catalog = catfile( $catalog_dir, $catalog );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog );
+ $catalog = File::Spec->catfile( $catalog_dir, $catalog );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -358,8 +358,8 @@
}
elsif ( defined( $package ) )
{
- $catalog_data = catfile( $catalog_data_dir, $package );
- $catalog = catfile( $catalog_dir, "$package.xml" );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $package );
+ $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -375,7 +375,7 @@
$catalog = $local;
$catalog_data = $local;
$catalog_data =~ tr|/|_|;
- $catalog_data = catfile( $catalog_data_dir, $catalog_data );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog_data );
my $start = ( $type eq 'uri' ) ? 'name' : $type;
$start .= 'Id' unless $type eq 'uri';
$id = "$start=\"$id\"";
Index: debian/changelog
===================================================================
--- debian/changelog (Revision 1255)
+++ debian/changelog (Arbeitskopie)
@@ -1,3 +1,12 @@
+xml-core (0.09-0.1etch1) stable; urgency=low
+
+ * Non-maintainer upload.
+ * tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
+ as workaround to #482140.
+ * debian/rules: Depend on perl-base rather than the full perl package.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Tue, 14 Oct 2008 20:33:12 +0200
+
xml-core (0.09-0.1) unstable; urgency=low
* Non-maintainer upload.
Index: debian/rules
===================================================================
--- debian/rules (Revision 1255)
+++ debian/rules (Arbeitskopie)
@@ -48,7 +48,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
+ dh_perl -d
dh_gencontrol
dh_md5sums
dh_builddeb
Reply to: