[debian-edu-commits] debian-edu/ 12/50: Drop 003-file-manager.diff and 004-no-preference-x.diff, fixed upstream. Refresh remaining patches.
Unit 193
unit193-guest at moszumanska.debian.org
Wed Dec 21 05:05:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
unit193-guest pushed a commit to branch master
in repository veracrypt.
commit d35595e562fd029ba1415ced843cae046e37e113
Author: Unit 193 <unit193 at ubuntu.com>
Date: Mon Apr 6 16:57:26 2015 -0400
Drop 003-file-manager.diff and 004-no-preference-x.diff, fixed upstream. Refresh remaining patches.
---
debian/patches/001-user-guide-location.diff | 6 +--
debian/patches/002-build-flags.diff | 14 +++---
debian/patches/003-file-manager.diff | 55 ----------------------
...tor-support.diff => 003-indicator-support.diff} | 10 ++--
debian/patches/004-no-preference-x.diff | 22 ---------
debian/patches/series | 4 +-
6 files changed, 17 insertions(+), 94 deletions(-)
diff --git a/debian/patches/001-user-guide-location.diff b/debian/patches/001-user-guide-location.diff
index 770b20c..af2b14c 100644
--- a/debian/patches/001-user-guide-location.diff
+++ b/debian/patches/001-user-guide-location.diff
@@ -9,9 +9,9 @@ Forwarded: no
Index: veracrypt/src/Main/GraphicUserInterface.cpp
===================================================================
---- veracrypt.orig/src/Main/GraphicUserInterface.cpp 2013-01-13 23:15:11.109850819 +0000
-+++ veracrypt/src/Main/GraphicUserInterface.cpp 2013-01-13 23:15:25.184237643 +0000
-@@ -1183,7 +1183,7 @@
+--- veracrypt.orig/src/Main/GraphicUserInterface.cpp
++++ veracrypt/src/Main/GraphicUserInterface.cpp
+@@ -1211,7 +1211,7 @@ namespace VeraCrypt
#elif defined (TC_MACOSX)
docPath += L"/../Resources/VeraCrypt User Guide.pdf";
#elif defined (TC_UNIX)
diff --git a/debian/patches/002-build-flags.diff b/debian/patches/002-build-flags.diff
index b577275..83a8be8 100644
--- a/debian/patches/002-build-flags.diff
+++ b/debian/patches/002-build-flags.diff
@@ -6,9 +6,9 @@ Forwarded: no
Index: veracrypt/src/Makefile
===================================================================
---- veracrypt.orig/src/Makefile 2013-02-13 23:53:27.131298700 -0500
-+++ veracrypt/src/Makefile 2013-02-14 10:49:29.000000000 -0500
-@@ -50,6 +50,10 @@
+--- veracrypt.orig/src/Makefile
++++ veracrypt/src/Makefile
+@@ -50,6 +50,10 @@ export WXCONFIG_CFLAGS :=
export WXCONFIG_CXXFLAGS :=
WX_ROOT ?= ..
@@ -19,9 +19,11 @@ Index: veracrypt/src/Makefile
export TC_BUILD_CONFIG := Release
---- veracrypt.orig/src/Build/Include/Makefile.inc 2012-02-07 11:36:48.000000000 +0100
-+++ veracrypt/src/Build/Include/Makefile.inc 2013-06-17 01:34:00.429636758 +0200
-@@ -10,7 +10,7 @@
+Index: veracrypt/src/Build/Include/Makefile.inc
+===================================================================
+--- veracrypt.orig/src/Build/Include/Makefile.inc
++++ veracrypt/src/Build/Include/Makefile.inc
+@@ -10,7 +10,7 @@ $(NAME): $(NAME).a
clean:
@echo Cleaning $(NAME)
diff --git a/debian/patches/003-file-manager.diff b/debian/patches/003-file-manager.diff
deleted file mode 100644
index 6b6f878..0000000
--- a/debian/patches/003-file-manager.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Remove the hardcoded dependency on nautilus in most DEs, use xdg-utils
-Author: Unit 193 <unit193 at ninthfloor.org>
-
-Forwarded: no
-Last-Update: 2013-02-14
-
---- veracrypt.orig/src/Main/UserInterface.cpp
-+++ veracrypt/src/Main/UserInterface.cpp
-@@ -830,41 +830,13 @@ namespace VeraCrypt
-
- #else
- // MIME handler for directory seems to be unavailable through wxWidgets
-- wxString desktop = GetTraits()->GetDesktopEnvironment();
--
-- if (desktop == L"GNOME" || desktop.empty())
-- {
-- args.push_back ("--no-default-window");
-- args.push_back ("--no-desktop");
-- args.push_back (string (path));
-- try
-- {
-- Process::Execute ("nautilus", args, 2000);
-- }
-- catch (TimeOut&) { }
-- catch (exception &e) { ShowError (e); }
-- }
-- else if (desktop == L"KDE")
-+ args.push_back (string (path));
-+ try
- {
-- try
-- {
-- args.push_back (string (path));
-- Process::Execute ("dolphin", args, 2000);
-- }
-- catch (TimeOut&) { }
-- catch (exception&)
-- {
-- args.clear();
-- args.push_back ("openURL");
-- args.push_back (string (path));
-- try
-- {
-- Process::Execute ("kfmclient", args, 2000);
-- }
-- catch (TimeOut&) { }
-- catch (exception &e) { ShowError (e); }
-- }
-+ Process::Execute ("xdg-open", args, 2000);
- }
-+ catch (TimeOut&) { }
-+ catch (exception &e) { ShowError (e); }
- #endif
- }
-
diff --git a/debian/patches/005-indicator-support.diff b/debian/patches/003-indicator-support.diff
similarity index 97%
rename from debian/patches/005-indicator-support.diff
rename to debian/patches/003-indicator-support.diff
index b047ad7..8a05a11 100644
--- a/debian/patches/005-indicator-support.diff
+++ b/debian/patches/003-indicator-support.diff
@@ -33,7 +33,7 @@ Index: veracrypt/src/Main/Forms/MainFrame.cpp
ListItemRightClickEventPending (false),
SelectedItemIndex (-1),
SelectedSlotNumber (0),
-@@ -1439,6 +1440,30 @@ namespace VeraCrypt
+@@ -1531,6 +1532,30 @@ namespace VeraCrypt
}
}
@@ -64,7 +64,7 @@ Index: veracrypt/src/Main/Forms/MainFrame.cpp
void MainFrame::ShowTaskBarIcon (bool show)
{
if (!show && mTaskBarIcon->IsIconInstalled())
-@@ -1448,8 +1473,43 @@ namespace VeraCrypt
+@@ -1540,8 +1565,43 @@ namespace VeraCrypt
else if (show && !mTaskBarIcon->IsIconInstalled())
{
#ifndef TC_MACOSX
@@ -148,12 +148,12 @@ Index: veracrypt/src/Main/Forms/MainFrame.h
- void MountAllFavorites ();
void MountVolume ();
void OnAboutMenuItemSelected (wxCommandEvent& event);
- void OnActivate (wxActivateEvent& event);
+ void OnQuit(wxCommandEvent& event) { Close(true); }
Index: veracrypt/src/Main/GraphicUserInterface.cpp
===================================================================
--- veracrypt.orig/src/Main/GraphicUserInterface.cpp
+++ veracrypt/src/Main/GraphicUserInterface.cpp
-@@ -1360,19 +1360,19 @@ namespace VeraCrypt
+@@ -1388,19 +1388,19 @@ namespace VeraCrypt
File backupFile;
backupFile.Open (*files.front(), File::OpenRead);
@@ -176,7 +176,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp
legacyBackup = true;
break;
-@@ -1595,6 +1595,8 @@ namespace VeraCrypt
+@@ -1623,6 +1623,8 @@ namespace VeraCrypt
}
BackgroundMode = state;
diff --git a/debian/patches/004-no-preference-x.diff b/debian/patches/004-no-preference-x.diff
deleted file mode 100644
index cd72b7c..0000000
--- a/debian/patches/004-no-preference-x.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stefan Sundin <stefan at stefansundin.com>
-Date: Fri, 12 Sept 2013
-Subject: Disable "x" in the preferences window
-
-The close icon in the preferences window does not close the preferences,
-this patch removes the icon.
-
-Forwarded: no
-
-Index: veracrypt/src/Main/Forms/Forms.cpp
-===================================================================
---- veracrypt.orig/src/Main/Forms/Forms.cpp
-+++ veracrypt/src/Main/Forms/Forms.cpp
-@@ -1754,7 +1754,7 @@ NewSecurityTokenKeyfileDialogBase::~NewS
-
- }
-
--PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-+PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style & (~wxCLOSE_BOX) )
- {
- this->SetSizeHints( wxDefaultSize, wxDefaultSize );
- this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
diff --git a/debian/patches/series b/debian/patches/series
index da7a887..2694b0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
001-user-guide-location.diff
002-build-flags.diff
-003-file-manager.diff
-004-no-preference-x.diff
-005-indicator-support.diff
+003-indicator-support.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git
More information about the debian-edu-commits
mailing list