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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-154-g42f022e



The following commit has been merged in the master branch:
commit 1c0600e2f20ef4f9951f2932ee0a4b0651d804e8
Author: Steve Langasek <steve.langasek@linaro.org>
Date:   Tue Apr 19 13:05:11 2011 -0700

    Refresh data/files/triplets with the multiarch triplets

diff --git a/data/files/triplets b/data/files/triplets
index 39d573f..b5e8fd2 100644
--- a/data/files/triplets
+++ b/data/files/triplets
@@ -1,6 +1,6 @@
 # List of "triplet architecture" relationships as provided by
 # dpkg-architecture
-# Last updated: 2011-04-07
+# Last updated: 2011-04-19
 # With: Debian dpkg-architecture version 1.16.0.1.
 
 alpha-darwin darwin-alpha
@@ -67,19 +67,19 @@ hppa-netbsd netbsd-hppa
 hppa-openbsd openbsd-hppa
 hppa-solaris solaris-hppa
 hppa-uclinux-uclibc uclinux-hppa
-i486-darwin darwin-i386
-i486-freebsd freebsd-i386
-i486-gnu hurd-i386
-i486-kfreebsd-gnu kfreebsd-i386
-i486-knetbsd-gnu knetbsd-i386
-i486-kopensolaris-gnu kopensolaris-i386
-i486-linux-gnu i386
-i486-linux-gnulp lpia
-i486-linux-uclibc uclibc-linux-i386
-i486-netbsd netbsd-i386
-i486-openbsd openbsd-i386
-i486-solaris solaris-i386
-i486-uclinux-uclibc uclinux-i386
+i386-darwin darwin-i386
+i386-freebsd freebsd-i386
+i386-gnu hurd-i386
+i386-kfreebsd-gnu kfreebsd-i386
+i386-knetbsd-gnu knetbsd-i386
+i386-kopensolaris-gnu kopensolaris-i386
+i386-linux-gnu i386
+i386-linux-gnulp lpia
+i386-linux-uclibc uclibc-linux-i386
+i386-netbsd netbsd-i386
+i386-openbsd openbsd-i386
+i386-solaris solaris-i386
+i386-uclinux-uclibc uclinux-i386
 ia64-darwin darwin-ia64
 ia64-freebsd freebsd-ia64
 ia64-gnu hurd-ia64
diff --git a/debian/changelog b/debian/changelog
index 0c0fb07..62b0d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
     + [NT] Updated to include armhf.
   * data/files/triplets:
     + [NT] Updated to include armhf triplet.
+    + [SRL] refresh with the final approved multiarch paths.
   * data/output/manual-references:
     + [NT] Accepted patch from Vincent Fourmond to add the links
       to the Java Policy.
@@ -127,6 +128,9 @@ lintian (2.5.0~rc3) UNRELEASED; urgency=low
   *  lib/Lintian/Schedule.pm:
     + [NT] Removed file, replaced by Lintian::ProcessablePool.
 
+  * private/refresh-archs:
+    + [SRL] update to output directory mappings based on DEB_HOST_MULTIARCH
+      instead of DEB_HOST_GNU_TYPE.
   * private/runtests:
     + [NT] Added support for dumping build logs if a test fails.
       (Closes: #621658)
diff --git a/private/refresh-archs b/private/refresh-archs
index 7f13922..a07457c 100755
--- a/private/refresh-archs
+++ b/private/refresh-archs
@@ -60,7 +60,7 @@ EOF
 
 { # run this in a subshell to avoid multiple fd redirections
 for arch in $(dpkg-architecture -L); do
-    triplet="$(dpkg-architecture -a"$arch" -qDEB_HOST_GNU_TYPE 2>/dev/null)"
+    triplet="$(dpkg-architecture -a"$arch" -qDEB_HOST_MULTIARCH 2>/dev/null)"
     printf "%s %s\n" "$triplet" "$arch"
 done
 } | sort >> "$f"

-- 
Debian package checker


Reply to: