summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2019-05-18 18:08:13 +0200
committersegfault <segfault@riseup.net>2019-05-18 19:31:05 +0200
commit6502cd4851ddfab7f6934dc131e35d4a22c5a7d0 (patch)
treef6394012705bbaf45781246e9beb9791e4f1ce37
parent88a48f71d1118aaf34fe2784ae590672aa05729c (diff)
Move u-v-v UI files to /usr/share/tails (refs: #16602)
To be consistent with other Tails apps (e.g. additional-software).
-rw-r--r--.gitignore2
-rw-r--r--config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py7
-rw-r--r--config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in (renamed from config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in (renamed from config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in)0
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/POTFILES.skip4
6 files changed, 8 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 30cf693..d59ef6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,7 @@
/config/chroot_local-includes/usr/share/desktop-directories/Tails.directory
/config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy
/config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy
-/config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/*.ui
+/config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/*.ui
/tmp/
# The test suite's local configuration files
diff --git a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py b/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
index 0f6f86d..6d025c3 100644
--- a/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
+++ b/config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/config.py
@@ -1,8 +1,7 @@
from os import path
APP_NAME = "unlock-veracrypt-volumes"
-DATA_DIR = "/usr/share/%s/" % APP_NAME
-UI_DIR = path.join(DATA_DIR, "ui")
-MAIN_UI_FILE = path.join(UI_DIR, "main.ui")
-VOLUME_UI_FILE = path.join(UI_DIR, "volume.ui")
+DATA_DIR = "/usr/share/tails/%s/" % APP_NAME
+MAIN_UI_FILE = path.join(DATA_DIR, "main.ui")
+VOLUME_UI_FILE = path.join(DATA_DIR, "volume.ui")
TRANSLATION_DOMAIN = "tails"
diff --git a/config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in b/config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in
index 4c2e65a..4c2e65a 100644
--- a/config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in
+++ b/config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in
diff --git a/config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in b/config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in
index ca97e8b..ca97e8b 100644
--- a/config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in
+++ b/config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ef8983b..28e74ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,6 +37,6 @@ config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in
# Files updated by intltool-update --xml-style
config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in
config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in
-config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in
-config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in
+config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in
+config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in
config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 287aad2..dfc371c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,5 +4,5 @@ config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracryp
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/share/tails/additional-software/configuration-window.ui
-config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui
-config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui
+config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui
+config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui