rpms/realcrypt/F-11 realcrypt-6.3a-rebranding.patch, 1.1, 1.2 realcrypt.spec, 1.4, 1.5

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/realcrypt/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32679

Modified Files:
	realcrypt-6.3a-rebranding.patch realcrypt.spec 
Log Message:
* Fri Feb 12 2010 leigh scott <leigh123linux at googlemail.com> - 6.3a-1
- update to 6.3a
- combined rebranding patch (by Axel Köllhofer)
- fix rebranding patch so truecrypt name isn't displayed by "mount -l"
- fix rebranding patch so truecrypt name isn't displayed in cmdline


realcrypt-6.3a-rebranding.patch:
 Core/Unix/CoreUnix.h                                        |    2 
 Driver/Fuse/FuseService.h                                   |    2 
 Main/CommandLineInterface.cpp                               |    2 
 truecrypt-6.3a-source/Common/Language.xml                   |  588 ++++++------
 truecrypt-6.3a-source/Common/Tcdefs.h                       |   10 
 truecrypt-6.3a-source/Core/Unix/CoreUnix.cpp                |    8 
 truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp         |    4 
 truecrypt-6.3a-source/Main/Application.h                    |    2 
 truecrypt-6.3a-source/Main/Forms/AboutDialog.cpp            |    4 
 truecrypt-6.3a-source/Main/Forms/Forms.cpp                  |   10 
 truecrypt-6.3a-source/Main/Forms/Forms.h                    |   12 
 truecrypt-6.3a-source/Main/Forms/MainFrame.cpp              |    2 
 truecrypt-6.3a-source/Main/Forms/MainFrame.h                |    2 
 truecrypt-6.3a-source/Main/Forms/TrueCrypt.fbp              |   30 
 truecrypt-6.3a-source/Main/Forms/VolumeCreationWizard.cpp   |    2 
 truecrypt-6.3a-source/Main/Forms/VolumePropertiesDialog.cpp |    2 
 truecrypt-6.3a-source/Main/GraphicUserInterface.cpp         |   51 -
 truecrypt-6.3a-source/Main/LanguageStrings.cpp              |   18 
 truecrypt-6.3a-source/Main/UserInterface.cpp                |   36 
 truecrypt-6.3a-source/Makefile                              |    2 
 20 files changed, 375 insertions(+), 414 deletions(-)

Index: realcrypt-6.3a-rebranding.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-11/realcrypt-6.3a-rebranding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-6.3a-rebranding.patch	12 Feb 2010 14:41:29 -0000	1.1
+++ realcrypt-6.3a-rebranding.patch	15 Feb 2010 19:14:11 -0000	1.2
@@ -1502,6 +1502,17 @@
  		{
  #endif
  		AppendToList ("TOTAL_DATA_READ", Gui->SizeToString (volumeInfo.TotalDataRead));
+--- truecrypt-6.3a-source.orig/Main/CommandLineInterface.cpp	2009-11-22 15:10:00.000000000 +0000
++++ truecrypt-6.3a-source/Main/CommandLineInterface.cpp	2010-02-15 18:55:13.000000000 +0000
+@@ -54,7 +54,7 @@ namespace TrueCrypt
+ 		parser.AddSwitch (L"",	L"list-token-keyfiles",	_("List security token keyfiles"));
+ 		parser.AddSwitch (L"",	L"load-preferences",	_("Load user preferences"));
+ 		parser.AddSwitch (L"",	L"mount",				_("Mount volume interactively"));
+-		parser.AddOption (L"m", L"mount-options",		_("TrueCrypt volume mount options"));
++		parser.AddOption (L"m", L"mount-options",		_("RealCrypt volume mount options"));
+ 		parser.AddOption (L"",	L"new-keyfiles",		_("New keyfiles"));
+ 		parser.AddOption (L"",	L"new-password",		_("New password"));
+ 		parser.AddSwitch (L"",	L"non-interactive",		_("Do not interact with user"));
 diff -Naur truecrypt-6.3a-source.orig//Main/GraphicUserInterface.cpp truecrypt-6.3a-source/Main/GraphicUserInterface.cpp
 --- truecrypt-6.3a-source.orig//Main/GraphicUserInterface.cpp	2010-02-08 21:42:29.000000000 +0100
 +++ truecrypt-6.3a-source/Main/GraphicUserInterface.cpp	2010-02-08 21:50:51.000000000 +0100


Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/F-11/realcrypt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- realcrypt.spec	12 Feb 2010 14:41:29 -0000	1.4
+++ realcrypt.spec	15 Feb 2010 19:14:11 -0000	1.5
@@ -148,6 +148,7 @@
 - update to 6.3a
 - combined rebranding patch (by Axel Köllhofer)
 - fix rebranding patch so truecrypt name isn't displayed by "mount -l"
+- fix rebranding patch so truecrypt name isn't displayed in cmdline
 
 * Fri Nov 20 2009 Leigh Scott <leigh123linux at googlemail.com> - 6.3-2
 - fix rebranding patch