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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Oct 17 17:12:13 CEST 2007 

Author: marcus
Date: 2007-10-17 17:12:12 +0200 (Wed, 17 Oct 2007)
New Revision: 571

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/inst-kleopatra.nsi
   trunk/src/inst-pinentry.nsi
   trunk/src/inst-sections.nsi
   trunk/src/installer-finish.nsi
Log:
2007-10-17  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-kleopatra.nsi: Add DESC_Menu_kleopatra language string.
	* src/inst-sections.nsi: Install kleopatra links.
	* src/installer-finish.nsi: Uninstall kleopatra.
	* configure.ac: Make pinentry dependent on gtk+ instead of glib.
	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Revert last
	change.
	* src/inst-pinentry.nsi: Revert last change.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/ChangeLog	2007-10-17 15:12:12 UTC (rev 571)
@@ -1,3 +1,13 @@
+2007-10-17  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-kleopatra.nsi: Add DESC_Menu_kleopatra language string.
+	* src/inst-sections.nsi: Install kleopatra links.
+	* src/installer-finish.nsi: Uninstall kleopatra.
+	* configure.ac: Make pinentry dependent on gtk+ instead of glib.
+	* src/Makefile.am (gpg4win_pkg_pinentry_configure): Revert last
+	change.
+	* src/inst-pinentry.nsi: Revert last change.
+
 2007-10-17  Werner Koch  <wk at g10code.com>
 
 	* src/inst-kdesupport.nsi: Remove libeay32.dll and ssleay32/dll;

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/configure.ac	2007-10-17 15:12:12 UTC (rev 571)
@@ -197,7 +197,7 @@
 GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
                         w32pth zlib bzip2])
 GPG4WIN_SPKG([pthreads-w32])
-GPG4WIN_SPKG([pinentry], [glib])
+GPG4WIN_SPKG([pinentry], [gtk+])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/src/Makefile.am	2007-10-17 15:12:12 UTC (rev 571)
@@ -153,7 +153,8 @@
 # non-"libfoo.la" versions of iconv and gettext that we are using.
 gpg4win_pkg_pinentry_configure = \
   --disable-pinentry-gtk \
-  --disable-pinentry-gtk2 --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
+  --enable-pinentry-gtk2 \
+  --with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \
   --disable-pinentry-qt \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
 #  --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/src/inst-kleopatra.nsi	2007-10-17 15:12:12 UTC (rev 571)
@@ -80,3 +80,6 @@
 
 LangString DESC_SEC_kleopatra ${LANG_ENGLISH} \
    "Kleopatra"
+
+LangString DESC_Menu_kleopatra ${LANG_ENGLISH} \
+   "Run the Kleopatra key management tool."

Modified: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/src/inst-pinentry.nsi	2007-10-17 15:12:12 UTC (rev 571)
@@ -35,8 +35,9 @@
 !else
 
   File "${prefix}/bin/pinentry-w32.exe"
-#  File "${prefix}/bin/pinentry-gtk-2.exe"
-  File /oname=pinentry.exe "${prefix}/bin/pinentry-w32.exe"
+  File "${prefix}/bin/pinentry-gtk-2.exe"
+  File /oname=pinentry.exe "${prefix}/bin/pinentry-gtk-2.exe"
+
 !endif
 SectionEnd
 

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/src/inst-sections.nsi	2007-10-17 15:12:12 UTC (rev 571)
@@ -896,6 +896,16 @@
   no_gpa_menu:
 !endif
 
+!ifdef HAVE_PKG_KLEOPATRA
+    SectionGetFlags ${SEC_kleopatra} $R0 
+    IntOp $R0 $R0 & ${SF_SELECTED} 
+    IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_menu 
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Kleopatra.lnk" \
+	"$INSTDIR\kleopatra.bat" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
+  no_kleopatra_menu:
+!endif
+
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
     SectionGetFlags ${SEC_sylpheed} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 
@@ -1034,6 +1044,16 @@
   no_gpa_desktop:
 !endif
 
+!ifdef HAVE_PKG_KLEOPATRA
+    SectionGetFlags ${SEC_kleopatra} $R0 
+    IntOp $R0 $R0 & ${SF_SELECTED}
+    IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_desktop
+    CreateShortCut "$DESKTOP\Kleopatra.lnk" \
+	"$INSTDIR\kleopatra.bat" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
+  no_kleopatra_desktop:
+!endif
+
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
     SectionGetFlags ${SEC_sylpheed} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 
@@ -1150,6 +1170,16 @@
   no_gpa_quicklaunch:
 !endif
 
+!ifdef HAVE_PKG_KLEOPATRA
+    SectionGetFlags ${SEC_kleopatra} $R0 
+    IntOp $R0 $R0 & ${SF_SELECTED} 
+    IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_quicklaunch
+    CreateShortCut "$QUICKLAUNCH\Kleopatra.lnk" \
+	"$INSTDIR\kleopatra.bat" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
+  no_kleopatra_quicklaunch:
+!endif
+
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
     SectionGetFlags ${SEC_sylpheed} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2007-10-17 10:51:57 UTC (rev 570)
+++ trunk/src/installer-finish.nsi	2007-10-17 15:12:12 UTC (rev 571)
@@ -73,6 +73,9 @@
 !ifdef HAVE_PKG_GPA
   Delete "$DESKTOP\GPA.lnk"
 !endif
+!ifdef HAVE_PKG_KLEOPATRA
+  Delete "$DESKTOP\Kleopatra.lnk"
+!endif
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
   Delete "$DESKTOP\Sylpheed-Claws.lnk"
   Delete "$DESKTOP\Sylpheed-Claws Manual.lnk" \
@@ -106,6 +109,9 @@
 !ifdef HAVE_PKG_GPA
   Delete "$QUICKLAUNCH\GPA.lnk"
 !endif
+!ifdef HAVE_PKG_KLEOPATRA
+  Delete "$QUICKLAUNCH\Kleopatra.lnk"
+!endif
 !ifdef HAVE_PKG_SYLPHEED_CLAWS
   Delete "$QUICKLAUNCH\Sylpheed-Claws.lnk"
   # We better delete also the name we used prior to 1.0.3

More information about the Gpg4win-commits mailing list