summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-09-30 10:11:56 +0000
committerintrigeri <intrigeri@boum.org>2019-09-30 10:11:56 +0000
commit98b7ab8e223aa0a4b2b2ec67c50d4660fa7104eb (patch)
treed8021d57df35522795cd9429f1326ab7bd0a1adf
parenta9f88bf2da134752acb57d018d2e0436945d27b9 (diff)
parent2f42bc490ed0ce990725d54bdb6785cc03186d50 (diff)
Merge remote-tracking branch 'origin/devel' into contrib/17099-trimagecontrib/17099-trimage
-rw-r--r--config/amnesia2
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/__init__.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/__init__.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/config.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/errors.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/errors.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gdmclient.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gdmclient.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/rootaccess.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/rootaccess.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py)0
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py (renamed from config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py)0
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids1
-rw-r--r--po/POTFILES.skip10
-rwxr-xr-xrefresh-translations18
20 files changed, 16 insertions, 15 deletions
diff --git a/config/amnesia b/config/amnesia
index 97955d7..e0d2885 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
# Kernel version
-KERNEL_VERSION='5.2.0-2'
+KERNEL_VERSION='5.2.0-3'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/__init__.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/__init__.py
index 45230ec..45230ec 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/__init__.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/__init__.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/config.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py
index dbc8f89..dbc8f89 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/config.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/errors.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/errors.py
index 97ed8d2..97ed8d2 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/errors.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/errors.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gdmclient.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gdmclient.py
index 95bd73a..95bd73a 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gdmclient.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gdmclient.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py
index 91d1ec9..91d1ec9 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py
index 68bb76d..68bb76d 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
index cabefd6..cabefd6 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py
index 75b744b..75b744b 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/physicalsecurity.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/rootaccess.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/rootaccess.py
index 057f8be..057f8be 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/rootaccess.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/rootaccess.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py
index 438cd60..438cd60 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/utils.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py
index 50f48c2..50f48c2 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/__init__.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
index 6d025c3..6d025c3 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py
index 01a728d..01a728d 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/exceptions.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
index 513812f..513812f 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
index 12404d5..12404d5 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
index 5a1e3e3..5a1e3e3 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids
new file mode 100644
index 0000000..fb63e93
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids
@@ -0,0 +1 @@
+80865926
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0a9fd5d..ad1a075 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,10 @@
wiki/src/
config/chroot_local-includes/usr/share/doc/tails/website/
-config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py
-config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py
-config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
-config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
-config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
+config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py
+config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py
+config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
+config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
+config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
config/chroot_local-includes/usr/share/tails-greeter/greeter.ui
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui
config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui
diff --git a/refresh-translations b/refresh-translations
index f7dc660..1735884 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -14,13 +14,13 @@ PYTHON_PROGS="/etc/whisperback/config.py \
/usr/local/bin/tails-screen-locker \
/usr/local/bin/tails-upgrade-frontend-wrapper \
/usr/local/sbin/tails-additional-software \
- /usr/local/lib/python3/dist-packages/tailsgreeter/gui.py \
- /usr/local/lib/python3/dist-packages/tailsgreeter/language.py \
- /usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py \
- /usr/local/lib/python3/dist-packages/tailsgreeter/utils.py \
- /usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py \
- /usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py \
- /usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py \
+ /usr/lib/python3/dist-packages/tailsgreeter/gui.py \
+ /usr/lib/python3/dist-packages/tailsgreeter/language.py \
+ /usr/lib/python3/dist-packages/tailsgreeter/persistence.py \
+ /usr/lib/python3/dist-packages/tailsgreeter/utils.py \
+ /usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py \
+ /usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py \
+ /usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py \
/usr/local/lib/tails-additional-software-notify \
/usr/local/sbin/tails-additional-software"
SHELL_PROGS="/etc/NetworkManager/dispatcher.d/60-tor-ready.sh \
@@ -63,10 +63,10 @@ prog_potfile () {
/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js)
domain=torstatus-extension.js
;;
- /usr/local/lib/*/unlock_veracrypt_volumes/*)
+ /usr/lib/python3/dist-packages/unlock_veracrypt_volumes/*)
domain="unlock-veracrypt-volumes-$(basename "$prog")"
;;
- /usr/local/lib/*/tailsgreeter/*)
+ /usr/lib/python3/dist-packages/tailsgreeter/*)
domain="greeter-$(basename "$prog")"
;;
*)