[Gpg4win-commits] r561 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-10-12 18:13:18 +0200 (Fri, 12 Oct 2007)
New Revision: 561

Modified:
   trunk/ChangeLog
   trunk/src/inst-gpgee.nsi
   trunk/src/inst-gpgex.nsi
   trunk/src/inst-kleopatra.nsi
   trunk/src/uninst-kleopatra.nsi
Log:
Changed default selection


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-11 19:00:36 UTC (rev 560)
+++ trunk/ChangeLog	2007-10-12 16:13:18 UTC (rev 561)
@@ -1,3 +1,12 @@
+2007-10-12  Werner Koch  <wk at g10code.com>
+
+	* src/inst-kleopatra.nsi: Select by default.  Do not install
+	test_uiserver.
+	* src/uninst-kleopatra.nsi: No need to remove test_uiserver.
+
+	* src/inst-gpgee.nsi: Do not select by default.
+	* src/inst-gpgex.nsi: Select by default.
+
 2007-10-11  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update kleopatra. Update gpgol.

Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi	2007-10-11 19:00:36 UTC (rev 560)
+++ trunk/src/inst-gpgee.nsi	2007-10-12 16:13:18 UTC (rev 561)
@@ -24,7 +24,7 @@
 !define prefix ${ipdir}/gpgee-${gpg4win_pkg_gpgee_version}
 
 
-Section "GPGee" SEC_gpgee
+Section /o "GPGee" SEC_gpgee
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgee_src}"

Modified: trunk/src/inst-gpgex.nsi
===================================================================
--- trunk/src/inst-gpgex.nsi	2007-10-11 19:00:36 UTC (rev 560)
+++ trunk/src/inst-gpgex.nsi	2007-10-12 16:13:18 UTC (rev 561)
@@ -23,7 +23,7 @@
 !define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
 
 
-Section /o "GpgEX" SEC_gpgex
+Section "GpgEX" SEC_gpgex
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgex}"

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2007-10-11 19:00:36 UTC (rev 560)
+++ trunk/src/inst-kleopatra.nsi	2007-10-12 16:13:18 UTC (rev 561)
@@ -23,7 +23,7 @@
 !endif
 !define prefix ${ipdir}/kleopatra-${gpg4win_pkg_kleopatra_version}
 
-Section /o "Kleopatra" SEC_kleopatra
+Section "Kleopatra" SEC_kleopatra
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_kleopatra_src}"
@@ -34,7 +34,6 @@
   File ${prefix}/bin/kleopatra.exe
   SetOutPath "$INSTDIR"
 
-  File ${prefix}/bin/test_uiserver.exe
   File ${prefix}/lib/libgpgme++-glib.dll
   File ${prefix}/lib/libgpgme++-qt.dll
   File ${prefix}/lib/libgpgme++.dll

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2007-10-11 19:00:36 UTC (rev 560)
+++ trunk/src/uninst-kleopatra.nsi	2007-10-12 16:13:18 UTC (rev 561)
@@ -35,8 +35,6 @@
   Delete "$INSTDIR\bin\kleopatra.exe"
   RMDir "$INSTDIR\bin"
 
-  Delete "$INSTDIR\test_uiserver.exe"
-
   Delete "$INSTDIR\libgpgme++-glib.dll"
   Delete "$INSTDIR\libgpgme++-qt.dll"
   Delete "$INSTDIR\libgpgme++.dll"