[sagemath] 01/01: Use dpkg from testing to work around #848422.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sagemath.

commit 39b1eec936b3dc1cb13435f07264e672f5dd7be6
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Dec 18 02:34:47 2016 +0000

    Use dpkg from testing to work around #848422.
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index ba82311..4ef80a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -268,6 +268,7 @@ install-apt-sources:
 #   Before running it, you must do:
 #     echo /etc/apt/trusted.gpg >> /etc/schroot/sbuild/copyfiles
 #   this will not be necessary after we remove this work-around.
+#   The dpkg version from testing is used to work around #848422 in dpkg 1.18.16.
 #
 # 2 echo "/var/cache/apt/archives /var/cache/apt/archives none rw,bind 0 0" >> /etc/schroot/sbuild/fstab
 #   This helps to avoid http errors due to the mirror network being shitty and apt not doing retries
@@ -281,9 +282,11 @@ release: ../sagemath_$(DEB_VERSION).dsc
 	  --extra-repository='deb https://debian-science.alioth.debian.org/apt sid-sage/' \
 	  --extra-repository-key=$(CURDIR)/debian/deb-sci-sage.asc \
 	  --chroot-setup-commands='echo deb https://debian-science.alioth.debian.org/apt sid-sage/ >> /etc/apt/sources.list' \
+	  --chroot-setup-commands='echo deb http://httpredir.debian.org/debian testing main >> /etc/apt/sources.list' \
 	  --chroot-setup-commands='apt-get update && apt-get -t sid-sage install -y python2.7=2.7.13~rc1-1.1 libpython2.7=2.7.13~rc1-1.1 python2.7-dev=2.7.13~rc1-1.1' \
-	  --chroot-setup-commands='{ for i in python2.7 python2.7-minimal libpython2.7-stdlib libpython2.7 python2.7-dev; do echo $$i hold; done; } | dpkg --set-selections' \
-	  --chroot-setup-commands='sed -i -e /sid-sage/d /etc/apt/sources.list && apt-get update' \
+	  --chroot-setup-commands='apt-get -t testing install -y dpkg=1.18.15' \
+	  --chroot-setup-commands='{ for i in python2.7 python2.7-minimal libpython2.7-stdlib libpython2.7 python2.7-dev dpkg; do echo $$i hold; done; } | dpkg --set-selections' \
+	  --chroot-setup-commands='sed -i -e /sid-sage/d /etc/apt/sources.list && sed -i -e /testing/d /etc/apt/sources.list && apt-get update' \
 	  --build-dep-resolver=aspcud \
 	  --build-failed-commands '%SBUILD_SHELL' \
 	  "sagemath_$(DEB_VERSION).dsc"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git