[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-155-g313d891

[by Andre Heinecke]

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  313d89146a8424b6979f616e125603628b4ae136 (commit)
      from  65e2b1a573f27d34d6fa48212a42f434a169f54b (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 313d89146a8424b6979f616e125603628b4ae136
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Apr 29 17:28:51 2013 +0000

    Fix syntax errors caused by KDE/4.10 update
    
        * src/inst-sections.nsi: Use unique labels
        * src/uninst-kleopatra.nsi: Close a quote

diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index fff4d40..4befbc5 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -841,11 +841,11 @@ Function CalcDepends
 
 !ifdef HAVE_PKG_KLEOPATRA
   !insertmacro SectionFlagIsSet ${SEC_kleopatra} \
-		${SF_SELECTED} have_kleopatra skip_kdelibs
-  have_kleopatra:
+		${SF_SELECTED} have_kleopatra_libs skip_kleopatra_libs
+  have_kleopatra_libs:
   !insertmacro SelectSection ${SEC_qt}
   !insertmacro SelectSection ${SEC_oxygen_icons}
-   skip_kleopatra:
+   skip_kleopatra_libs:
 !endif
 
 !ifdef HAVE_PKG_QT
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 9e260c8..e9abd84 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -57,7 +57,7 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\icons\hicolor\22x22\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\16x16\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\128x128\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\hicolor\index.theme
+  Delete "$INSTDIR\share\icons\hicolor\index.theme"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
   Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"

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

Summary of changes:
 src/inst-sections.nsi    |    6 +++---
 src/uninst-kleopatra.nsi |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


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