summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-01-11 22:09:47 +0100
committeranonym <anonym@riseup.net>2016-01-11 22:09:47 +0100
commit4c5cd7f6d5bee2d3d717f8dd6d91efed0f56f91b (patch)
tree16d120544e3075d24168b8e5ba806c1213065f5b
parent81d7be601df02c5255c2b86739a8abfdbccffee2 (diff)
parent4a2c136cdf7e875adc0bdebad62b3f91896b0148 (diff)
Merge remote-tracking branch 'origin/feature/10897-jessie-p-u' into testing2.0-rc1
Fix-committed: #10897
-rw-r--r--config/chroot_apt/preferences4
l---------config/chroot_sources/jessie-proposed-updates.binary1
-rw-r--r--config/chroot_sources/jessie-proposed-updates.chroot1
-rw-r--r--debian/changelog6
4 files changed, 12 insertions, 0 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index f0169ed..12ca901 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -172,6 +172,10 @@ Pin: release o=Debian,n=jessie-updates
Pin-Priority: 990
Package: *
+Pin: release o=Debian,n=jessie-proposed-updates
+Pin-Priority: 990
+
+Package: *
Pin: release o=Debian,n=jessie
Pin-Priority: 990
diff --git a/config/chroot_sources/jessie-proposed-updates.binary b/config/chroot_sources/jessie-proposed-updates.binary
new file mode 120000
index 0000000..0c471f4
--- /dev/null
+++ b/config/chroot_sources/jessie-proposed-updates.binary
@@ -0,0 +1 @@
+jessie-proposed-updates.chroot \ No newline at end of file
diff --git a/config/chroot_sources/jessie-proposed-updates.chroot b/config/chroot_sources/jessie-proposed-updates.chroot
new file mode 100644
index 0000000..009c96f
--- /dev/null
+++ b/config/chroot_sources/jessie-proposed-updates.chroot
@@ -0,0 +1 @@
+deb http://ftp.us.debian.org/debian/ jessie-proposed-updates main contrib non-free
diff --git a/debian/changelog b/debian/changelog
index 2158a5a..977228e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ tails (2.0~rc1) UNRELEASED; urgency=medium
- Upgrade libxml2 to 2.9.1+dfsg1-5+deb8u1.
- Upgrade Samba-related packages to 2:4.1.17+dfsg-2+deb8u1.
- Upgrade libldb1 to 2:1.1.17-2+deb8u1.
+ - Upgrade KeePassX to 0.4.3+dfsg-0.1+deb8u1.
+ - Upgrade Perl to 5.20.2-3+deb8u2.
* Bugfixes
- Don't offer the option, in Tor Browser, to open a downloaded file with
@@ -82,6 +84,10 @@ tails (2.0~rc1) UNRELEASED; urgency=medium
sees #9012.
ยท Touch /etc/modprobe.d/ after deleting the blacklist; this might help,
in case all this is caused by some aufs bug.
+ - Enable and use the Debian jessie-proposed-updates APT repository,
+ anticipating on the Jessie 8.3 point-release (Closes: #10897).
+ - Upgrade most firmware packages to 20160110-1.
+ - Upgrade Intel CPU microcodes to 3.20151106.1~deb8u1.
* Test suite
- Update I2P tests for Jessie, and generally make them more robust.