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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-10 15:10:00 +0100 (Thu, 10 Jan 2008)
New Revision: 673

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win-src.nsi
   trunk/src/gpg4win.nsi
   trunk/src/inst-gnupg2.nsi
   trunk/src/make-msi.guids
Log:
2008-01-10  Marcus Brinkmann  <marcus at g10code.de>

	* src/gpg4win.nsi: New variable bpdir.
	* src/gpg4win-src.nsi: Likewise.
	* src/inst-gnupg2.nsi: New variable source and install a skeleton
	file for gpgconf.conf.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-08 00:57:17 UTC (rev 672)
+++ trunk/ChangeLog	2008-01-10 14:10:00 UTC (rev 673)
@@ -1,3 +1,10 @@
+2008-01-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/gpg4win.nsi: New variable bpdir.
+	* src/gpg4win-src.nsi: Likewise.
+	* src/inst-gnupg2.nsi: New variable source and install a skeleton
+	file for gpgconf.conf.
+
 2008-01-08  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/pkg-to-nsi.pl: New file.

Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi	2008-01-08 00:57:17 UTC (rev 672)
+++ trunk/src/gpg4win-src.nsi	2008-01-10 14:10:00 UTC (rev 673)
@@ -73,6 +73,7 @@
 
 # The installation directory.
 !define ipdir "playground/install/pkgs"
+!define bpdir "playground/build"
 
 # For source packages we use the standard zip method because it takes
 # ages to compress a large archive of already packed sources.

Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi	2008-01-08 00:57:17 UTC (rev 672)
+++ trunk/src/gpg4win.nsi	2008-01-10 14:10:00 UTC (rev 673)
@@ -131,6 +131,7 @@
 
 # The installation directory.
 !define ipdir "playground/install/pkgs"
+!define bpdir "playground/build"
 
 # Select the best compression algorithm available.  The dictionary
 # size is the default (8 MB). 

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2008-01-08 00:57:17 UTC (rev 672)
+++ trunk/src/inst-gnupg2.nsi	2008-01-10 14:10:00 UTC (rev 673)
@@ -23,6 +23,7 @@
 !undef prefix
 !endif
 !define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
+!define source ${bpdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
 
 
 Section "GnuPG2" SEC_gnupg2
@@ -68,6 +69,9 @@
   File "${prefix}/share/gnupg/com-certs.pem"
   File "${prefix}/share/gnupg/gpg-conf.skel"
 
+  SetOutPath "$INSTDIR\etc\gnupg"
+  File /oname=gpgconf-conf.skel "${source}/share/gnupg/gpgconf.conf"
+
   # 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
   # Makefile.am needs to build them.

Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids	2008-01-08 00:57:17 UTC (rev 672)
+++ trunk/src/make-msi.guids	2008-01-10 14:10:00 UTC (rev 673)
@@ -47,6 +47,7 @@
 d1095726-f0a6-49dc-9eb3-0a22ff1a2909 etc\dirmngr\dirmngr.conf
 1244c140-ed30-4077-8e9a-1b2f39a0a30b etc\dirmngr\trusted-certs\README
 35a1a4c0-d7b9-4466-8c8a-12f153deef70 etc\dirmngr\trusted-certs\bnetza-10r-ca.crt
+f1929d80-7000-4327-adc4-48dce4afc52a etc\gnupg\gpgconf-conf.skel
 cf7de0b8-618e-4a9d-824b-e12cff1ea079 etc\gtk-2.0\gdk-pixbuf.loaders
 73b1a9cb-0060-4068-a0f0-f3eded95dc66 etc\gtk-2.0\gtk.immodules
 2146aa1e-cc15-4602-b8ef-685467a53d3c etc\pango\pango.aliases