summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-21 18:31:08 +0200
committeranonym <anonym@riseup.net>2015-10-21 18:31:08 +0200
commit4c64182b0bc75f876d83036a6d60731731f90bcd (patch)
treea7d9c3221e5ea62c5698aa67192e5594277dd588
parentfc5502abf5681271eed1e02cd724d62dc057014b (diff)
parent07156a7e051571c8c50c9d405d8fc8282519506d (diff)
Merge branch 'bugfix/firmware-nonfree-20151018-2' into devel
-rw-r--r--config/chroot_apt/preferences6
-rw-r--r--config/chroot_local-packageslists/tails-common.list3
-rw-r--r--wiki/src/support/known_issues.de.po3
-rw-r--r--wiki/src/support/known_issues.fr.po3
-rw-r--r--wiki/src/support/known_issues.mdwn1
-rw-r--r--wiki/src/support/known_issues.pt.po3
6 files changed, 14 insertions, 5 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 5b04851..f9b0c05 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -66,6 +66,10 @@ Package: poedit
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
+Package: firmware-amd-graphics
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
Package: firmware-atheros
Pin: release o=Debian,a=unstable
Pin-Priority: 999
@@ -106,7 +110,7 @@ Package: firmware-linux-nonfree
Pin: release o=Debian,a=unstable
Pin-Priority: 999
-Package: firmware-ralink
+Package: firmware-misc-nonfree
Pin: release o=Debian,a=unstable
Pin-Priority: 999
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 9cefd5e..558e2f1 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -250,6 +250,7 @@ xserver-xorg-input-vmmouse
#endif
### Firmwares
+firmware-amd-graphics
firmware-atheros
firmware-brcm80211
firmware-ipw2x00
@@ -258,7 +259,7 @@ firmware-libertas
firmware-linux
firmware-linux-free
firmware-linux-nonfree
-firmware-ralink
+firmware-misc-nonfree
firmware-realtek
firmware-zd1211
b43-fwcutter
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index 9564790..7bbc40c 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-21 11:57+0300\n"
+"POT-Creation-Date: 2015-10-21 12:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -771,6 +771,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 1a30f3b..4ef24e9 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-21 11:57+0300\n"
+"POT-Creation-Date: 2015-10-21 12:28+0300\n"
"PO-Revision-Date: 2015-10-10 10:53-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -927,6 +927,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index a88b863..84e9133 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -401,6 +401,7 @@ This issue has been reported on the following hardware:
- MacBook Pro Retina 11,1 (late 2013)
- MacBook Pro Retina 13-inch (early 2015)
- Hewlett-Packard HP Pavilion dv6 Notebook PC
+ - Hewlett-Packard HP ProBook 450 G0
- Lenovo ThinkPad X61, only on emergency shutdown when pulling out the
USB stick
- Lenovo ThinkPad X220
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index 63a3b6f..b0a4707 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-21 11:57+0300\n"
+"POT-Creation-Date: 2015-10-21 12:28+0300\n"
"PO-Revision-Date: 2014-06-30 15:38-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -909,6 +909,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"