revert the satisfydepends change until it is confirmed with dpkg-dev maintainers.

4 files changed, 20 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index d12f30d..6beb98d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-22  Junichi Uekawa  <dancer@debian.org>
+
+	* debian/TODO: update TODO, amd64-x86 cross build is documented and functional.
+
+	* pbuilder-satisfydepends: keep the original behavior until dpkg
+	change is verified.
+
 2006-05-17  Junichi Uekawa  <dancer@debian.org>
 
 	* Documentation/pbuilder-doc.xml: minor updates to the
diff --git a/debian/TODO b/debian/TODO
index 00cff71..a8f4353 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -24,9 +24,6 @@ contains xvfb.
 
 Maybe document the limitation.
 
-* Need to test: amd64-x86 cross build with cowdancer 
-Need to test.
-
 * cowdancer support
    - depends-on debian-bug: 329383: now partially resolved.
 0.6 is released.
@@ -38,6 +35,8 @@ cowdancer 0.9 is released and most bugs are fixed, a post is posted to
 debian-devel. There might be latent bugs, it might be about time to
 get wider testing?
 
+cowdancer 0.14 should be released with cowbuilder.
+
 * use arrays for debbuildopts
    - current --debbuildopts usages will break, how do we support it?
 
@@ -88,11 +87,11 @@ test
 
 * check cross-compile support, maybe adding support for dpkg-cross into build-depends checker?
 
-* potato su does not like dpkg-source, executes as a bash script.
-
 * Fix UML_EXTRAOPT to use arrays.
 This should change semantics; and how do we pass this thing to inside UML?
 
-* Use alternative to pbuilder-satisfydepends; apt-pkg? read elmo.txt for clues.
+* Use other alternative implementations to pbuilder-satisfydepends.
+
+elmo.txt is a memo of a discussion with James Troup.
 
 $Id$
diff --git a/debian/changelog b/debian/changelog
index e5a91b3..3937825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ 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.
+    The support is currently disabled, until dpkg maintainers clarify the 
+    situation.
   * pbuilder-doc.xml: update documentation to add an example snippet for
     using locally built packages from pbuilder.
     And other minor updates.
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 93b9a06..02d1e4c 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -43,6 +43,12 @@ function checkbuilddep_versiondeps () {
 function expand_arch () {
     local ARCH="$1"
     local EXPANDED_ARCH
+    
+    # just keep the original behavior.
+    echo "$ARCH"
+    return
+
+    # the following may be used if dpkg change is set to stone.
     if echo "$ARCH" | grep "-" > /dev/null; then
         EXPANDED_ARCH=$ARCH
     else