[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-117-g4fc4de2

by Werner Koch cvs at cvs.gnupg.org
Sun Dec 9 23:11:43 CET 2012 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  4fc4de2572e799d3f744f802a9276ac0e27be46d (commit)
      from  a5ee528efb966d3e84b08471b3538c746931ac17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4fc4de2572e799d3f744f802a9276ac0e27be46d
Author: Werner Koch <wk at gnupg.org>
Date:   Sun Dec 9 22:40:12 2012 +0100

    Fix Kleopatra file names and update readmes.
    
    --

diff --git a/doc/README.de.txt b/doc/README.de.txt
index 452193c..f54e597 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -38,11 +38,14 @@ Bitte lesen Sie den Abschnitt "3. Bekannte Probleme (und Abhilfe)",
 bevor Sie damit beginnen Gpg4win zu nutzen.
 
 Gpg4win unterstützt folgende Plattformen:
+
   * Betriebssystem: Windows XP (32/64), Vista (32/64), 7 (32/64)
+
   * MS Outlook: 2003, 2007
-  Wichtig: Das Explorer-Plugin 'GpgEX' bietet aktuell keine Unterstützung für
-  64-bit Explorer!
-  (Details unter Abschnitt 3, Punkt "Probleme unter Windows x64")
+
+Wichtig: Das Explorer-Plugin 'GpgEX' bietet aktuell keine
+         Unterstützung für 64-bit Explorer!
+         (Details in Abschnitt 3, Punkt "Probleme unter Windows x64")
 
 
 2. Änderungen
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 86a77bd..69b05ee 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -35,10 +35,13 @@ Please read the section "3. Known Bugs (and Workarounds)" before you
 start working with Gpg4win.
 
 Gpg4win supports these platforms:
+
   * Operating System: Windows XP (32/64), Vista (32/64), 7 (32/64)
+
   * MS Outlook: 2003, 2007
-  Note: Currently, there is no 64-bit support for GpgEX
-  (see section 3, "Using GpgEX with Windows x64", for details)
+
+Note: Currently, there is no 64-bit support for GpgEX
+      (see section 3, "Using GpgEX with Windows x64", for details)
 
 
 2. Changes
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 615203f..6b0923f 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -1,18 +1,18 @@
 # inst-kleopatra.nsi - Installer snippet for kleopatra.      -*- coding: latin-1; -*-
 # Copyright (C) 2005, 2007, 2008 g10 Code GmbH
-# 
+#
 # This file is part of GPG4Win.
-# 
+#
 # GPG4Win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # GPG4Win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -93,59 +93,57 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   SetOutPath "$INSTDIR\share\doc\HTML\common"
 
-  File ${prefix}/share/doc/HTML/common/1.png
-  File ${prefix}/share/doc/HTML/common/10.png
-  File ${prefix}/share/doc/HTML/common/2.png
-  File ${prefix}/share/doc/HTML/common/3.png
-  File ${prefix}/share/doc/HTML/common/4.png
-  File ${prefix}/share/doc/HTML/common/5.png
-  File ${prefix}/share/doc/HTML/common/6.png
-  File ${prefix}/share/doc/HTML/common/7.png
-  File ${prefix}/share/doc/HTML/common/8.png
-  File ${prefix}/share/doc/HTML/common/9.png
-  File ${prefix}/share/doc/HTML/common/CMakeLists.txt
-  File ${prefix}/share/doc/HTML/common/Doxyfile.global
-  File ${prefix}/share/doc/HTML/common/README.Doxygen
-  File ${prefix}/share/doc/HTML/common/artistic-license.html
-  File ${prefix}/share/doc/HTML/common/block_title_bottom.png
-  File ${prefix}/share/doc/HTML/common/block_title_mid.png
-  File ${prefix}/share/doc/HTML/common/block_title_top.png
-  File ${prefix}/share/doc/HTML/common/bottom-left.png
-  File ${prefix}/share/doc/HTML/common/bottom-middle.png
-  File ${prefix}/share/doc/HTML/common/bottom-right.png
-  File ${prefix}/share/doc/HTML/common/bsd-license.html
-  File ${prefix}/share/doc/HTML/common/doxygen.css
-  File ${prefix}/share/doc/HTML/common/favicon.ico
-  File ${prefix}/share/doc/HTML/common/fdl-license
-  File ${prefix}/share/doc/HTML/common/fdl-license.html
-  File ${prefix}/share/doc/HTML/common/fdl-notice.html
-  File ${prefix}/share/doc/HTML/common/flat.css
-  File ${prefix}/share/doc/HTML/common/footer.html
-  File ${prefix}/share/doc/HTML/common/gpl-license
-  File ${prefix}/share/doc/HTML/common/gpl-license.html
-  File ${prefix}/share/doc/HTML/common/header.html
-  File ${prefix}/share/doc/HTML/common/kde-default.css
-  File ${prefix}/share/doc/HTML/common/kde-docs.css
-  File ${prefix}/share/doc/HTML/common/kde-localised.css.template
-  File ${prefix}/share/doc/HTML/common/kde.css
-  File ${prefix}/share/doc/HTML/common/kde_logo.png
-  File ${prefix}/share/doc/HTML/common/kde_logo_bg.png
-  File ${prefix}/share/doc/HTML/common/lgpl-license
-  File ${prefix}/share/doc/HTML/common/lgpl-license.html
-  File ${prefix}/share/doc/HTML/common/mainfooter.html
-  File ${prefix}/share/doc/HTML/common/mainheader.html
-  File ${prefix}/share/doc/HTML/common/print.css
-  File ${prefix}/share/doc/HTML/common/qpl-license.html
-  File ${prefix}/share/doc/HTML/common/tabs.css
-  File ${prefix}/share/doc/HTML/common/top-kde.jpg
-  File ${prefix}/share/doc/HTML/common/top-left.jpg
-  File ${prefix}/share/doc/HTML/common/top-left.png
-  File ${prefix}/share/doc/HTML/common/top-middle.png
-  File ${prefix}/share/doc/HTML/common/top-right.jpg
-  File ${prefix}/share/doc/HTML/common/top-right.png
-  File ${prefix}/share/doc/HTML/common/top.jpg
-  File ${prefix}/share/doc/HTML/common/x11-license.html
-  File ${prefix}/share/doc/HTML/common/xml.dcl
+  File ${prefix}/share/doc/HTML/common/common/1.png
+  File ${prefix}/share/doc/HTML/common/common/10.png
+  File ${prefix}/share/doc/HTML/common/common/2.png
+  File ${prefix}/share/doc/HTML/common/common/3.png
+  File ${prefix}/share/doc/HTML/common/common/4.png
+  File ${prefix}/share/doc/HTML/common/common/5.png
+  File ${prefix}/share/doc/HTML/common/common/6.png
+  File ${prefix}/share/doc/HTML/common/common/7.png
+  File ${prefix}/share/doc/HTML/common/common/8.png
+  File ${prefix}/share/doc/HTML/common/common/9.png
+  File ${prefix}/share/doc/HTML/common/common/CMakeLists.txt
+  File ${prefix}/share/doc/HTML/common/common/Doxyfile.global
+  File ${prefix}/share/doc/HTML/common/common/README.Doxygen
+  File ${prefix}/share/doc/HTML/common/common/artistic-license.html
+  File ${prefix}/share/doc/HTML/common/common/block_title_bottom.png
+  File ${prefix}/share/doc/HTML/common/common/block_title_mid.png
+  File ${prefix}/share/doc/HTML/common/common/block_title_top.png
+  File ${prefix}/share/doc/HTML/common/common/bottom-left.png
+  File ${prefix}/share/doc/HTML/common/common/bottom-middle.png
+  File ${prefix}/share/doc/HTML/common/common/bottom-right.png
+  File ${prefix}/share/doc/HTML/common/common/bsd-license.html
+  File ${prefix}/share/doc/HTML/common/common/doxygen.css
+  File ${prefix}/share/doc/HTML/common/common/favicon.ico
+  File ${prefix}/share/doc/HTML/common/common/fdl-license
+  File ${prefix}/share/doc/HTML/common/common/fdl-license.html
+  File ${prefix}/share/doc/HTML/common/common/fdl-notice.html
+  File ${prefix}/share/doc/HTML/common/common/flat.css
+  File ${prefix}/share/doc/HTML/common/common/footer.html
+  File ${prefix}/share/doc/HTML/common/common/gpl-license
+  File ${prefix}/share/doc/HTML/common/common/gpl-license.html
+  File ${prefix}/share/doc/HTML/common/common/header.html
+  File ${prefix}/share/doc/HTML/common/common/kde-default.css
+  File ${prefix}/share/doc/HTML/common/common/kde.css
+  File ${prefix}/share/doc/HTML/common/common/kde_logo.png
+  File ${prefix}/share/doc/HTML/common/common/kde_logo_bg.png
+  File ${prefix}/share/doc/HTML/common/common/lgpl-license
+  File ${prefix}/share/doc/HTML/common/common/lgpl-license.html
+  File ${prefix}/share/doc/HTML/common/common/mainfooter.html
+  File ${prefix}/share/doc/HTML/common/common/mainheader.html
+  File ${prefix}/share/doc/HTML/common/common/print.css
+  File ${prefix}/share/doc/HTML/common/common/qpl-license.html
+  File ${prefix}/share/doc/HTML/common/common/tabs.css
+  File ${prefix}/share/doc/HTML/common/common/top-kde.jpg
+  File ${prefix}/share/doc/HTML/common/common/top-left.jpg
+  File ${prefix}/share/doc/HTML/common/common/top-left.png
+  File ${prefix}/share/doc/HTML/common/common/top-middle.png
+  File ${prefix}/share/doc/HTML/common/common/top-right.jpg
+  File ${prefix}/share/doc/HTML/common/common/top-right.png
+  File ${prefix}/share/doc/HTML/common/common/top.jpg
+  File ${prefix}/share/doc/HTML/common/common/x11-license.html
+  File ${prefix}/share/doc/HTML/common/common/xml.dcl
 
   SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
 
@@ -239,7 +237,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
   File ${prefix}/share/kde4/services/kleopatra_decryptverifyfolders.desktop
   File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
   File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
-  
+
 !endif
 ${MementoSectionEnd}
 

-----------------------------------------------------------------------

Summary of changes:
 doc/README.de.txt      |    9 +++-
 doc/README.en.txt      |    7 ++-
 src/inst-kleopatra.nsi |  114 +++++++++++++++++++++++------------------------
 3 files changed, 67 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org

More information about the Gpg4win-commits mailing list