summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2009-03-16 12:09:16 +0000
committerOtavio Salvador <otavio@debian.org>2009-03-16 12:09:16 +0000
commit21ea52186c5e6a8c9b7760306532aae3e3de7c2f (patch)
tree07ed9e81012379abbbd99694d6d3dea80c726801
parent878326114c65f92aded31856c7eb74d83bc01ad7 (diff)
downloaddebootstrap-21ea52186c5e6a8c9b7760306532aae3e3de7c2f.tar.gz
Improve Luca's patch a bit
r57840
-rw-r--r--debian/changelog2
-rw-r--r--scripts/debian/sid8
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index eae750f..f731d50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
debootstrap (1.0.12) UNRELEASED; urgency=low
* Improve code to choose between libc packages. Thanks to Luca Favatella
- <slackydeb@gmail.com> for the patch.
+ <slackydeb@gmail.com> for first version of the patch.
-- Otavio Salvador <otavio@ossystems.com.br> Mon, 16 Mar 2009 09:02:49 -0300
diff --git a/scripts/debian/sid b/scripts/debian/sid
index 7d68d4f..565ab92 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -7,11 +7,11 @@ if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi
-LIBC=libc6
case $ARCH in
- alpha|ia64) LIBC6="libc6.1" ;;
- kfreebsd-*) LIBC6="libc0.1" ;;
- hurd-*) LIBC6="libc0.3" ;;
+ alpha|ia64) LIBC="libc6.1" ;;
+ kfreebsd-*) LIBC="libc0.1" ;;
+ hurd-*) LIBC="libc0.3" ;;
+ *) LIBC="libc6" ;;
esac
work_out_debs () {