Explorar o código

Merge SuperH patch from YAEGASHI Takeshi

Wichert Akkerman %!s(int64=25) %!d(string=hai) anos
pai
achega
3a986278d2
Modificáronse 5 ficheiros con 15 adicións e 2 borrados
  1. 7 0
      ChangeLog
  2. 4 0
      archtable
  3. 2 0
      debian/changelog
  4. 1 1
      scripts/dpkg-architecture.pl
  5. 1 1
      scripts/dpkg-buildpackage.sh

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+Tue Apr 24 13:21:39 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge SuperH patch from YAEGASHI Takeshi
+  * archtable: add SuperH variants
+  * scripts/dpkg-architecture.pl: fix typo (shed -> sheb)
+  * scripts/dpkg-buildpackage.sh: fix dpkg-architecture call
+
 Tue Apr 24 13:03:54 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * utils/enoent.c: new utility to get ENOENT value at runtime

+ 4 - 0
archtable

@@ -37,6 +37,10 @@ ia64-unknown-linux	ia64		ia64
 sh-linux-gnu		sh		sh
 sheb-linux-gnu		sheb		sheb
 shel-linux-gnu		sh		sh
+sh3-linux-gnu		sh		sh
+sh4-linux-gnu		sh		sh
+sh3eb-linux-gnu		sheb		sheb
+sh4eb-linux-gnu		sheb		sheb
 hppa-linux-gnu		hppa		hppa
 hppa1.1-linux-gnu	hppa		hppa
 hppa2.0-linux-gnu	hppa		hppa

+ 2 - 0
debian/changelog

@@ -99,6 +99,8 @@ dpkg (1.9.0) unstable; urgency=low
   * dpkg -L, -S, -l, -s, and -p now return an error code if any package
     does not exist. Closes: Bug#4974, #72406
   * dselect has a configuration file as well now
+  * Get ENOENT value at runtime in dpkg-divert instead of hardcoding it.
+    Closes: Bug# 31620
 
  -- Wichert Akkerman <wakkerma@debian.org>  Tue, 24 Apr 2001 02:23:46 +0200
 

+ 1 - 1
scripts/dpkg-architecture.pl

@@ -57,7 +57,7 @@ require 'controllib.pl';
 	    'mips',      'mips-linux',
 	    'mipsel',    'mipsel-linux',
 	    'sh',        'sh-linux',
-	    'shed',      'shed-linux',
+	    'sheb',      'sheb-linux',
 	    'hppa',      'hppa-linux',
 	    'hurd-i386', 'i386-gnu',
 	    's390',	 's390-linux',

+ 1 - 1
scripts/dpkg-buildpackage.sh

@@ -138,7 +138,7 @@ mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source pac
 mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version"
 if [ -n "$maint" ]; then maintainer="$maint"; 
 else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer: //p'`" "source maintainer"; fi
-eval `dpkg-architecture -a${arch} -t${targetgnusystem} -s -f`
+eval `dpkg-architecture -a${targetarch} -t${targetgnusystem} -s -f`
 
 if [ x$sourceonly = x ]; then
 	mustsetvar arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_BUILD_ARCH`" "build architecture"