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

a couple of dpkg-cross patches



Hi,

Today I'd like to share a couple of trivial patches that you may (or
may not) find useful someday. :)
First one makes sure to add 'Source:' field to dpkg-cross'ed packages
(this is needed because package's name is transformed and is no longer
same as that of its source package).
The second one just fixes a typo which doesn't really affect anything,
just to make it look better. :)

HTH,
--
I like long walks, especially when they are taken by people who annoy me.
From d4e41916997fe524585fd2fdd33cfc0ca09e543e Mon Sep 17 00:00:00 2001
From: Alexander Shishkin <virtuoso@slind.org>
Date: Thu, 7 Jun 2007 10:47:19 +0400
Subject: [PATCH] dpkg-cross must always save 'Source:' header
Binary package's name is transformed, while packages who's names are
identical to source names don't provide this header.
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
---
 dpkg-cross |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dpkg-cross b/dpkg-cross
index efdb815..c1c4558 100755
--- a/dpkg-cross
+++ b/dpkg-cross
@@ -698,6 +698,9 @@ sub sub_build {
 	}
 	if (defined($control{"source"})) {
 		print CONTROL "Source: " . $control{"source"} . "\n";
+	} else {
+		# we transform the name of the package, so we can't skip this
+		print CONTROL "Source: " . $control{"package"} . "\n";
 	}
 	
 	# Turn Pre-Depends into Depends
-- 
1.5.1.2

From ba1a941e3c0de1102ea44e6f291cee1ac1b1d7fb Mon Sep 17 00:00:00 2001
From: Alexander Shishkin <virtuoso@slind.org>
Date: Fri, 29 Jun 2007 13:43:58 +0400
Subject: [PATCH] fix a typo
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
---
 dpkg-cross.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dpkg-cross.pl b/dpkg-cross.pl
index 16beadc..24f433e 100644
--- a/dpkg-cross.pl
+++ b/dpkg-cross.pl
@@ -553,7 +553,7 @@ sub setup_cross_env {
 	
 	# Set additional environment variabled specified in "mode environment:".
 	foreach $var_ (keys %{ $pkgvars{'environment'} }) {
-		if (ref $pkgvars{'environmrnt'}{$var_}) {
+		if (ref $pkgvars{'environment'}{$var_}) {
 			delete $ENV{$var_};
 		} else {
 			$ENV{$var_} = $pkgvars{'environment'}{$var_};
-- 
1.5.1.2


Reply to: