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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-08-11 18:59:56 +0200 (Mon, 11 Aug 2008)
New Revision: 879

Modified:
   trunk/ChangeLog
   trunk/src/inst-sections.nsi
Log:
2008-08-11  Marcus Brinkmann  <marcus at g10code.com>

	* src/inst-sections.nsi: Fix order to be more presentable.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-11 14:58:08 UTC (rev 878)
+++ trunk/ChangeLog	2008-08-11 16:59:56 UTC (rev 879)
@@ -1,3 +1,7 @@
+2008-08-11  Marcus Brinkmann  <marcus at g10code.com>
+
+	* src/inst-sections.nsi: Fix order to be more presentable.
+
 2008-08-11  Werner Koch  <wk at g10code.com>
 
 	* src/uninst-gnupg2.nsi: Do not run gpg-connect-agent unless all

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2008-08-11 14:58:08 UTC (rev 878)
+++ trunk/src/inst-sections.nsi	2008-08-11 16:59:56 UTC (rev 879)
@@ -25,7 +25,9 @@
 
 # The order of installation must be the same as the build order.  You
 # can use tsort on the info in configure.ac, or just check out
-# gpg4win_build_list in config.nsi.
+# gpg4win_build_list in config.nsi.  The order determines also the
+# order in the packages selection dialog.
+
 !ifdef HAVE_PKG_ADNS
 !include "inst-adns.nsi"
 !endif
@@ -50,18 +52,6 @@
 !ifdef HAVE_PKG_LIBTASN1
 !include "inst-libtasn1.nsi"
 !endif
-!ifdef HAVE_PKG_MAN_ADVANCED_EN
-!include "inst-man_advanced_en.nsi"
-!endif
-!ifdef HAVE_PKG_MAN_NOVICE_DE
-!include "inst-man_novice_de.nsi"
-!endif
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
-!include "inst-man_advanced_de.nsi"
-!endif
-!ifdef HAVE_PKG_MAN_NOVICE_EN
-!include "inst-man_novice_en.nsi"
-!endif
 !ifdef HAVE_PKG_OXYGEN_ICONS
 !include "inst-oxygen-icons.nsi"
 !endif
@@ -104,9 +94,6 @@
 !ifdef HAVE_PKG_GLIB
 !include "inst-glib.nsi"
 !endif
-!ifdef HAVE_PKG_GPGEX
-!include "inst-gpgex.nsi"
-!endif
 !ifdef HAVE_PKG_LIBKSBA
 !include "inst-libksba.nsi"
 !endif
@@ -143,47 +130,81 @@
 !ifdef HAVE_PKG_GPGME
 !include "inst-gpgme.nsi"
 !endif
+
+# These are displayed in the selection dialog.
+
 !ifdef HAVE_PKG_KLEOPATRA
 !include "inst-kleopatra.nsi"
 !endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "inst-claws-mail.nsi"
-!endif
 !ifdef HAVE_PKG_GPA
 !include "inst-gpa.nsi"
 !endif
+!ifdef HAVE_PKG_WINPT
+!include "inst-winpt.nsi"
+!endif
 !ifdef HAVE_PKG_GPGOL
 !include "inst-gpgol.nsi"
 !endif
-!ifdef HAVE_PKG_WINPT
-!include "inst-winpt.nsi"
+!ifdef HAVE_PKG_GPGEX
+!include "inst-gpgex.nsi"
 !endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+!include "inst-claws-mail.nsi"
+!endif
 #!ifdef HAVE_PKG_EUDORAGPG
 #!include "inst-eudoragpg.nsi"
 #!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+!include "inst-man_novice_en.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+!include "inst-man_advanced_en.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+!include "inst-man_novice_de.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+!include "inst-man_advanced_de.nsi"
+!endif
 
 !include "inst-final.nsi"
 
 # We have to invoke the uninstallers in reverse order!
 
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+!include "inst-man_advanced_de.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+!include "inst-man_novice_de.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+!include "inst-man_advanced_en.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+!include "inst-man_novice_en.nsi"
+!endif
 #!ifdef HAVE_PKG_EUDORAGPG
-#!include "uninst-eudoragpg.nsi"
+#!include "inst-eudoragpg.nsi"
 #!endif
-!ifdef HAVE_PKG_WINPT
-!include "uninst-winpt.nsi"
+!ifdef HAVE_PKG_CLAWS_MAIL
+!include "inst-claws-mail.nsi"
 !endif
+!ifdef HAVE_PKG_GPGEX
+!include "inst-gpgex.nsi"
+!endif
 !ifdef HAVE_PKG_GPGOL
-!include "uninst-gpgol.nsi"
+!include "inst-gpgol.nsi"
 !endif
+!ifdef HAVE_PKG_WINPT
+!include "inst-winpt.nsi"
+!endif
 !ifdef HAVE_PKG_GPA
-!include "uninst-gpa.nsi"
+!include "inst-gpa.nsi"
 !endif
-!ifdef HAVE_PKG_CLAWS_MAIL
-!include "uninst-claws-mail.nsi"
-!endif
 !ifdef HAVE_PKG_KLEOPATRA
-!include "uninst-kleopatra.nsi"
+!include "inst-kleopatra.nsi"
 !endif
+
 !ifdef HAVE_PKG_GPGME
 !include "uninst-gpgme.nsi"
 !endif