[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#447427: The patch applied to CVS for 447427



Package: dpkg-cross
tag 447427 + patch
thanks


Index: dpkg-cross
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/dpkg-cross,v
retrieving revision 1.52
diff -p -u -b -B -r1.52 dpkg-cross
--- dpkg-cross	13 Jul 2008 08:26:13 -0000	1.52
+++ dpkg-cross	13 Jul 2008 09:44:49 -0000
@@ -349,8 +349,11 @@ sub sub_build {
 	}
 
 	# check package architecture
-	if (($control{"architecture"} ne $arch) && ($control{"architecture"} ne "all")) {
-		warn "$progname: $package has wrong architecture (" . $control{"architecture"} . ")\n";
+	my $control_arch = $control{"architecture"};
+	if (($control_arch ne $arch) and 
+		($control_arch ne "all") and
+		($arch !~ /^uclibc-$control_arch$/)) {
+		warn "$progname: $package has wrong architecture ($control_arch)\n";
 		goto fail;
 	}
 
Index: Debian/DpkgCross.pm
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/Debian/DpkgCross.pm,v
retrieving revision 1.31
diff -p -u -b -B -r1.31 DpkgCross.pm
--- Debian/DpkgCross.pm	13 Jul 2008 08:26:13 -0000	1.31
+++ Debian/DpkgCross.pm	13 Jul 2008 09:44:50 -0000
@@ -6,10 +6,10 @@ use Config::Auto;
 use Cwd;
 use warnings;
 use strict;
-our $VERSION = '2.2.4';
+our $VERSION = '2.3.0';
 
 # Version of dpkg-cross environment.
-my $DPKGCROSSVERSION = "2.2.4";
+my $DPKGCROSSVERSION = "2.3.0";
 
 require Exporter;
 
@@ -107,7 +107,11 @@ $progname = basename($0);
 	'openbsd-i386' => 'i386-openbsd', #XXX This differs from dpkg-architecture
 	'freebsd-i386' => 'i386-freebsd', #XXX This differs from dpkg-architecture
 	'darwin-i386' => 'i386-darwin',   #XXX This differs from dpkg-architecture
-	'win32-i386' => 'i386-cygwin'
+	'win32-i386' => 'i386-cygwin',
+	'uclibc-arm' => 'arm-linux-uclibc',
+	'uclibc-mips' => 'mips-linux-uclibc',
+	'uclibc-mipsel' => 'mipsel-linux-uclibc',
+	'uclibc-armel' => 'armel-linux-uclibc',
 );
 
 # Regexps to parse 'file' output to detect arch of ELF binary
Index: debian/changelog
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/debian/changelog,v
retrieving revision 1.143
diff -p -u -b -B -r1.143 changelog
--- debian/changelog	13 Jul 2008 08:26:13 -0000	1.143
+++ debian/changelog	13 Jul 2008 09:44:51 -0000
@@ -1,11 +1,12 @@
-dpkg-cross (2.2.5) unstable; urgency=low
+dpkg-cross (2.3.0) unstable; urgency=low
 
   * Same change as apt-cross in the buginfo.sh script:
   * bashism in /bin/sh script (Closes: #489567)
   * corrupted pkg-config data for libcairo-directfb (Closes: #483076)
   * -a amd64 should search /emul/ia32-linux (Closes: #463588)
+  * please support wrong architecture (Closes: #447427)
 
- -- Neil Williams <codehelp@debian.org>  Sat, 12 Jul 2008 19:48:09 +0100
+ -- Neil Williams <codehelp@debian.org>  Sun, 13 Jul 2008 10:39:26 +0100
 
 dpkg-cross (2.2.4) unstable; urgency=low
 

-- 


Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/


Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: