r1740: releasing version 4.2.31

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index c64f6433e42922f4a15a200f8a848a9561543b8c..f013dee1bc784e89c6cfb3b55c86cacb700e9884 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -13,8 +13,8 @@ use vars qw(@ISA @EXPORT %dh);
 @EXPORT=qw(&init &doit &complex_doit &verbose_print &error &warning &tmpdir
            &pkgfile &pkgext &pkgfilename &isnative &autoscript &filearray
            &filedoublearray &getpackages &basename &dirname &xargs %dh
-           &compat &addsubstvar &delsubstvar &excludefile &is_udeb
-           &udeb_filename);
+           &compat &addsubstvar &delsubstvar &excludefile &package_arch
+           &is_udeb &udeb_filename);
 
 my $max_compat=4;
 
@@ -612,6 +612,12 @@ sub getpackages {
        return @list;
 }
 
+sub package_arch {
+       my $package=shift;
+       
+       return $package_arches{$package} eq 'all' ? "all" : buildarch();
+}
+
 sub is_udeb {
        my $package=shift;
        
@@ -621,7 +627,7 @@ sub is_udeb {
 sub udeb_filename {
        my $package=shift;
        
-       my $filearch=$package_arches{$package} eq 'all' ? "all" : buildarch();
+       my $filearch=package_arch($package);
        isnative($package); # side effect
        my $version=$dh{VERSION};
        $version=~s/^[0-9]+://; # strip any epoch

diff --git a/debhelper.pod b/debhelper.pod
index f389924fca718e44dd699d3d07faf7c78d5da6a6..285ec1bd9c75bb4e5c2a5671b714d090695b372e 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -299,7 +299,7 @@ the generated dependancy line in the shlibs file.
 =item -
 
 You are encouraged to put the new ${misc:Depends} into debian/control to
-suppliment the ${shlibs:Depends} field.
+supplement the ${shlibs:Depends} field.
 
 =item -
 

diff --git a/debian/changelog b/debian/changelog
index a07870abcc9cde54df63c5f0228eb507b7abbdee..f42c82566214cc11b89a110b602605d94a2bbfc4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-debhelper (4.2.31) UNRELEASED; urgency=low
+debhelper (4.2.31) unstable; urgency=low
 
   * Updated dh_installmime Spanish translation.
+  * Spelling fix. Closes: #293158
+  * Patch from Matthias to split out a package_arch and export it in Dh_Lib.
+    Closes: #295383
 
- -- Joey Hess <joeyh@debian.org>  Thu, 20 Jan 2005 15:22:55 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 Feb 2005 13:47:29 -0500
 
 debhelper (4.2.30) unstable; urgency=low