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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-06-22 18:49:58 +0200 (Fri, 22 Jun 2007)
New Revision: 424

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-gnupg2.nsi
   trunk/src/uninst-gnupg2.nsi
Log:
Add a few more binaries


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-20 22:18:09 UTC (rev 423)
+++ trunk/ChangeLog	2007-06-22 16:49:58 UTC (rev 424)
@@ -1,3 +1,11 @@
+2007-06-22  Werner Koch  <wk at g10code.com>
+
+	* src/inst-gnupg2.nsi: Install more files.
+	* src/uninst-gnupg2.nsi: and uninstall them.
+
+	* src/Makefile.am (gpg4win_pkg_gnupg_post_install): Remove
+	underlined markup.  Reported by Dirk Traulsen.
+
 2007-06-20  Werner Koch  <wk at g10code.com>
 
 	* src/inst-sections.nsi, src/Makefile.am, src/uninst-pinentry.nsi

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-06-20 22:18:09 UTC (rev 423)
+++ trunk/src/Makefile.am	2007-06-22 16:49:58 UTC (rev 424)
@@ -44,13 +44,13 @@
 # We also create the MO files here.
 define gpg4win_pkg_gnupg_post_install	
 (man -Tlatin1 -l $$$${pkgidir}/share/man/man1/gpg.1 | \
- sed `printf "s/\b.//g"` | \
+ sed `printf "s/_\b//g;s/\b.//g"` | \
  sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/gpg.man; \
 man -Tlatin1 -l $$$${pkgidir}/share/man/man1/gpgv.1 | \
- sed `printf "s/\b.//g"` | \
+ sed `printf "s/_\b//g;s/\b.//g"` | \
  sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/gpgv.man; \
 man -Tlatin1 -l $$$${pkgidir}/share/man/man7/gnupg.7 | \
- sed `printf "s/\b.//g"` | \
+ sed `printf "s/_\b//g;s/\b.//g"` | \
  sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man7/gnupg.man; \
 for i in de; do \
  msgfmt --output-file=$$$${pkgidir}/share/gnupg/$$$${i}.mo \

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2007-06-20 22:18:09 UTC (rev 423)
+++ trunk/src/inst-gnupg2.nsi	2007-06-22 16:49:58 UTC (rev 424)
@@ -36,6 +36,7 @@
   File "${prefix}/bin/gpg-agent.exe"
   File "${prefix}/bin/scdaemon.exe"
   File "${prefix}/bin/gpgconf.exe"
+  File "${prefix}/bin/gpg-connect-agent.exe"
 
   # As a special exception, these programs are not kept in
   # libexec/gnupg, where they belong.  Please see the comment in
@@ -44,19 +45,18 @@
   File "${prefix}/libexec/gpg2keys_hkp.exe"
   File "${prefix}/libexec/gpg2keys_curl.exe"
   File "${prefix}/libexec/gpg2keys_ldap.exe"
+  File "${prefix}/libexec/gpg-protect-tool.exe"
+  File "${prefix}/libexec/gpg-preset-passphrase.exe"
 
   SetOutPath "$INSTDIR\pub"
   File /oname=gpg2.exe      "${BUILD_DIR}/gpgwrap.exe"
   File /oname=gpgsm.exe     "${BUILD_DIR}/gpgwrap.exe"
+  File /oname=gpg-connect-agent.exe  "${BUILD_DIR}/gpgwrap.exe"
 
-# Fixme:
-#  SetOutPath "$INSTDIR\share\gnupg"
-#  File "${prefix}/share/gnupg/options.skel"
-#  File "${prefix}/share/gnupg/FAQ"
-#  File "${prefix}/share/gnupg/faq.html"
-#  File "${prefix}/share/man/man1/gpg.man"
-#  File "${prefix}/share/man/man1/gpgv.man"
-#  File "${prefix}/share/man/man7/gnupg.man"
+  SetOutPath "$INSTDIR\share\gnupg"
+  File "${prefix}/share/gnupg/qualified.txt"
+  File "${prefix}/share/gnupg/com-certs.pem"
+  File "${prefix}/share/gnupg/gpg-conf.skel"
 
   # Install the language files for gpg.  Note that the PO files are
   # required to be UTF-8 encoded and that the post-install macro in

Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi	2007-06-20 22:18:09 UTC (rev 423)
+++ trunk/src/uninst-gnupg2.nsi	2007-06-22 16:49:58 UTC (rev 424)
@@ -36,25 +36,24 @@
   Delete "$INSTDIR\gpg-agent.exe"
   Delete "$INSTDIR\scdaemon.exe"
   Delete "$INSTDIR\gpgconf.exe"
+  Delete "$INSTDIR\gpg-connect-agent.exe"
 
   Delete "$INSTDIR\pub\gpg2.exe"
   Delete "$INSTDIR\pub\gpgsm.exe"
+  Delete "$INSTDIR\pub\gpg-connect-agent.exe"
   RMDir "$INSTDIR\pub"
 
   Delete "$INSTDIR\gpg2keys_finger.exe"
   Delete "$INSTDIR\gpg2keys_hkp.exe"
   Delete "$INSTDIR\gpg2keys_curl.exe"
   Delete "$INSTDIR\gpg2keys_ldap.exe"
+  Delete "$INSTDIR\gpg-protect-tool.exe"
+  Delete "$INSTDIR\gpg-preset-passphrase.exe"
 
-#  Delete "$INSTDIR\share\gnupg\options.skel"
-#  Delete "$INSTDIR\share\gnupg\FAQ"
-#  Delete "$INSTDIR\share\gnupg\faq.html"
-#  Delete "$INSTDIR\share\gnupg\gpg.man"
-#  Delete "$INSTDIR\share\gnupg\gpgv.man"
-#  Delete "$INSTDIR\share\gnupg\gnupg.man"
-#  RMDir "$INSTDIR\share\gnupg"
-#  RMDir "$INSTDIR\share"
-   RMDir "$INSTDIR"
+  Delete "$INSTDIR\share\gnupg\qualified.txt"
+  Delete "$INSTDIR\share\gnupg\com-certs.txt"
+  Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
+  RMDir "$INSTDIR\share\gnupg"
 
 #  Delete "$INSTDIR\gnupg.nls\de.mo"
 #  RMDir  "$INSTDIR\gnupg.nls"