summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2009-06-03 21:09:34 (GMT)
committerOtavio Salvador <otavio@debian.org>2009-06-03 21:09:34 (GMT)
commit0b8936eb575443df95b6ee464c54d33c907fcbe3 (patch)
tree152ead084ff0cf3fb4353a8c1c4f84aecf61b571
parent27528e40ea75ddc804779a980a50abc627cedfe5 (diff)
downloaddebootstrap-0b8936eb575443df95b6ee464c54d33c907fcbe3.zip
debootstrap-0b8936eb575443df95b6ee464c54d33c907fcbe3.tar.gz
debootstrap-0b8936eb575443df95b6ee464c54d33c907fcbe3.tar.bz2
Apply patch from Felix Zielcke <fzielcke@z-51.de> to use "dpkg
--print-architecture" to avoid deprecation warning. Closes: #531680. r58720
-rw-r--r--debian/changelog7
-rwxr-xr-xdebootstrap4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 6aa9651..4a30f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debootstrap (1.0.14) UNRELEASED; urgency=low
+
+ * Apply patch from Felix Zielcke <fzielcke@z-51.de> to use "dpkg
+ --print-architecture" to avoid deprecation warning. Closes: #531680.
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Wed, 03 Jun 2009 14:26:22 -0300
+
debootstrap (1.0.13) unstable; urgency=low
[ Otavio Salvador ]
diff --git a/debootstrap b/debootstrap
index 8ddac12..dfe3f8b 100755
--- a/debootstrap
+++ b/debootstrap
@@ -335,8 +335,8 @@ fi
if [ "$ARCH" != "" ]; then
true
elif [ -x /usr/bin/dpkg ] && \
- /usr/bin/dpkg --print-installation-architecture >/dev/null 2>&1; then
- ARCH=`/usr/bin/dpkg --print-installation-architecture`
+ /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
+ ARCH=`/usr/bin/dpkg --print-architecture`
elif type udpkg >/dev/null 2>&1 && \
udpkg --print-architecture >/dev/null 2>&1; then
ARCH=`/usr/bin/udpkg --print-architecture`