aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2017-07-10 20:31:31 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2017-07-10 20:31:31 -0400
commit02990f6671cd9f98bdae5d4733b38f501b24ad29 (patch)
tree7caf0de83432200fab382b2000a5e36c9ea8d009
parente9d483afb2ac1ed6ad6da37e9031fd43dea86fdb (diff)
downloadveracrypt-02990f6671cd9f98bdae5d4733b38f501b24ad29.tar.bz2
veracrypt-02990f6671cd9f98bdae5d4733b38f501b24ad29.tar.xz
veracrypt-02990f6671cd9f98bdae5d4733b38f501b24ad29.tar.zst
Refresh patches.
-rw-r--r--debian/patches/001-user-guide-location.diff16
-rw-r--r--debian/patches/003-indicator-support.diff4
2 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/001-user-guide-location.diff b/debian/patches/001-user-guide-location.diff
index e935d2b..3294321 100644
--- a/debian/patches/001-user-guide-location.diff
+++ b/debian/patches/001-user-guide-location.diff
@@ -1,5 +1,5 @@
From: Francis Russell <francis@unchartedbackwaters.co.uk>
-Date: Mon, 14 Jan 2013 11:44
+Date: Mon, 14 Jan 2013 11:44
Subject: Move manual
The user manual is installed in /usr/share/doc/veracrypt as opposed to
@@ -9,14 +9,14 @@ Forwarded: no
Index: veracrypt/src/Main/GraphicUserInterface.cpp
===================================================================
---- veracrypt.orig/src/Main/GraphicUserInterface.cpp
-+++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1239,7 +1239,7 @@ namespace VeraCrypt
+--- a/src/Main/GraphicUserInterface.cpp 2017-06-29 17:10:39.000000000 -0400
++++ b/src/Main/GraphicUserInterface.cpp 2017-06-30 16:30:20.842509262 -0400
+@@ -1232,7 +1232,7 @@
#elif defined (TC_MACOSX)
- docPath += L"/../Resources/VeraCrypt User Guide.pdf";
+ htmlPath += L"/../Resources/doc/HTML/";
#elif defined (TC_UNIX)
-- docPath = L"/usr/share/veracrypt/doc/VeraCrypt User Guide.pdf";
-+ docPath = L"/usr/share/doc/veracrypt/user_guide.pdf";
+- htmlPath = L"/usr/share/veracrypt/doc/HTML/";
++ htmlPath = L"/usr/share/doc/veracrypt/HTML/";
#else
- # error TC_RESOURCE_DIR undefined
+ localFile = false;
#endif
diff --git a/debian/patches/003-indicator-support.diff b/debian/patches/003-indicator-support.diff
index d246722..98376cb 100644
--- a/debian/patches/003-indicator-support.diff
+++ b/debian/patches/003-indicator-support.diff
@@ -12,7 +12,7 @@ Index: veracrypt/src/Main/Main.make
===================================================================
--- veracrypt.orig/src/Main/Main.make
+++ veracrypt/src/Main/Main.make
-@@ -135,7 +135,7 @@ endif
+@@ -154,7 +154,7 @@ endif
$(APPNAME): $(LIBS) $(OBJS)
@echo Linking $@
@@ -153,7 +153,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp
===================================================================
--- veracrypt.orig/src/Main/GraphicUserInterface.cpp
+++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1649,6 +1649,8 @@ namespace VeraCrypt
+@@ -1663,6 +1663,8 @@ namespace VeraCrypt
}
BackgroundMode = state;