Package: debhelper
Severity: important
Tags: patch

In the works for i386-uclibc port, I hit a corner case using the -s
parameter with debhelper.

The problem is in the match based on \b to see if the package can be
built for that arch.

If the Architecture line contains only "i386-uclibc" and the build arch
is "i386". It thinks that package can be generated, then dpkg-gencontrol
fails later.

I did a little dirty hack to workaround that corner case, it seems
inoffensive to me... there it goes.

--- /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm.orig    2005-11-10
21:24:21.000000000 -0300
+++ /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm 2005-11-10
21:38:09.000000000 -0300
@@ -596,10 +596,13 @@
                                $package_types{$package}=$package_type;
                                $package_arches{$package}=$arch;
                        }
+                       my ($arch_copy, $buildarch_copy) = ($arch,
$buildarch);
+                       $arch_copy =~ s/-//g;
+                       $buildarch_copy =~ s/-//g;
                        if ($package &&
                            (($type eq 'indep' && $arch eq 'all') ||
                             ($type eq 'arch' && $arch ne 'all') ||
-                            ($type eq 'same' && ($arch eq 'any' ||
$arch =~ /\b$buildarch\b/)) ||
+                            ($type eq 'same' && ($arch eq 'any' ||
$arch_copy =~ /\b$buildarch_copy\b/)) ||
                             ! $type)) {
                                push @list, $package;
                                $package="";


daniel



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to