diff --git a/debian/changelog b/debian/changelog index c557858b..f1d4427b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.138) maverick; urgency=low + + * Don't go overboard with the downgrading of packages; this probably caused + the rebuild failure attempts, we'll do without downgrading base packages + already installed by debootstrap in this use case. + + -- Steve Langasek Wed, 21 Jul 2010 09:18:48 +0200 + livecd-rootfs (1.137) maverick; urgency=low * Make sure APT_SOURCE is always set. diff --git a/livecd.sh b/livecd.sh index 04f020f1..a45b5423 100755 --- a/livecd.sh +++ b/livecd.sh @@ -420,7 +420,7 @@ link_in_boot = $link_in_boot cat << @@EOF > ${ROOT}etc/apt/preferences Package: ssl-cert Pin: version 1.0.14-0ubuntu2 -Pin-Priority: 900 +Pin-Priority: 991 @@EOF fi @@ -459,7 +459,7 @@ Pin-Priority: 500 Package: * Pin: origin $APT_PIN -Pin-Priority: 1001 +Pin-Priority: 900 @@EOF FORCE_YES=--force-yes fi