* Support for new style architecture specifications (closes: #363193)

    Thanks to Peter Eisentraut for patch.

5 files changed, 26 insertions, 5 deletions

diff --git a/COPYING b/COPYING
index d60c31a..b7b5f53 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/ChangeLog b/ChangeLog
index 80f3698..1aa7967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-15  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-satisfydepends: add support for new dpkg-dev construct
+	for linux-any etc. patch by Peter Eisentraut.
+
+	* THANKS: update thanks text for a change.
+
 	* pbuilderrc.5: undocument the restriction that --buildresult
 	option needs to be specified for pdebuild, and BUILDRESULT cannot
 	be used.
diff --git a/THANKS b/THANKS
index 50a3f11..c51ae58 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Turbo Fredriksson <turbo@debian.org>
 Mike Markley <mike@markley.org>
 Era Eriksson <era@iki.fi>
 Danilo Piazzalunga <danilopiazza@libero.it>
+Peter Eisentraut
 
 I thank them all!
 
diff --git a/debian/changelog b/debian/changelog
index 675a200..c6d1ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 pbuilder (0.153) UNRELEASED; urgency=low
 
   * fix pdebuild --help output (closes: #367133)
-
+  * Support for new style architecture specifications (closes: #363193)
+    Thanks to Peter Eisentraut for patch.
+  
  -- Junichi Uekawa <dancer@debian.org>  Mon, 15 May 2006 03:10:06 +0900
 
 pbuilder (0.152) unstable; urgency=low
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 92c1389..93b9a06 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -40,16 +40,29 @@ function checkbuilddep_versiondeps () {
     return 1;
 }
 
+function expand_arch () {
+    local ARCH="$1"
+    local EXPANDED_ARCH
+    if echo "$ARCH" | grep "-" > /dev/null; then
+        EXPANDED_ARCH=$ARCH
+    else
+        EXPANDED_ARCH="linux-$ARCH"
+    fi
+    local WC1=$(echo $EXPANDED_ARCH | sed 's/^[^-]*/any/')
+    local WC2=$(echo $EXPANDED_ARCH | sed 's/[^-]*$/any/')
+    echo "$ARCH\\|$EXPANDED_ARCH\\|$WC1\\|$WC2"
+}
+
 function checkbuilddep_archdeps () {
     # returns FALSE on INSTALL
     local INSTALLPKG="$1"
     local ARCH="$2"
-    if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]$ARCH[]/]" > /dev/null; then
+    if echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/][!]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
 	# if !$ARCH exists in there, ERROR.
 	return 0;
     fi
     if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[!]" > /dev/null; then
-	if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]$ARCH[]/]" > /dev/null; then
+	if ! echo "$INSTALLPKG" | sed 's/.*\(\[.*\]\)/\1/' | grep "[[/]\($(expand_arch $ARCH)\)[]/]" > /dev/null; then
 	# if $ARCH does not exist, ERROR.
 	    return 0;
 	fi