Commit 2f42bc49 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/bugfix/17082-use-consistent-python-packages-dir' into devel (refs: #17082)
parents d3ffbd04 7cbcd4bc
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
......
......@@ -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")"
;;
*)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment